commit caaf9f9270ad3a9473c67343edffe9d05ac9661f
author Sarah Parker <sarahparker@google.com> Fri Nov 11 04:48:29 2016 +0000
committer Sarah Parker <sarahparker@google.com> Sat Nov 12 01:02:11 2016 +0000
tree 56235a324e9f5352dde0ec3ac65b19bee84af5e6
parent f42bba2522c7fc52b4b550b6538e6c4033d7f5fc

Revert "Support overwriting an arbitrary number of literal bits."

This reverts commit 133c57c331f3b1806233fbd83db1f5f022b1490a,
which appears to cause test failures in
AV1/AVxEncoderThreadTest.EncoderResultTest/*

Change-Id: I200b7a135ed65dc2c3f23b23b8c3dbf0872715fa

aom_dsp/bitwriter_buffer.c

diff --git a/aom_dsp/bitwriter_buffer.c b/aom_dsp/bitwriter_buffer.c
index 993bcfa..9d6a0da 100644
--- a/aom_dsp/bitwriter_buffer.c
+++ b/aom_dsp/bitwriter_buffer.c
@@ -23,8 +23,12 @@
   const int off = (int)wb->bit_offset;
   const int p = off / CHAR_BIT;
   const int q = CHAR_BIT - 1 - off % CHAR_BIT;
-  wb->bit_buffer[p] &= ~(1 << q);
-  wb->bit_buffer[p] |= bit << q;
+  if (q == CHAR_BIT - 1) {
+    wb->bit_buffer[p] = bit << q;
+  } else {
+    wb->bit_buffer[p] &= ~(1 << q);
+    wb->bit_buffer[p] |= bit << q;
+  }
   wb->bit_offset = off + 1;
 }