Merge "Add VPXD_SET_DECRYPTOR support to the VP9 decoder."

Multimedia / WebM - Joey Parrish [google.com] - 24 April 2014 09:45 UTC

109f58a Merge "Add VPXD_SET_DECRYPTOR support to the VP9 decoder."

configure | 2 -
test/test.mk | 1 +
test/vp8_boolcoder_test.cc | 8 +--
test/vp8_decrypt_test.cc | 10 ++--
test/vp9_boolcoder_test.cc | 2 +-
test/vp9_decrypt_test.cc | 71 ++++++++++++++++++++++++
vp8/common/common.h | 3 +
vp8/decoder/dboolhuff.c | 7 ++-
vp8/decoder/dboolhuff.h | 11 +---
vp8/decoder/decodeframe.c | 4 +-
vp8/decoder/error_concealment.c | 4 +-
vp8/decoder/onyxd_int.h | 2 +-
vp8/encoder/mcomp.c | 1 +
vp8/encoder/mr_dissim.c | 1 +
vp8/encoder/onyx_int.h | 3 -
vp8/encoder/pickinter.c | 1 +
vp8/vp8_dx_iface.c | 22 +++++---
vp9/decoder/vp9_decodeframe.c | 69 ++++++++++++++++++-----
vp9/decoder/vp9_decoder.h | 3 +
vp9/decoder/vp9_reader.c | 26 +++++++--
vp9/decoder/vp9_reader.h | 10 +++-
vp9/vp9_dx_iface.c | 117 +++++++++++++++++++++++++++++++--------
vpx/vp8dx.h | 39 ++++++++-----
23 files changed, 316 insertions(+), 101 deletions(-)

Upstream: git.chromium.org

  • Share