gecko-dev/media/libvpx/vp8/decoder/dboolhuff.c
Jan Gerber d37a938d00 Bug 1151175 - Update libvpx to 1.4.0. r=rillian
vp9_thread.c has changed directories, which mach doesn't handle
properly, resulting in "No rule to make target" for the old source
file path.

Bump clobber for libvpx file renames.

--HG--
rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp8/common/arm/neon/dequantizeb_neon.c
rename : media/libvpx/vp8/common/x86/loopfilter_block_sse2.asm => media/libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_avg_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_copy_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_copy_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_loopfilter_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm
rename : media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon.asm => media/libvpx/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm
rename : media/libvpx/vp9/decoder/vp9_thread.h => media/libvpx/vp9/common/vp9_thread.h
rename : media/libvpx/vp9/encoder/vp9_vaq.h => media/libvpx/vp9/encoder/vp9_aq_variance.h
rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vp9/encoder/vp9_ethread.h
rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vp9/encoder/vp9_skin_detection.h
rename : media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3.asm => media/libvpx/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm
rename : media/libvpx/vp8/encoder/psnr.h => media/libvpx/vpx/internal/vpx_psnr.h
rename : media/libvpx/vp9/common/generic/vp9_systemdependent.c => media/libvpx/vpx/src/vpx_psnr.c
extra : rebase_source : 82ccda936f3d40e8e960c35174e25483ed88726a
2015-06-17 20:46:25 +02:00

77 lines
2.0 KiB
C

/*
* Copyright (c) 2010 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 "dboolhuff.h"
#include "vp8/common/common.h"
int vp8dx_start_decode(BOOL_DECODER *br,
const unsigned char *source,
unsigned int source_sz,
vpx_decrypt_cb decrypt_cb,
void *decrypt_state)
{
br->user_buffer_end = source+source_sz;
br->user_buffer = source;
br->value = 0;
br->count = -8;
br->range = 255;
br->decrypt_cb = decrypt_cb;
br->decrypt_state = decrypt_state;
if (source_sz && !source)
return 1;
/* Populate the buffer */
vp8dx_bool_decoder_fill(br);
return 0;
}
void vp8dx_bool_decoder_fill(BOOL_DECODER *br)
{
const unsigned char *bufptr = br->user_buffer;
VP8_BD_VALUE value = br->value;
int count = br->count;
int shift = VP8_BD_VALUE_SIZE - CHAR_BIT - (count + CHAR_BIT);
size_t bytes_left = br->user_buffer_end - bufptr;
size_t bits_left = bytes_left * CHAR_BIT;
int x = (int)(shift + CHAR_BIT - bits_left);
int loop_end = 0;
unsigned char decrypted[sizeof(VP8_BD_VALUE) + 1];
if (br->decrypt_cb) {
size_t n = MIN(sizeof(decrypted), bytes_left);
br->decrypt_cb(br->decrypt_state, bufptr, decrypted, (int)n);
bufptr = decrypted;
}
if(x >= 0)
{
count += VP8_LOTS_OF_BITS;
loop_end = x;
}
if (x < 0 || bits_left)
{
while(shift >= loop_end)
{
count += CHAR_BIT;
value |= (VP8_BD_VALUE)*bufptr << shift;
++bufptr;
++br->user_buffer;
shift -= CHAR_BIT;
}
}
br->value = value;
br->count = count;
}