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

Side by Side Diff: source/libvpx/vp9/decoder/vp9_read_bit_buffer.c

Issue 812033011: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 5 years, 11 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_dthread.h ('k') | source/libvpx/vp9/decoder/vp9_reader.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 #include "vp9/decoder/vp9_read_bit_buffer.h" 10 #include "vp9/decoder/vp9_read_bit_buffer.h"
11 11
12 size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) { 12 size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) {
13 return (rb->bit_offset + CHAR_BIT - 1) / CHAR_BIT; 13 return (rb->bit_offset + 7) >> 3;
14 } 14 }
15 15
16 int vp9_rb_read_bit(struct vp9_read_bit_buffer *rb) { 16 int vp9_rb_read_bit(struct vp9_read_bit_buffer *rb) {
17 const size_t off = rb->bit_offset; 17 const size_t off = rb->bit_offset;
18 const size_t p = off / CHAR_BIT; 18 const size_t p = off >> 3;
19 const int q = CHAR_BIT - 1 - (int)off % CHAR_BIT; 19 const int q = 7 - (int)(off & 0x7);
20 if (rb->bit_buffer + p >= rb->bit_buffer_end) { 20 if (rb->bit_buffer + p < rb->bit_buffer_end) {
21 const int bit = (rb->bit_buffer[p] >> q) & 1;
22 rb->bit_offset = off + 1;
23 return bit;
24 } else {
21 rb->error_handler(rb->error_handler_data); 25 rb->error_handler(rb->error_handler_data);
22 return 0; 26 return 0;
23 } else {
24 const int bit = (rb->bit_buffer[p] & (1 << q)) >> q;
25 rb->bit_offset = off + 1;
26 return bit;
27 } 27 }
28 } 28 }
29 29
30 int vp9_rb_read_literal(struct vp9_read_bit_buffer *rb, int bits) { 30 int vp9_rb_read_literal(struct vp9_read_bit_buffer *rb, int bits) {
31 int value = 0, bit; 31 int value = 0, bit;
32 for (bit = bits - 1; bit >= 0; bit--) 32 for (bit = bits - 1; bit >= 0; bit--)
33 value |= vp9_rb_read_bit(rb) << bit; 33 value |= vp9_rb_read_bit(rb) << bit;
34 return value; 34 return value;
35 } 35 }
36 36
37 int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb, 37 int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb,
38 int bits) { 38 int bits) {
39 const int value = vp9_rb_read_literal(rb, bits); 39 const int value = vp9_rb_read_literal(rb, bits);
40 return vp9_rb_read_bit(rb) ? -value : value; 40 return vp9_rb_read_bit(rb) ? -value : value;
41 } 41 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/decoder/vp9_dthread.h ('k') | source/libvpx/vp9/decoder/vp9_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698