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

Side by Side Diff: source/libvpx/vp9/decoder/vp9_read_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/decoder/vp9_onyxd_if.c ('k') | source/libvpx/vp9/encoder/vp9_bitstream.h » ('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
11 #ifndef VP9_DECODER_VP9_READ_BIT_BUFFER_H_ 11 #ifndef VP9_DECODER_VP9_READ_BIT_BUFFER_H_
12 #define VP9_DECODER_VP9_READ_BIT_BUFFER_H_ 12 #define VP9_DECODER_VP9_READ_BIT_BUFFER_H_
13 13
14 #include <limits.h> 14 #include <limits.h>
15 15
16 #include "vpx/vpx_integer.h" 16 #include "vpx/vpx_integer.h"
17 17
18 #ifdef __cplusplus 18 #ifdef __cplusplus
19 extern "C" { 19 extern "C" {
20 #endif 20 #endif
21 21
22 typedef void (*vp9_rb_error_handler)(void *data, size_t bit_offset); 22 typedef void (*vp9_rb_error_handler)(void *data);
23 23
24 struct vp9_read_bit_buffer { 24 struct vp9_read_bit_buffer {
25 const uint8_t *bit_buffer; 25 const uint8_t *bit_buffer;
26 const uint8_t *bit_buffer_end; 26 const uint8_t *bit_buffer_end;
27 size_t bit_offset; 27 size_t bit_offset;
28 28
29 void *error_handler_data; 29 void *error_handler_data;
30 vp9_rb_error_handler error_handler; 30 vp9_rb_error_handler error_handler;
31 }; 31 };
32 32
33 static size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) { 33 static size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) {
34 return rb->bit_offset / CHAR_BIT + (rb->bit_offset % CHAR_BIT > 0); 34 return rb->bit_offset / CHAR_BIT + (rb->bit_offset % CHAR_BIT > 0);
35 } 35 }
36 36
37 static int vp9_rb_read_bit(struct vp9_read_bit_buffer *rb) { 37 static int vp9_rb_read_bit(struct vp9_read_bit_buffer *rb) {
38 const size_t off = rb->bit_offset; 38 const size_t off = rb->bit_offset;
39 const size_t p = off / CHAR_BIT; 39 const size_t p = off / CHAR_BIT;
40 const int q = CHAR_BIT - 1 - (int)off % CHAR_BIT; 40 const int q = CHAR_BIT - 1 - (int)off % CHAR_BIT;
41 if (rb->bit_buffer + p >= rb->bit_buffer_end) { 41 if (rb->bit_buffer + p >= rb->bit_buffer_end) {
42 rb->error_handler(rb->error_handler_data, rb->bit_offset); 42 rb->error_handler(rb->error_handler_data);
43 return 0; 43 return 0;
44 } else { 44 } else {
45 const int bit = (rb->bit_buffer[p] & (1 << q)) >> q; 45 const int bit = (rb->bit_buffer[p] & (1 << q)) >> q;
46 rb->bit_offset = off + 1; 46 rb->bit_offset = off + 1;
47 return bit; 47 return bit;
48 } 48 }
49 } 49 }
50 50
51 static int vp9_rb_read_literal(struct vp9_read_bit_buffer *rb, int bits) { 51 static int vp9_rb_read_literal(struct vp9_read_bit_buffer *rb, int bits) {
52 int value = 0, bit; 52 int value = 0, bit;
53 for (bit = bits - 1; bit >= 0; bit--) 53 for (bit = bits - 1; bit >= 0; bit--)
54 value |= vp9_rb_read_bit(rb) << bit; 54 value |= vp9_rb_read_bit(rb) << bit;
55 return value; 55 return value;
56 } 56 }
57 57
58 static int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb, 58 static int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb,
59 int bits) { 59 int bits) {
60 const int value = vp9_rb_read_literal(rb, bits); 60 const int value = vp9_rb_read_literal(rb, bits);
61 return vp9_rb_read_bit(rb) ? -value : value; 61 return vp9_rb_read_bit(rb) ? -value : value;
62 } 62 }
63 63
64 #ifdef __cplusplus 64 #ifdef __cplusplus
65 } // extern "C" 65 } // extern "C"
66 #endif 66 #endif
67 67
68 #endif // VP9_DECODER_VP9_READ_BIT_BUFFER_H_ 68 #endif // VP9_DECODER_VP9_READ_BIT_BUFFER_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/decoder/vp9_onyxd_if.c ('k') | source/libvpx/vp9/encoder/vp9_bitstream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698