From da49e34c1fb5e99681f4ad99c21d9cfd83eddb96 Mon Sep 17 00:00:00 2001 From: Vignesh Venkatasubramanian Date: Tue, 25 Aug 2015 11:05:01 -0700 Subject: libvpx: Pull from upstream Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06 Includes security fixes and performance improvements. Also removed the VP10 related code from the upstream repository. BUG=23452792 Change-Id: I97452dff5b1f0756e19d621111797363cc533d46 --- libvpx/vp9/decoder/vp9_read_bit_buffer.c | 41 -------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 libvpx/vp9/decoder/vp9_read_bit_buffer.c (limited to 'libvpx/vp9/decoder/vp9_read_bit_buffer.c') diff --git a/libvpx/vp9/decoder/vp9_read_bit_buffer.c b/libvpx/vp9/decoder/vp9_read_bit_buffer.c deleted file mode 100644 index 3eef72844..000000000 --- a/libvpx/vp9/decoder/vp9_read_bit_buffer.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2013 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -#include "vp9/decoder/vp9_read_bit_buffer.h" - -size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) { - return (rb->bit_offset + CHAR_BIT - 1) / CHAR_BIT; -} - -int vp9_rb_read_bit(struct vp9_read_bit_buffer *rb) { - const size_t off = rb->bit_offset; - const size_t p = off / CHAR_BIT; - const int q = CHAR_BIT - 1 - (int)off % CHAR_BIT; - if (rb->bit_buffer + p >= rb->bit_buffer_end) { - rb->error_handler(rb->error_handler_data); - return 0; - } else { - const int bit = (rb->bit_buffer[p] & (1 << q)) >> q; - rb->bit_offset = off + 1; - return bit; - } -} - -int vp9_rb_read_literal(struct vp9_read_bit_buffer *rb, int bits) { - int value = 0, bit; - for (bit = bits - 1; bit >= 0; bit--) - value |= vp9_rb_read_bit(rb) << bit; - return value; -} - -int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb, - int bits) { - const int value = vp9_rb_read_literal(rb, bits); - return vp9_rb_read_bit(rb) ? -value : value; -} -- cgit v1.2.3