Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(576)

Side by Side Diff: source/libvpx/vp9/encoder/vp9_write_bit_buffer.h

Issue 181493009: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_vaq.c ('k') | source/libvpx/vp9/encoder/x86/vp9_dct_avx2.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 11 matching lines...) Expand all
22 struct vp9_write_bit_buffer { 22 struct vp9_write_bit_buffer {
23 uint8_t *bit_buffer; 23 uint8_t *bit_buffer;
24 size_t bit_offset; 24 size_t bit_offset;
25 }; 25 };
26 26
27 static size_t vp9_rb_bytes_written(struct vp9_write_bit_buffer *wb) { 27 static size_t vp9_rb_bytes_written(struct vp9_write_bit_buffer *wb) {
28 return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0); 28 return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0);
29 } 29 }
30 30
31 static void vp9_wb_write_bit(struct vp9_write_bit_buffer *wb, int bit) { 31 static void vp9_wb_write_bit(struct vp9_write_bit_buffer *wb, int bit) {
32 const int off = wb->bit_offset; 32 const int off = (int)wb->bit_offset;
33 const int p = off / CHAR_BIT; 33 const int p = off / CHAR_BIT;
34 const int q = CHAR_BIT - 1 - off % CHAR_BIT; 34 const int q = CHAR_BIT - 1 - off % CHAR_BIT;
35 if (q == CHAR_BIT -1) { 35 if (q == CHAR_BIT -1) {
36 wb->bit_buffer[p] = bit << q; 36 wb->bit_buffer[p] = bit << q;
37 } else { 37 } else {
38 wb->bit_buffer[p] &= ~(1 << q); 38 wb->bit_buffer[p] &= ~(1 << q);
39 wb->bit_buffer[p] |= bit << q; 39 wb->bit_buffer[p] |= bit << q;
40 } 40 }
41 wb->bit_offset = off + 1; 41 wb->bit_offset = off + 1;
42 } 42 }
43 43
44 static void vp9_wb_write_literal(struct vp9_write_bit_buffer *wb, 44 static void vp9_wb_write_literal(struct vp9_write_bit_buffer *wb,
45 int data, int bits) { 45 int data, int bits) {
46 int bit; 46 int bit;
47 for (bit = bits - 1; bit >= 0; bit--) 47 for (bit = bits - 1; bit >= 0; bit--)
48 vp9_wb_write_bit(wb, (data >> bit) & 1); 48 vp9_wb_write_bit(wb, (data >> bit) & 1);
49 } 49 }
50 50
51 51
52 #ifdef __cplusplus 52 #ifdef __cplusplus
53 } // extern "C" 53 } // extern "C"
54 #endif 54 #endif
55 55
56 #endif // VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ 56 #endif // VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_vaq.c ('k') | source/libvpx/vp9/encoder/x86/vp9_dct_avx2.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698