Skip to content

F
ffmpeg.wasm-core
Commit 89f2f5db authored by Peter Ross's avatar Peter Ross Committed by Michael Niedermayer
Browse files
Options

On2 VP7 decoder 

Signed-off-by: 's avatarPeter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7d4c0220
Show whitespace changes
Inline Side-by-side
Showing with 829 additions and 144 deletions
Changelog
View file @ 89f2f5db
...@@ -6,6 +6,7 @@ version <next>: ...@@ -6,6 +6,7 @@ version <next>:
- subfile protocol - subfile protocol
- Phantom Cine demuxer - Phantom Cine demuxer
- replaygain data export - replaygain data export
- VP7 video decoder
version 2.2: version 2.2:
......
doc/general.texi
View file @ 89f2f5db
...@@ -717,6 +717,8 @@ following image formats are supported: ...@@ -717,6 +717,8 @@ following image formats are supported:
@tab fourcc: VP50 @tab fourcc: VP50
@item On2 VP6 @tab @tab X @item On2 VP6 @tab @tab X
@tab fourcc: VP60,VP61,VP62 @tab fourcc: VP60,VP61,VP62
@item On2 VP7 @tab @tab X
@tab fourcc: VP70,VP71
@item VP8 @tab E @tab X @item VP8 @tab E @tab X
@tab fourcc: VP80, encoding supported through external library libvpx @tab fourcc: VP80, encoding supported through external library libvpx
@item VP9 @tab E @tab X @item VP9 @tab E @tab X
......
libavcodec/Makefile
View file @ 89f2f5db
...@@ -466,6 +466,7 @@ OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \ ...@@ -466,6 +466,7 @@ OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \
vp56rac.o vp56rac.o
OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \
vp6dsp.o vp56rac.o vp6dsp.o vp56rac.o
OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp8dsp.o vp56rac.o
OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o
OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9dsp.o vp56rac.o OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9dsp.o vp56rac.o
OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
......
libavcodec/allcodecs.c
View file @ 89f2f5db
...@@ -292,6 +292,7 @@ void avcodec_register_all(void) ...@@ -292,6 +292,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(VP6, vp6); REGISTER_DECODER(VP6, vp6);
REGISTER_DECODER(VP6A, vp6a); REGISTER_DECODER(VP6A, vp6a);
REGISTER_DECODER(VP6F, vp6f); REGISTER_DECODER(VP6F, vp6f);
REGISTER_DECODER(VP7, vp7);
REGISTER_DECODER(VP8, vp8); REGISTER_DECODER(VP8, vp8);
REGISTER_DECODER(VP9, vp9); REGISTER_DECODER(VP9, vp9);
REGISTER_DECODER(VQA, vqa); REGISTER_DECODER(VQA, vqa);
......
libavcodec/arm/h264pred_init_arm.c
View file @ 89f2f5db
...@@ -57,10 +57,10 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id, ...@@ -57,10 +57,10 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
if(chroma_format_idc == 1){ if(chroma_format_idc == 1){
h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon; h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
if (codec_id != AV_CODEC_ID_VP8) if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon; h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon; h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon;
if (codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP8) { if (codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8) {
h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon; h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon;
h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon; h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon; h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
...@@ -77,7 +77,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id, ...@@ -77,7 +77,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon; h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon;
h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon; h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon; h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP8) if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
#endif // HAVE_NEON #endif // HAVE_NEON
} }
......
libavcodec/arm/vp8.h
View file @ 89f2f5db
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "libavcodec/vp8.h" #include "libavcodec/vp8.h"
#if HAVE_ARMV6_EXTERNAL #if HAVE_ARMV6_EXTERNAL
#define decode_block_coeffs_internal ff_decode_block_coeffs_armv6 #define vp8_decode_block_coeffs_internal ff_decode_block_coeffs_armv6
int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, int16_t block[16], int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, int16_t block[16],
uint8_t probs[8][3][NUM_DCT_TOKENS-1], uint8_t probs[8][3][NUM_DCT_TOKENS-1],
int i, uint8_t *token_prob, int16_t qmul[2]); int i, uint8_t *token_prob, int16_t qmul[2]);
......
libavcodec/avcodec.h
View file @ 89f2f5db
...@@ -314,6 +314,7 @@ enum AVCodecID { ...@@ -314,6 +314,7 @@ enum AVCodecID {
AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'), AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'),
AV_CODEC_ID_HEVC = MKBETAG('H','2','6','5'), AV_CODEC_ID_HEVC = MKBETAG('H','2','6','5'),
#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC #define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
AV_CODEC_ID_VP7 = MKBETAG('V','P','7','0'),
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
libavcodec/codec_desc.c
View file @ 89f2f5db
...@@ -1241,6 +1241,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1241,6 +1241,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"), .long_name = NULL_IF_CONFIG_SMALL("Mirillis FIC"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_VP7,
.type = AVMEDIA_TYPE_VIDEO,
.name = "vp7",
.long_name = NULL_IF_CONFIG_SMALL("On2 VP7"),
.props = AV_CODEC_PROP_LOSSY,
},
/* image codecs */ /* image codecs */
{ {
......
libavcodec/h264pred.c
View file @ 89f2f5db
...@@ -420,7 +420,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -420,7 +420,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
#define H264_PRED(depth) \ #define H264_PRED(depth) \
if(codec_id != AV_CODEC_ID_RV40){\ if(codec_id != AV_CODEC_ID_RV40){\
if(codec_id == AV_CODEC_ID_VP8) {\ if(codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\
h->pred4x4[VERT_PRED ]= FUNCD(pred4x4_vertical_vp8);\ h->pred4x4[VERT_PRED ]= FUNCD(pred4x4_vertical_vp8);\
h->pred4x4[HOR_PRED ]= FUNCD(pred4x4_horizontal_vp8);\ h->pred4x4[HOR_PRED ]= FUNCD(pred4x4_horizontal_vp8);\
} else {\ } else {\
...@@ -435,15 +435,14 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -435,15 +435,14 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\
h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\
h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\
if (codec_id == AV_CODEC_ID_VP8) {\ if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\
h->pred4x4[VERT_LEFT_PRED ]= FUNCD(pred4x4_vertical_left_vp8);\ h->pred4x4[VERT_LEFT_PRED ]= FUNCD(pred4x4_vertical_left_vp8);\
} else\ } else\
h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left , depth);\ h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left , depth);\
h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up , depth);\ h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up , depth);\
if(codec_id != AV_CODEC_ID_VP8) {\ if(codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8) {\
h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\
h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\
h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\
} else {\ } else {\
h->pred4x4[TM_VP8_PRED ]= FUNCD(pred4x4_tm_vp8);\ h->pred4x4[TM_VP8_PRED ]= FUNCD(pred4x4_tm_vp8);\
h->pred4x4[DC_127_PRED ]= FUNCC(pred4x4_127_dc , depth);\ h->pred4x4[DC_127_PRED ]= FUNCC(pred4x4_127_dc , depth);\
...@@ -451,6 +450,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -451,6 +450,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
h->pred4x4[VERT_VP8_PRED ]= FUNCC(pred4x4_vertical , depth);\ h->pred4x4[VERT_VP8_PRED ]= FUNCC(pred4x4_vertical , depth);\
h->pred4x4[HOR_VP8_PRED ]= FUNCC(pred4x4_horizontal , depth);\ h->pred4x4[HOR_VP8_PRED ]= FUNCC(pred4x4_horizontal , depth);\
}\ }\
if (codec_id != AV_CODEC_ID_VP8)\
h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\
}else{\ }else{\
h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\
h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\
...@@ -489,7 +490,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -489,7 +490,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x16_vertical , depth);\ h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x16_vertical , depth);\
h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x16_horizontal , depth);\ h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x16_horizontal , depth);\
}\ }\
if (codec_id != AV_CODEC_ID_VP8) {\ if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8) {\
if (chroma_format_idc <= 1) {\ if (chroma_format_idc <= 1) {\
h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\ h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\
} else {\ } else {\
...@@ -497,7 +498,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -497,7 +498,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
}\ }\
} else\ } else\
h->pred8x8[PLANE_PRED8x8]= FUNCD(pred8x8_tm_vp8);\ h->pred8x8[PLANE_PRED8x8]= FUNCD(pred8x8_tm_vp8);\
if(codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP8){\ if(codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8){\
if (chroma_format_idc <= 1) {\ if (chroma_format_idc <= 1) {\
h->pred8x8[DC_PRED8x8 ]= FUNCC(pred8x8_dc , depth);\ h->pred8x8[DC_PRED8x8 ]= FUNCC(pred8x8_dc , depth);\
h->pred8x8[LEFT_DC_PRED8x8]= FUNCC(pred8x8_left_dc , depth);\ h->pred8x8[LEFT_DC_PRED8x8]= FUNCC(pred8x8_left_dc , depth);\
...@@ -519,7 +520,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -519,7 +520,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
h->pred8x8[DC_PRED8x8 ]= FUNCD(pred8x8_dc_rv40);\ h->pred8x8[DC_PRED8x8 ]= FUNCD(pred8x8_dc_rv40);\
h->pred8x8[LEFT_DC_PRED8x8]= FUNCD(pred8x8_left_dc_rv40);\ h->pred8x8[LEFT_DC_PRED8x8]= FUNCD(pred8x8_left_dc_rv40);\
h->pred8x8[TOP_DC_PRED8x8 ]= FUNCD(pred8x8_top_dc_rv40);\ h->pred8x8[TOP_DC_PRED8x8 ]= FUNCD(pred8x8_top_dc_rv40);\
if (codec_id == AV_CODEC_ID_VP8) {\ if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\
h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc , depth);\ h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc , depth);\
h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc , depth);\ h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc , depth);\
}\ }\
...@@ -540,6 +541,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, ...@@ -540,6 +541,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
case AV_CODEC_ID_RV40:\ case AV_CODEC_ID_RV40:\
h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_plane_rv40);\ h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_plane_rv40);\
break;\ break;\
case AV_CODEC_ID_VP7:\
case AV_CODEC_ID_VP8:\ case AV_CODEC_ID_VP8:\
h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_tm_vp8);\ h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_tm_vp8);\
h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc , depth);\ h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc , depth);\
......
libavcodec/vp8.c
View file @ 89f2f5db
/* /*
* VP8 compatible video decoder * VP7/VP8 compatible video decoder
* *
* Copyright (C) 2010 David Conrad * Copyright (C) 2010 David Conrad
* Copyright (C) 2010 Ronald S. Bultje * Copyright (C) 2010 Ronald S. Bultje
* Copyright (C) 2010 Jason Garrett-Glaser * Copyright (C) 2010 Jason Garrett-Glaser
* Copyright (C) 2012 Daniel Kang * Copyright (C) 2012 Daniel Kang
* Copyright (C) 2014 Peter Ross
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
...@@ -35,6 +36,14 @@ ...@@ -35,6 +36,14 @@
# include "arm/vp8.h" # include "arm/vp8.h"
#endif #endif
#if CONFIG_VP7_DECODER && CONFIG_VP8_DECODER
#define VPX(vp7, f) (vp7 ? vp7_ ## f : vp8_ ## f)
#elif CONFIG_VP7_DECODER
#define VPX(vp7, f) vp7_ ## f
#else // CONFIG_VP8_DECODER
#define VPX(vp7, f) vp8_ ## f
#endif
static void free_buffers(VP8Context *s) static void free_buffers(VP8Context *s)
{ {
int i; int i;
...@@ -74,6 +83,7 @@ static void vp8_release_frame(VP8Context *s, VP8Frame *f) ...@@ -74,6 +83,7 @@ static void vp8_release_frame(VP8Context *s, VP8Frame *f)
ff_thread_release_buffer(s->avctx, &f->tf); ff_thread_release_buffer(s->avctx, &f->tf);
} }
#if CONFIG_VP8_DECODER
static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src) static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src)
{ {
int ret; int ret;
...@@ -90,6 +100,7 @@ static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src) ...@@ -90,6 +100,7 @@ static int vp8_ref_frame(VP8Context *s, VP8Frame *dst, VP8Frame *src)
return 0; return 0;
} }
#endif
static void vp8_decode_flush_impl(AVCodecContext *avctx, int free_mem) static void vp8_decode_flush_impl(AVCodecContext *avctx, int free_mem)
...@@ -151,7 +162,7 @@ static int update_dimensions(VP8Context *s, int width, int height) ...@@ -151,7 +162,7 @@ static int update_dimensions(VP8Context *s, int width, int height)
s->mb_width = (s->avctx->coded_width +15) / 16; s->mb_width = (s->avctx->coded_width +15) / 16;
s->mb_height = (s->avctx->coded_height+15) / 16; s->mb_height = (s->avctx->coded_height+15) / 16;
s->mb_layout = (avctx->active_thread_type == FF_THREAD_SLICE) && (FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1); s->mb_layout = s->vp7 || (avctx->active_thread_type == FF_THREAD_SLICE) && (FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1);
if (!s->mb_layout) { // Frame threading and one thread if (!s->mb_layout) { // Frame threading and one thread
s->macroblocks_base = av_mallocz((s->mb_width+s->mb_height*2+1)*sizeof(*s->macroblocks)); s->macroblocks_base = av_mallocz((s->mb_width+s->mb_height*2+1)*sizeof(*s->macroblocks));
s->intra4x4_pred_mode_top = av_mallocz(s->mb_width*4); s->intra4x4_pred_mode_top = av_mallocz(s->mb_width*4);
...@@ -179,6 +190,8 @@ static int update_dimensions(VP8Context *s, int width, int height) ...@@ -179,6 +190,8 @@ static int update_dimensions(VP8Context *s, int width, int height)
return 0; return 0;
} }
#if CONFIG_VP8_DECODER
static void parse_segment_info(VP8Context *s) static void parse_segment_info(VP8Context *s)
{ {
VP56RangeCoder *c = &s->c; VP56RangeCoder *c = &s->c;
...@@ -249,8 +262,31 @@ static int setup_partitions(VP8Context *s, const uint8_t *buf, int buf_size) ...@@ -249,8 +262,31 @@ static int setup_partitions(VP8Context *s, const uint8_t *buf, int buf_size)
return 0; return 0;
} }
#endif
#if CONFIG_VP7_DECODER
static void vp7_get_quants(VP8Context *s)
{
VP56RangeCoder *c = &s->c;
int yac_qi = vp8_rac_get_uint(c, 7);
int ydc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
int y2dc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
int y2ac_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
int uvdc_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
int uvac_qi = vp8_rac_get(c) ? vp8_rac_get_uint(c, 7) : yac_qi;
s->qmat[0].luma_qmul[0] = vp7_ydc_qlookup[ydc_qi];
s->qmat[0].luma_qmul[1] = vp7_yac_qlookup[yac_qi];
s->qmat[0].luma_dc_qmul[0] = vp7_y2dc_qlookup[y2dc_qi];
s->qmat[0].luma_dc_qmul[1] = vp7_y2ac_qlookup[y2ac_qi];
s->qmat[0].chroma_qmul[0] = FFMIN(vp7_ydc_qlookup[uvdc_qi], 132);
s->qmat[0].chroma_qmul[1] = vp7_yac_qlookup[uvac_qi];
}
#endif
static void get_quants(VP8Context *s) #if CONFIG_VP8_DECODER
static void vp8_get_quants(VP8Context *s)
{ {
VP56RangeCoder *c = &s->c; VP56RangeCoder *c = &s->c;
int i, base_qi; int i, base_qi;
...@@ -311,7 +347,53 @@ static VP56Frame ref_to_update(VP8Context *s, int update, VP56Frame ref) ...@@ -311,7 +347,53 @@ static VP56Frame ref_to_update(VP8Context *s, int update, VP56Frame ref)
} }
return VP56_FRAME_NONE; return VP56_FRAME_NONE;
} }
#endif
static void vp78_reset_probability_tables(VP8Context *s)
{
int i, j;
for (i = 0; i < 4; i++)
for (j = 0; j < 16; j++)
memcpy(s->prob->token[i][j], vp8_token_default_probs[i][vp8_coeff_band[j]],
sizeof(s->prob->token[i][j]));
}
static void vp78_update_probability_tables(VP8Context *s)
{
VP56RangeCoder *c = &s->c;
int i, j, k, l, m;
for (i = 0; i < 4; i++)
for (j = 0; j < 8; j++)
for (k = 0; k < 3; k++)
for (l = 0; l < NUM_DCT_TOKENS-1; l++)
if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) {
int prob = vp8_rac_get_uint(c, 8);
for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++)
s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob;
}
}
static void vp78_update_pred16x16_pred8x8_mvc_probabilities(VP8Context *s)
{
VP56RangeCoder *c = &s->c;
int i, j;
if (vp8_rac_get(c))
for (i = 0; i < 4; i++)
s->prob->pred16x16[i] = vp8_rac_get_uint(c, 8);
if (vp8_rac_get(c))
for (i = 0; i < 3; i++)
s->prob->pred8x8c[i] = vp8_rac_get_uint(c, 8);
// 17.2 MV probability update
for (i = 0; i < 2; i++)
for (j = 0; j < (s->vp7 ? 17 : 19); j++)
if (vp56_rac_get_prob_branchy(c, vp8_mv_update_prob[i][j]))
s->prob->mvc[i][j] = vp8_rac_get_nn(c);
}
#if CONFIG_VP8_DECODER
static void update_refs(VP8Context *s) static void update_refs(VP8Context *s)
{ {
VP56RangeCoder *c = &s->c; VP56RangeCoder *c = &s->c;
...@@ -322,11 +404,182 @@ static void update_refs(VP8Context *s) ...@@ -322,11 +404,182 @@ static void update_refs(VP8Context *s)
s->update_golden = ref_to_update(s, update_golden, VP56_FRAME_GOLDEN); s->update_golden = ref_to_update(s, update_golden, VP56_FRAME_GOLDEN);
s->update_altref = ref_to_update(s, update_altref, VP56_FRAME_GOLDEN2); s->update_altref = ref_to_update(s, update_altref, VP56_FRAME_GOLDEN2);
} }
#endif
#if CONFIG_VP7_DECODER
static void fade(uint8_t *dst, int dst_linesize, const uint8_t *src, int src_linesize, int width, int height, int alpha, int beta)
{
int i, j;
for (j = 0; j < height; j++)
for (i = 0; i < width; i++) {
uint8_t y = src[j*src_linesize + i];
dst[j*dst_linesize + i] = av_clip_uint8(y + ((y * beta) >> 8) + alpha);
}
}
static int vp7_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
{
VP56RangeCoder *c = &s->c;
int part1_size, hscale, vscale, i, j, ret;
int width = s->avctx->width;
int height = s->avctx->height;
s->profile = (buf[0]>>1) & 7;
if (s->profile > 1) {
avpriv_request_sample(s->avctx, "Unknown profile %d", s->profile);
return AVERROR_INVALIDDATA;
}
s->keyframe = !(buf[0] & 1);
s->invisible = 0;
part1_size = AV_RL24(buf) >> 4;
buf += 4 - s->profile;
buf_size -= 4 - s->profile;
memcpy(s->put_pixels_tab, s->vp8dsp.put_vp8_epel_pixels_tab, sizeof(s->put_pixels_tab));
ff_vp56_init_range_decoder(c, buf, part1_size);
buf += part1_size;
buf_size -= part1_size;
/* A. Dimension information (keyframes only) */
if (s->keyframe) {
width = vp8_rac_get_uint(c, 12);
height = vp8_rac_get_uint(c, 12);
hscale = vp8_rac_get_uint(c, 2);
vscale = vp8_rac_get_uint(c, 2);
if (hscale || vscale)
avpriv_request_sample(s->avctx, "Upscaling");
s->update_golden = s->update_altref = VP56_FRAME_CURRENT;
vp78_reset_probability_tables(s);
memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter, sizeof(s->prob->pred16x16));
memcpy(s->prob->pred8x8c , vp8_pred8x8c_prob_inter , sizeof(s->prob->pred8x8c));
for (i = 0; i < 2; i++)
memcpy(s->prob->mvc[i], vp7_mv_default_prob[i], sizeof(vp7_mv_default_prob[i]));
memset(&s->segmentation, 0, sizeof(s->segmentation));
memset(&s->lf_delta, 0, sizeof(s->lf_delta));
memcpy(s->prob[0].scan, zigzag_scan, sizeof(s->prob[0].scan));
}
if (s->keyframe || s->profile > 0)
memset(s->inter_dc_pred, 0 , sizeof(s->inter_dc_pred));
/* B. Decoding information for all four macroblock-level features */
for (i = 0; i < 4; i++) {
s->feature_enabled[i] = vp8_rac_get(c);
if (s->feature_enabled[i]) {
s->feature_present_prob[i] = vp8_rac_get_uint(c, 8);
for (j = 0; j < 3; j++)
s->feature_index_prob[i][j] = vp8_rac_get(c) ? vp8_rac_get_uint(c, 8) : 255;
if (vp7_feature_value_size[i])
for (j = 0; j < 4; j++)
s->feature_value[i][j] = vp8_rac_get(c) ? vp8_rac_get_uint(c, vp7_feature_value_size[s->profile][i]) : 0;
}
}
s->segmentation.enabled = 0;
s->segmentation.update_map = 0;
s->lf_delta.enabled = 0;
s->num_coeff_partitions = 1;
ff_vp56_init_range_decoder(&s->coeff_partition[0], buf, buf_size);
if (!s->macroblocks_base || /* first frame */
width != s->avctx->width || height != s->avctx->height || (width+15)/16 != s->mb_width || (height+15)/16 != s->mb_height) {
if ((ret = update_dimensions(s, width, height)) < 0)
return ret;
}
/* C. Dequantization indices */
vp7_get_quants(s);
/* D. Golden frame update flag (a Flag) for interframes only */
if (!s->keyframe) {
s->update_golden = vp8_rac_get(c) ? VP56_FRAME_CURRENT : VP56_FRAME_NONE;
s->sign_bias[VP56_FRAME_GOLDEN] = 0;
}
s->update_last = 1;
s->update_probabilities = 1;
s->fade_present = 1;
if (s->profile > 0) {
s->update_probabilities = vp8_rac_get(c);
if (!s->update_probabilities)
s->prob[1] = s->prob[0];
if (!s->keyframe)
s->fade_present = vp8_rac_get(c);
}
/* E. Fading information for previous frame */
if (s->fade_present && vp8_rac_get(c)) {
int alpha = (int8_t)vp8_rac_get_uint(c, 8);
int beta = (int8_t)vp8_rac_get_uint(c, 8);
if (!s->keyframe && (alpha || beta)) {
/* preserve the golden frame */
if (s->framep[VP56_FRAME_GOLDEN] == s->framep[VP56_FRAME_PREVIOUS]) {
AVFrame *gold = s->framep[VP56_FRAME_GOLDEN]->tf.f;
AVFrame *prev;
int i, j;
s->framep[VP56_FRAME_PREVIOUS] = vp8_find_free_buffer(s);
if ((ret = vp8_alloc_frame(s, s->framep[VP56_FRAME_PREVIOUS], 1)) < 0)
return ret;
prev = s->framep[VP56_FRAME_PREVIOUS]->tf.f;
fade(prev->data[0], prev->linesize[0], gold->data[0], gold->linesize[0], s->mb_width * 16, s->mb_height * 16, alpha, beta);
for (j = 1; j < 3; j++)
for (i = 0; i < s->mb_height * 8; i++)
memcpy(prev->data[j] + i * prev->linesize[j], gold->data[j] + i * gold->linesize[j], s->mb_width * 8);
} else {
AVFrame *prev = s->framep[VP56_FRAME_PREVIOUS]->tf.f;
fade(prev->data[0], prev->linesize[0], prev->data[0], prev->linesize[0], s->mb_width * 16, s->mb_height * 16, alpha, beta);
}
}
}
/* F. Loop filter type */
if (!s->profile)
s->filter.simple = vp8_rac_get(c);
/* G. DCT coefficient ordering specification */
if (vp8_rac_get(c))
for (i = 1; i < 16; i++)
s->prob[0].scan[i] = zigzag_scan[vp8_rac_get_uint(c, 4)];
/* H. Loop filter levels */
if (s->profile > 0)
s->filter.simple = vp8_rac_get(c);
s->filter.level = vp8_rac_get_uint(c, 6);
s->filter.sharpness = vp8_rac_get_uint(c, 3);
/* I. DCT coefficient probability update; 13.3 Token Probability Updates */
vp78_update_probability_tables(s);
s->mbskip_enabled = 0;
/* J. The remaining frame header data occurs ONLY FOR INTERFRAMES */
if (!s->keyframe) {
s->prob->intra = vp8_rac_get_uint(c, 8);
s->prob->last = vp8_rac_get_uint(c, 8);
vp78_update_pred16x16_pred8x8_mvc_probabilities(s);
}
return 0;
}
#endif
static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) #if CONFIG_VP8_DECODER
static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
{ {
VP56RangeCoder *c = &s->c; VP56RangeCoder *c = &s->c;
int header_size, hscale, vscale, i, j, k, l, m, ret; int header_size, hscale, vscale, ret;
int width = s->avctx->width; int width = s->avctx->width;
int height = s->avctx->height; int height = s->avctx->height;
...@@ -366,10 +619,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) ...@@ -366,10 +619,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
avpriv_request_sample(s->avctx, "Upscaling"); avpriv_request_sample(s->avctx, "Upscaling");
s->update_golden = s->update_altref = VP56_FRAME_CURRENT; s->update_golden = s->update_altref = VP56_FRAME_CURRENT;
for (i = 0; i < 4; i++) vp78_reset_probability_tables(s);
for (j = 0; j < 16; j++)
memcpy(s->prob->token[i][j], vp8_token_default_probs[i][vp8_coeff_band[j]],
sizeof(s->prob->token[i][j]));
memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter, sizeof(s->prob->pred16x16)); memcpy(s->prob->pred16x16, vp8_pred16x16_prob_inter, sizeof(s->prob->pred16x16));
memcpy(s->prob->pred8x8c , vp8_pred8x8c_prob_inter , sizeof(s->prob->pred8x8c)); memcpy(s->prob->pred8x8c , vp8_pred8x8c_prob_inter , sizeof(s->prob->pred8x8c));
memcpy(s->prob->mvc , vp8_mv_default_prob , sizeof(s->prob->mvc)); memcpy(s->prob->mvc , vp8_mv_default_prob , sizeof(s->prob->mvc));
...@@ -411,7 +661,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) ...@@ -411,7 +661,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
return ret; return ret;
} }
get_quants(s); vp8_get_quants(s);
if (!s->keyframe) { if (!s->keyframe) {
update_refs(s); update_refs(s);
...@@ -426,15 +676,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) ...@@ -426,15 +676,7 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
s->update_last = s->keyframe || vp8_rac_get(c); s->update_last = s->keyframe || vp8_rac_get(c);
for (i = 0; i < 4; i++) vp78_update_probability_tables(s);
for (j = 0; j < 8; j++)
for (k = 0; k < 3; k++)
for (l = 0; l < NUM_DCT_TOKENS-1; l++)
if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) {
int prob = vp8_rac_get_uint(c, 8);
for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++)
s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob;
}
if ((s->mbskip_enabled = vp8_rac_get(c))) if ((s->mbskip_enabled = vp8_rac_get(c)))
s->prob->mbskip = vp8_rac_get_uint(c, 8); s->prob->mbskip = vp8_rac_get_uint(c, 8);
...@@ -443,23 +685,12 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size) ...@@ -443,23 +685,12 @@ static int decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_size)
s->prob->intra = vp8_rac_get_uint(c, 8); s->prob->intra = vp8_rac_get_uint(c, 8);
s->prob->last = vp8_rac_get_uint(c, 8); s->prob->last = vp8_rac_get_uint(c, 8);
s->prob->golden = vp8_rac_get_uint(c, 8); s->prob->golden = vp8_rac_get_uint(c, 8);
vp78_update_pred16x16_pred8x8_mvc_probabilities(s);
if (vp8_rac_get(c))
for (i = 0; i < 4; i++)
s->prob->pred16x16[i] = vp8_rac_get_uint(c, 8);
if (vp8_rac_get(c))
for (i = 0; i < 3; i++)
s->prob->pred8x8c[i] = vp8_rac_get_uint(c, 8);
// 17.2 MV probability update
for (i = 0; i < 2; i++)
for (j = 0; j < 19; j++)
if (vp56_rac_get_prob_branchy(c, vp8_mv_update_prob[i][j]))
s->prob->mvc[i][j] = vp8_rac_get_nn(c);
} }
return 0; return 0;
} }
#endif
static av_always_inline void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv *src) static av_always_inline void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv *src)
{ {
...@@ -470,7 +701,7 @@ static av_always_inline void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv * ...@@ -470,7 +701,7 @@ static av_always_inline void clamp_mv(VP8Context *s, VP56mv *dst, const VP56mv *
/** /**
* Motion vector coding, 17.1. * Motion vector coding, 17.1.
*/ */
static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) static av_always_inline int read_mv_component(VP56RangeCoder *c, const uint8_t *p, int vp7)
{ {
int bit, x = 0; int bit, x = 0;
...@@ -479,9 +710,9 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) ...@@ -479,9 +710,9 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
x += vp56_rac_get_prob(c, p[9 + i]) << i; x += vp56_rac_get_prob(c, p[9 + i]) << i;
for (i = 9; i > 3; i--) for (i = (vp7 ? 7 : 9); i > 3; i--)
x += vp56_rac_get_prob(c, p[9 + i]) << i; x += vp56_rac_get_prob(c, p[9 + i]) << i;
if (!(x & 0xFFF0) || vp56_rac_get_prob(c, p[12])) if (!(x & (vp7 ? 0xF0 : 0xFFF0)) || vp56_rac_get_prob(c, p[12]))
x += 8; x += 8;
} else { } else {
// small_mvtree // small_mvtree
...@@ -498,6 +729,16 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) ...@@ -498,6 +729,16 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p)
return (x && vp56_rac_get_prob(c, p[1])) ? -x : x; return (x && vp56_rac_get_prob(c, p[1])) ? -x : x;
} }
static int vp7_read_mv_component(VP56RangeCoder *c, const uint8_t *p)
{
return read_mv_component(c, p, 1);
}
static int vp8_read_mv_component(VP56RangeCoder *c, const uint8_t *p)
{
return read_mv_component(c, p, 0);
}
static av_always_inline static av_always_inline
const uint8_t *get_submv_prob(uint32_t left, uint32_t top) const uint8_t *get_submv_prob(uint32_t left, uint32_t top)
{ {
...@@ -513,7 +754,7 @@ const uint8_t *get_submv_prob(uint32_t left, uint32_t top) ...@@ -513,7 +754,7 @@ const uint8_t *get_submv_prob(uint32_t left, uint32_t top)
* @returns the number of motion vectors parsed (2, 4 or 16) * @returns the number of motion vectors parsed (2, 4 or 16)
*/ */
static av_always_inline static av_always_inline
int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int layout) int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int layout, int vp7)
{ {
int part_idx; int part_idx;
int n, num; int n, num;
...@@ -562,13 +803,13 @@ int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int lay ...@@ -562,13 +803,13 @@ int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int lay
else else
above = AV_RN32A(&cur_mv[mbsplits_cur[k - 4]]); above = AV_RN32A(&cur_mv[mbsplits_cur[k - 4]]);
submv_prob = get_submv_prob(left, above); submv_prob = vp7 ? vp7_submv_prob : get_submv_prob(left, above);
if (vp56_rac_get_prob_branchy(c, submv_prob[0])) { if (vp56_rac_get_prob_branchy(c, submv_prob[0])) {
if (vp56_rac_get_prob_branchy(c, submv_prob[1])) { if (vp56_rac_get_prob_branchy(c, submv_prob[1])) {
if (vp56_rac_get_prob_branchy(c, submv_prob[2])) { if (vp56_rac_get_prob_branchy(c, submv_prob[2])) {
mb->bmv[n].y = mb->mv.y + read_mv_component(c, s->prob->mvc[0]); mb->bmv[n].y = mb->mv.y + VPX(vp7, read_mv_component)(c, s->prob->mvc[0]);
mb->bmv[n].x = mb->mv.x + read_mv_component(c, s->prob->mvc[1]); mb->bmv[n].x = mb->mv.x + VPX(vp7, read_mv_component)(c, s->prob->mvc[1]);
} else { } else {
AV_ZERO32(&mb->bmv[n]); AV_ZERO32(&mb->bmv[n]);
} }
...@@ -583,8 +824,120 @@ int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int lay ...@@ -583,8 +824,120 @@ int decode_splitmvs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, int lay
return num; return num;
} }
/**
* the vp7 reference decoder uses a padding macroblock column (added to right
* edge of the frame) to guard against illegal macroblock offsets. The algorithm
* has bugs that permit offsets to straddle the padding column. This function
* replicates those bugs.
* @param[out] edge_x macroblock x address
* @param[out] edge_y macroblock y address
* @return macroblock offset legal (boolean)
*/
static int vp7_calculate_mb_offset(int mb_x, int mb_y, int mb_width, int xoffset, int yoffset, int boundary, int *edge_x, int *edge_y)
{
int vwidth = mb_width + 1;
int new = (mb_y + yoffset) * vwidth + mb_x + xoffset;
if (new < boundary || new % vwidth == vwidth - 1)
return 0;
*edge_y = new / vwidth;
*edge_x = new % vwidth;
return 1;
}
static const VP56mv * get_bmv_ptr(const VP8Macroblock *mb, int subblock)
{
return &mb->bmv[mb->mode == VP8_MVMODE_SPLIT ? vp8_mbsplits[mb->partitioning][subblock] : 0];
}
static av_always_inline
void vp7_decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout)
{
VP8Macroblock *mb_edge[12];
enum { CNT_ZERO, CNT_NEAREST, CNT_NEAR };
enum { VP8_EDGE_TOP, VP8_EDGE_LEFT, VP8_EDGE_TOPLEFT };
int idx = CNT_ZERO;
VP56mv near_mv[3];
uint8_t cnt[3] = { 0 };
VP56RangeCoder *c = &s->c;
int i;
AV_ZERO32(&near_mv[0]);
AV_ZERO32(&near_mv[1]);
AV_ZERO32(&near_mv[2]);
for (i = 0; i < VP7_MV_PRED_COUNT; i++) {
const VP7MVPred * pred = &vp7_mv_pred[i];
int edge_x, edge_y;
if (vp7_calculate_mb_offset(mb_x, mb_y, s->mb_width, pred->xoffset, pred->yoffset, !s->profile, &edge_x, &edge_y)) {
VP8Macroblock *edge = mb_edge[i] = (s->mb_layout == 1) ?
s->macroblocks_base + (s->mb_width+1)*(edge_y + 1) + 1 + edge_x :
s->macroblocks + (s->mb_height - edge_y - 1)*2 + edge_x;
uint32_t mv = AV_RN32A(get_bmv_ptr(edge, vp7_mv_pred[i].subblock));
if (mv) {
if (AV_RN32A(&near_mv[CNT_NEAREST])) {
if (mv == AV_RN32A(&near_mv[CNT_NEAREST])) {
idx = CNT_NEAREST;
} else if (AV_RN32A(&near_mv[CNT_NEAR])) {
if (mv != AV_RN32A(&near_mv[CNT_NEAR]))
continue;
idx = CNT_NEAR;
} else {
AV_WN32A(&near_mv[CNT_NEAR], mv);
idx = CNT_NEAR;
}
} else {
AV_WN32A(&near_mv[CNT_NEAREST], mv);
idx = CNT_NEAREST;
}
} else {
idx = CNT_ZERO;
}
} else {
idx = CNT_ZERO;
}
cnt[idx] += vp7_mv_pred[i].score;
}
mb->partitioning = VP8_SPLITMVMODE_NONE;
if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_ZERO]][0])) {
mb->mode = VP8_MVMODE_MV;
if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAREST]][1])) {
if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][2])) {
if (cnt[CNT_NEAREST] > cnt[CNT_NEAR])
AV_WN32A(&mb->mv, cnt[CNT_ZERO] > cnt[CNT_NEAREST] ? 0 : AV_RN32A(&near_mv[CNT_NEAREST]));
else
AV_WN32A(&mb->mv, cnt[CNT_ZERO] > cnt[CNT_NEAR] ? 0 : AV_RN32A(&near_mv[CNT_NEAR]));
if (vp56_rac_get_prob_branchy(c, vp7_mode_contexts[cnt[CNT_NEAR]][3])) {
mb->mode = VP8_MVMODE_SPLIT;
mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, 1) - 1];
} else {
mb->mv.y += vp7_read_mv_component(c, s->prob->mvc[0]);
mb->mv.x += vp7_read_mv_component(c, s->prob->mvc[1]);
mb->bmv[0] = mb->mv;
}
} else {
mb->mv = near_mv[CNT_NEAR];
mb->bmv[0] = mb->mv;
}
} else {
mb->mv = near_mv[CNT_NEAREST];
mb->bmv[0] = mb->mv;
}
} else {
mb->mode = VP8_MVMODE_ZERO;
AV_ZERO32(&mb->mv);
mb->bmv[0] = mb->mv;
}
}
static av_always_inline static av_always_inline
void decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout) void vp8_decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout)
{ {
VP8Macroblock *mb_edge[3] = { 0 /* top */, VP8Macroblock *mb_edge[3] = { 0 /* top */,
mb - 1 /* left */, mb - 1 /* left */,
...@@ -661,10 +1014,10 @@ void decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout ...@@ -661,10 +1014,10 @@ void decode_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, int layout
if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_SPLITMV]][3])) { if (vp56_rac_get_prob_branchy(c, vp8_mode_contexts[cnt[CNT_SPLITMV]][3])) {
mb->mode = VP8_MVMODE_SPLIT; mb->mode = VP8_MVMODE_SPLIT;
mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout) - 1]; mb->mv = mb->bmv[decode_splitmvs(s, c, mb, layout, 0) - 1];
} else { } else {
mb->mv.y += read_mv_component(c, s->prob->mvc[0]); mb->mv.y += vp8_read_mv_component(c, s->prob->mvc[0]);
mb->mv.x += read_mv_component(c, s->prob->mvc[1]); mb->mv.x += vp8_read_mv_component(c, s->prob->mvc[1]);
mb->bmv[0] = mb->mv; mb->bmv[0] = mb->mv;
} }
} else { } else {
...@@ -716,17 +1069,32 @@ void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, ...@@ -716,17 +1069,32 @@ void decode_intra4x4_modes(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
} }
} }
static const char * vp7_feature_name[] = { "q-index", "lf-delta", "partial-golden-update", "blit-pitch" };
static av_always_inline static av_always_inline
void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
uint8_t *segment, uint8_t *ref, int layout) uint8_t *segment, uint8_t *ref, int layout, int vp7)
{ {
VP56RangeCoder *c = &s->c; VP56RangeCoder *c = &s->c;
if (vp7) {
int i;
*segment = 0;
for (i = 0; i < 4; i++) {
if (s->feature_enabled[i]) {
if (vp56_rac_get_prob(c, s->feature_present_prob[i])) {
int index = vp8_rac_get_tree(c, vp7_feature_index_tree, s->feature_index_prob[i]);
av_log(s->avctx, AV_LOG_WARNING, "Feature %s present in macroblock (value 0x%x)\n", vp7_feature_name[i], s->feature_value[i][index]);
}
}
}
} else {
if (s->segmentation.update_map) { if (s->segmentation.update_map) {
int bit = vp56_rac_get_prob(c, s->prob->segmentid[0]); int bit = vp56_rac_get_prob(c, s->prob->segmentid[0]);
*segment = vp56_rac_get_prob(c, s->prob->segmentid[1+bit]) + 2*bit; *segment = vp56_rac_get_prob(c, s->prob->segmentid[1+bit]) + 2*bit;
} else if (s->segmentation.enabled) } else if (s->segmentation.enabled)
*segment = ref ? *ref : *segment; *segment = ref ? *ref : *segment;
}
mb->segment = *segment; mb->segment = *segment;
mb->skip = s->mbskip_enabled ? vp56_rac_get_prob(c, s->prob->mbskip) : 0; mb->skip = s->mbskip_enabled ? vp56_rac_get_prob(c, s->prob->mbskip) : 0;
...@@ -737,7 +1105,7 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, ...@@ -737,7 +1105,7 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
if (mb->mode == MODE_I4x4) { if (mb->mode == MODE_I4x4) {
decode_intra4x4_modes(s, c, mb, mb_x, 1, layout); decode_intra4x4_modes(s, c, mb, mb_x, 1, layout);
} else { } else {
const uint32_t modes = vp8_pred4x4_mode[mb->mode] * 0x01010101u; const uint32_t modes = VPX(vp7, pred4x4_mode)[mb->mode] * 0x01010101u;
if (s->mb_layout) if (s->mb_layout)
AV_WN32A(mb->intra4x4_pred_mode_top, modes); AV_WN32A(mb->intra4x4_pred_mode_top, modes);
else else
...@@ -750,14 +1118,17 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, ...@@ -750,14 +1118,17 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
} else if (vp56_rac_get_prob_branchy(c, s->prob->intra)) { } else if (vp56_rac_get_prob_branchy(c, s->prob->intra)) {
// inter MB, 16.2 // inter MB, 16.2
if (vp56_rac_get_prob_branchy(c, s->prob->last)) if (vp56_rac_get_prob_branchy(c, s->prob->last))
mb->ref_frame = vp56_rac_get_prob(c, s->prob->golden) ? mb->ref_frame = (!vp7 && vp56_rac_get_prob(c, s->prob->golden)) ?
VP56_FRAME_GOLDEN2 /* altref */ : VP56_FRAME_GOLDEN; VP56_FRAME_GOLDEN2 /* altref */ : VP56_FRAME_GOLDEN;
else else
mb->ref_frame = VP56_FRAME_PREVIOUS; mb->ref_frame = VP56_FRAME_PREVIOUS;
s->ref_count[mb->ref_frame-1]++; s->ref_count[mb->ref_frame-1]++;
// motion vectors, 16.3 // motion vectors, 16.3
decode_mvs(s, mb, mb_x, mb_y, layout); if (vp7)
vp7_decode_mvs(s, mb, mb_x, mb_y, layout);
else
vp8_decode_mvs(s, mb, mb_x, mb_y, layout);
} else { } else {
// intra MB, 16.1 // intra MB, 16.1
mb->mode = vp8_rac_get_tree(c, vp8_pred16x16_tree_inter, s->prob->pred16x16); mb->mode = vp8_rac_get_tree(c, vp8_pred16x16_tree_inter, s->prob->pred16x16);
...@@ -772,7 +1143,28 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, ...@@ -772,7 +1143,28 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
} }
} }
#ifndef decode_block_coeffs_internal static av_always_inline int inter_predict_dc(int16_t block[16], int16_t pred[2])
{
int16_t dc = block[0];
int ret = 0;
if (pred[1] > 3) {
dc += pred[0];
ret = 1;
}
if (!pred[0] || !dc || FFSIGN(pred[0]) != FFSIGN(dc)) {
block[0] = pred[0] = dc;
pred[1] = 0;
} else {
if (pred[0] == dc)
pred[1]++;
block[0] = pred[0] = dc;
}
return ret;
}
/** /**
* @param r arithmetic bitstream reader context * @param r arithmetic bitstream reader context
* @param block destination for block coefficients * @param block destination for block coefficients
...@@ -782,14 +1174,17 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, ...@@ -782,14 +1174,17 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y,
* @return 0 if no coeffs were decoded * @return 0 if no coeffs were decoded
* otherwise, the index of the last coeff decoded plus one * otherwise, the index of the last coeff decoded plus one
*/ */
static int decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16], static av_always_inline
int decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16],
uint8_t probs[16][3][NUM_DCT_TOKENS-1], uint8_t probs[16][3][NUM_DCT_TOKENS-1],
int i, uint8_t *token_prob, int16_t qmul[2]) int i, uint8_t *token_prob, int16_t qmul[2],
const uint8_t scan[16], int vp7)
{ {
VP56RangeCoder c = *r; VP56RangeCoder c = *r;
goto skip_eob; goto skip_eob;
do { do {
int coeff; int coeff;
restart:
if (!vp56_rac_get_prob_branchy(&c, token_prob[0])) // DCT_EOB if (!vp56_rac_get_prob_branchy(&c, token_prob[0])) // DCT_EOB
break; break;
...@@ -798,6 +1193,8 @@ skip_eob: ...@@ -798,6 +1193,8 @@ skip_eob:
if (++i == 16) if (++i == 16)
break; // invalid input; blocks should end with EOB break; // invalid input; blocks should end with EOB
token_prob = probs[i][0]; token_prob = probs[i][0];
if (vp7)
goto restart;
goto skip_eob; goto skip_eob;
} }
...@@ -830,12 +1227,28 @@ skip_eob: ...@@ -830,12 +1227,28 @@ skip_eob:
} }
token_prob = probs[i+1][2]; token_prob = probs[i+1][2];
} }
block[zigzag_scan[i]] = (vp8_rac_get(&c) ? -coeff : coeff) * qmul[!!i]; block[scan[i]] = (vp8_rac_get(&c) ? -coeff : coeff) * qmul[!!i];
} while (++i < 16); } while (++i < 16);
*r = c; *r = c;
return i; return i;
} }
static int vp7_decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16],
uint8_t probs[16][3][NUM_DCT_TOKENS-1],
int i, uint8_t *token_prob, int16_t qmul[2],
const uint8_t scan[16])
{
return decode_block_coeffs_internal(r, block, probs, i, token_prob, qmul, scan, 1);
}
#ifndef vp8_decode_block_coeffs_internal
static int vp8_decode_block_coeffs_internal(VP56RangeCoder *r, int16_t block[16],
uint8_t probs[16][3][NUM_DCT_TOKENS-1],
int i, uint8_t *token_prob, int16_t qmul[2])
{
return decode_block_coeffs_internal(r, block, probs, i, token_prob, qmul, zigzag_scan, 0);
}
#endif #endif
/** /**
...@@ -846,36 +1259,43 @@ skip_eob: ...@@ -846,36 +1259,43 @@ skip_eob:
* @param zero_nhood the initial prediction context for number of surrounding * @param zero_nhood the initial prediction context for number of surrounding
* all-zero blocks (only left/top, so 0-2) * all-zero blocks (only left/top, so 0-2)
* @param qmul array holding the dc/ac dequant factor at position 0/1 * @param qmul array holding the dc/ac dequant factor at position 0/1
* @param scan scan pattern (VP7 only)
* @return 0 if no coeffs were decoded * @return 0 if no coeffs were decoded
* otherwise, the index of the last coeff decoded plus one * otherwise, the index of the last coeff decoded plus one
*/ */
static av_always_inline static av_always_inline
int decode_block_coeffs(VP56RangeCoder *c, int16_t block[16], int decode_block_coeffs(VP56RangeCoder *c, int16_t block[16],
uint8_t probs[16][3][NUM_DCT_TOKENS-1], uint8_t probs[16][3][NUM_DCT_TOKENS-1],
int i, int zero_nhood, int16_t qmul[2]) int i, int zero_nhood, int16_t qmul[2],
const uint8_t scan[16], int vp7)
{ {
uint8_t *token_prob = probs[i][zero_nhood]; uint8_t *token_prob = probs[i][zero_nhood];
if (!vp56_rac_get_prob_branchy(c, token_prob[0])) // DCT_EOB if (!vp56_rac_get_prob_branchy(c, token_prob[0])) // DCT_EOB
return 0; return 0;
return decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul); return vp7 ? vp7_decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul, scan)
: vp8_decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul);
} }
static av_always_inline static av_always_inline
void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Macroblock *mb, void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Macroblock *mb,
uint8_t t_nnz[9], uint8_t l_nnz[9]) uint8_t t_nnz[9], uint8_t l_nnz[9], int vp7)
{ {
int i, x, y, luma_start = 0, luma_ctx = 3; int i, x, y, luma_start = 0, luma_ctx = 3;
int nnz_pred, nnz, nnz_total = 0; int nnz_pred, nnz, nnz_total = 0;
int segment = mb->segment; int segment = mb->segment;
int block_dc = 0; int block_dc = 0;
if (mb->mode != MODE_I4x4 && mb->mode != VP8_MVMODE_SPLIT) { if (mb->mode != MODE_I4x4 && (vp7 || mb->mode != VP8_MVMODE_SPLIT)) {
nnz_pred = t_nnz[8] + l_nnz[8]; nnz_pred = t_nnz[8] + l_nnz[8];
// decode DC values and do hadamard // decode DC values and do hadamard
nnz = decode_block_coeffs(c, td->block_dc, s->prob->token[1], 0, nnz_pred, nnz = decode_block_coeffs(c, td->block_dc, s->prob->token[1], 0, nnz_pred,
s->qmat[segment].luma_dc_qmul); s->qmat[segment].luma_dc_qmul, zigzag_scan, vp7);
l_nnz[8] = t_nnz[8] = !!nnz; l_nnz[8] = t_nnz[8] = !!nnz;
if (vp7 && mb->mode > MODE_I4x4)
nnz |= inter_predict_dc(td->block_dc, s->inter_dc_pred[mb->ref_frame - 1]);
if (nnz) { if (nnz) {
nnz_total += nnz; nnz_total += nnz;
block_dc = 1; block_dc = 1;
...@@ -893,7 +1313,7 @@ void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Ma ...@@ -893,7 +1313,7 @@ void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Ma
for (x = 0; x < 4; x++) { for (x = 0; x < 4; x++) {
nnz_pred = l_nnz[y] + t_nnz[x]; nnz_pred = l_nnz[y] + t_nnz[x];
nnz = decode_block_coeffs(c, td->block[y][x], s->prob->token[luma_ctx], luma_start, nnz = decode_block_coeffs(c, td->block[y][x], s->prob->token[luma_ctx], luma_start,
nnz_pred, s->qmat[segment].luma_qmul); nnz_pred, s->qmat[segment].luma_qmul, s->prob[0].scan, vp7);
// nnz+block_dc may be one more than the actual last index, but we don't care // nnz+block_dc may be one more than the actual last index, but we don't care
td->non_zero_count_cache[y][x] = nnz + block_dc; td->non_zero_count_cache[y][x] = nnz + block_dc;
t_nnz[x] = l_nnz[y] = !!nnz; t_nnz[x] = l_nnz[y] = !!nnz;
...@@ -908,7 +1328,7 @@ void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Ma ...@@ -908,7 +1328,7 @@ void decode_mb_coeffs(VP8Context *s, VP8ThreadData *td, VP56RangeCoder *c, VP8Ma
for (x = 0; x < 2; x++) { for (x = 0; x < 2; x++) {
nnz_pred = l_nnz[i+2*y] + t_nnz[i+2*x]; nnz_pred = l_nnz[i+2*y] + t_nnz[i+2*x];
nnz = decode_block_coeffs(c, td->block[i][(y<<1)+x], s->prob->token[2], 0, nnz = decode_block_coeffs(c, td->block[i][(y<<1)+x], s->prob->token[2], 0,
nnz_pred, s->qmat[segment].chroma_qmul); nnz_pred, s->qmat[segment].chroma_qmul, s->prob[0].scan, vp7);
td->non_zero_count_cache[i][(y<<1)+x] = nnz; td->non_zero_count_cache[i][(y<<1)+x] = nnz;
t_nnz[i+2*x] = l_nnz[i+2*y] = !!nnz; t_nnz[i+2*x] = l_nnz[i+2*y] = !!nnz;
nnz_total += nnz; nnz_total += nnz;
...@@ -974,43 +1394,43 @@ int check_dc_pred8x8_mode(int mode, int mb_x, int mb_y) ...@@ -974,43 +1394,43 @@ int check_dc_pred8x8_mode(int mode, int mb_x, int mb_y)
} }
static av_always_inline static av_always_inline
int check_tm_pred8x8_mode(int mode, int mb_x, int mb_y) int check_tm_pred8x8_mode(int mode, int mb_x, int mb_y, int vp7)
{ {
if (!mb_x) { if (!mb_x) {
return mb_y ? VERT_PRED8x8 : DC_129_PRED8x8; return mb_y ? VERT_PRED8x8 : (vp7 ? DC_128_PRED8x8 : DC_129_PRED8x8);
} else { } else {
return mb_y ? mode : HOR_PRED8x8; return mb_y ? mode : HOR_PRED8x8;
} }
} }
static av_always_inline static av_always_inline
int check_intra_pred8x8_mode_emuedge(int mode, int mb_x, int mb_y) int check_intra_pred8x8_mode_emuedge(int mode, int mb_x, int mb_y, int vp7)
{ {
switch (mode) { switch (mode) {
case DC_PRED8x8: case DC_PRED8x8:
return check_dc_pred8x8_mode(mode, mb_x, mb_y); return check_dc_pred8x8_mode(mode, mb_x, mb_y);
case VERT_PRED8x8: case VERT_PRED8x8:
return !mb_y ? DC_127_PRED8x8 : mode; return !mb_y ? (vp7 ? DC_128_PRED8x8 : DC_127_PRED8x8) : mode;
case HOR_PRED8x8: case HOR_PRED8x8:
return !mb_x ? DC_129_PRED8x8 : mode; return !mb_x ? (vp7 ? DC_128_PRED8x8 : DC_129_PRED8x8) : mode;
case PLANE_PRED8x8 /*TM*/: case PLANE_PRED8x8 /*TM*/:
return check_tm_pred8x8_mode(mode, mb_x, mb_y); return check_tm_pred8x8_mode(mode, mb_x, mb_y, vp7);
} }
return mode; return mode;
} }
static av_always_inline static av_always_inline
int check_tm_pred4x4_mode(int mode, int mb_x, int mb_y) int check_tm_pred4x4_mode(int mode, int mb_x, int mb_y, int vp7)
{ {
if (!mb_x) { if (!mb_x) {
return mb_y ? VERT_VP8_PRED : DC_129_PRED; return mb_y ? VERT_VP8_PRED : (vp7 ? DC_128_PRED : DC_129_PRED);
} else { } else {
return mb_y ? mode : HOR_VP8_PRED; return mb_y ? mode : HOR_VP8_PRED;
} }
} }
static av_always_inline static av_always_inline
int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf) int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf, int vp7)
{ {
switch (mode) { switch (mode) {
case VERT_PRED: case VERT_PRED:
...@@ -1021,7 +1441,7 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf ...@@ -1021,7 +1441,7 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf
/* fall-through */ /* fall-through */
case DIAG_DOWN_LEFT_PRED: case DIAG_DOWN_LEFT_PRED:
case VERT_LEFT_PRED: case VERT_LEFT_PRED:
return !mb_y ? DC_127_PRED : mode; return !mb_y ? (vp7 ? DC_128_PRED : DC_127_PRED) : mode;
case HOR_PRED: case HOR_PRED:
if (!mb_y) { if (!mb_y) {
*copy_buf = 1; *copy_buf = 1;
...@@ -1029,9 +1449,9 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf ...@@ -1029,9 +1449,9 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf
} }
/* fall-through */ /* fall-through */
case HOR_UP_PRED: case HOR_UP_PRED:
return !mb_x ? DC_129_PRED : mode; return !mb_x ? (vp7 ? DC_128_PRED : DC_129_PRED) : mode;
case TM_VP8_PRED: case TM_VP8_PRED:
return check_tm_pred4x4_mode(mode, mb_x, mb_y); return check_tm_pred4x4_mode(mode, mb_x, mb_y, vp7);
case DC_PRED: // 4x4 DC doesn't use the same "H.264-style" exceptions as 16x16/8x8 DC case DC_PRED: // 4x4 DC doesn't use the same "H.264-style" exceptions as 16x16/8x8 DC
case DIAG_DOWN_RIGHT_PRED: case DIAG_DOWN_RIGHT_PRED:
case VERT_RIGHT_PRED: case VERT_RIGHT_PRED:
...@@ -1045,7 +1465,7 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf ...@@ -1045,7 +1465,7 @@ int check_intra_pred4x4_mode_emuedge(int mode, int mb_x, int mb_y, int *copy_buf
static av_always_inline static av_always_inline
void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
VP8Macroblock *mb, int mb_x, int mb_y) VP8Macroblock *mb, int mb_x, int mb_y, int vp7)
{ {
int x, y, mode, nnz; int x, y, mode, nnz;
uint32_t tr; uint32_t tr;
...@@ -1058,12 +1478,14 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], ...@@ -1058,12 +1478,14 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
s->filter.simple, 1); s->filter.simple, 1);
if (mb->mode < MODE_I4x4) { if (mb->mode < MODE_I4x4) {
mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y); mode = check_intra_pred8x8_mode_emuedge(mb->mode, mb_x, mb_y, vp7);
s->hpc.pred16x16[mode](dst[0], s->linesize); s->hpc.pred16x16[mode](dst[0], s->linesize);
} else { } else {
uint8_t *ptr = dst[0]; uint8_t *ptr = dst[0];
uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb; uint8_t *intra4x4 = mb->intra4x4_pred_mode_mb;
uint8_t tr_top[4] = { 127, 127, 127, 127 }; const uint8_t lo = vp7 ? 128 : 127;
const uint8_t hi = vp7 ? 128 : 129;
uint8_t tr_top[4] = { lo, lo, lo, lo };
// all blocks on the right edge of the macroblock use bottom edge // all blocks on the right edge of the macroblock use bottom edge
// the top macroblock for their topright edge // the top macroblock for their topright edge
...@@ -1092,17 +1514,17 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], ...@@ -1092,17 +1514,17 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
} else if (x == 3) } else if (x == 3)
topright = tr_right; topright = tr_right;
mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x, mb_y + y, &copy); mode = check_intra_pred4x4_mode_emuedge(intra4x4[x], mb_x + x, mb_y + y, &copy, vp7);
if (copy) { if (copy) {
dst = copy_dst + 12; dst = copy_dst + 12;
linesize = 8; linesize = 8;
if (!(mb_y + y)) { if (!(mb_y + y)) {
copy_dst[3] = 127U; copy_dst[3] = lo;
AV_WN32A(copy_dst+4, 127U * 0x01010101U); AV_WN32A(copy_dst+4, lo * 0x01010101U);
} else { } else {
AV_COPY32(copy_dst+4, ptr+4*x-s->linesize); AV_COPY32(copy_dst+4, ptr+4*x-s->linesize);
if (!(mb_x + x)) { if (!(mb_x + x)) {
copy_dst[3] = 129U; copy_dst[3] = hi;
} else { } else {
copy_dst[3] = ptr[4*x-s->linesize-1]; copy_dst[3] = ptr[4*x-s->linesize-1];
} }
...@@ -1111,7 +1533,7 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], ...@@ -1111,7 +1533,7 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
copy_dst[11] = copy_dst[11] =
copy_dst[19] = copy_dst[19] =
copy_dst[27] = copy_dst[27] =
copy_dst[35] = 129U; copy_dst[35] = hi;
} else { } else {
copy_dst[11] = ptr[4*x -1]; copy_dst[11] = ptr[4*x -1];
copy_dst[19] = ptr[4*x+s->linesize -1]; copy_dst[19] = ptr[4*x+s->linesize -1];
...@@ -1142,7 +1564,7 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], ...@@ -1142,7 +1564,7 @@ void intra_predict(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
} }
} }
mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode, mb_x, mb_y); mode = check_intra_pred8x8_mode_emuedge(mb->chroma_pred_mode, mb_x, mb_y, vp7);
s->hpc.pred8x8[mode](dst[1], s->uvlinesize); s->hpc.pred8x8[mode](dst[1], s->uvlinesize);
s->hpc.pred8x8[mode](dst[2], s->uvlinesize); s->hpc.pred8x8[mode](dst[2], s->uvlinesize);
...@@ -1296,7 +1718,7 @@ void vp8_mc_part(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3], ...@@ -1296,7 +1718,7 @@ void vp8_mc_part(VP8Context *s, VP8ThreadData *td, uint8_t *dst[3],
s->put_pixels_tab[block_w == 8]); s->put_pixels_tab[block_w == 8]);
/* U/V */ /* U/V */
if (s->profile == 3) { if (s->profile == 3) { /* this block only applies VP8; it is safe to check only the profile, as VP7 profile <= 1 */
uvmv.x &= ~7; uvmv.x &= ~7;
uvmv.y &= ~7; uvmv.y &= ~7;
} }
...@@ -1468,7 +1890,7 @@ chroma_idct_end: ; ...@@ -1468,7 +1890,7 @@ chroma_idct_end: ;
} }
} }
static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *mb, VP8FilterStrength *f ) static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *mb, VP8FilterStrength *f, int vp7)
{ {
int interior_limit, filter_level; int interior_limit, filter_level;
...@@ -1495,12 +1917,12 @@ static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *m ...@@ -1495,12 +1917,12 @@ static av_always_inline void filter_level_for_mb(VP8Context *s, VP8Macroblock *m
f->filter_level = filter_level; f->filter_level = filter_level;
f->inner_limit = interior_limit; f->inner_limit = interior_limit;
f->inner_filter = !mb->skip || mb->mode == MODE_I4x4 || mb->mode == VP8_MVMODE_SPLIT; f->inner_filter = vp7 || !mb->skip || mb->mode == MODE_I4x4 || mb->mode == VP8_MVMODE_SPLIT;
} }
static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, int mb_x, int mb_y) static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8FilterStrength *f, int mb_x, int mb_y, int vp7)
{ {
int mbedge_lim, bedge_lim, hev_thresh; int mbedge_lim, bedge_lim_y, bedge_lim_uv, hev_thresh;
int filter_level = f->filter_level; int filter_level = f->filter_level;
int inner_limit = f->inner_limit; int inner_limit = f->inner_limit;
int inner_filter = f->inner_filter; int inner_filter = f->inner_filter;
...@@ -1520,8 +1942,15 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter ...@@ -1520,8 +1942,15 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter
if (!filter_level) if (!filter_level)
return; return;
bedge_lim = 2*filter_level + inner_limit; if (vp7) {
mbedge_lim = bedge_lim + 4; bedge_lim_y = filter_level;
bedge_lim_uv = 2*filter_level;
mbedge_lim = filter_level + 2;
} else {
bedge_lim_y =
bedge_lim_uv = 2*filter_level + inner_limit;
mbedge_lim = bedge_lim_y + 4;
}
hev_thresh = hev_thresh_lut[s->keyframe][filter_level]; hev_thresh = hev_thresh_lut[s->keyframe][filter_level];
...@@ -1532,18 +1961,21 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter ...@@ -1532,18 +1961,21 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter
mbedge_lim, inner_limit, hev_thresh); mbedge_lim, inner_limit, hev_thresh);
} }
if (inner_filter) { #define H_LOOP_FILTER_16Y_INNER(cond) \
s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 4, linesize, bedge_lim, if (cond && inner_filter) {\
inner_limit, hev_thresh); s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 4, linesize, bedge_lim_y,\
s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 8, linesize, bedge_lim, inner_limit, hev_thresh);\
inner_limit, hev_thresh); s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 8, linesize, bedge_lim_y,\
s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+12, linesize, bedge_lim, inner_limit, hev_thresh);\
inner_limit, hev_thresh); s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+12, linesize, bedge_lim_y,\
s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] + 4, dst[2] + 4, inner_limit, hev_thresh);\
uvlinesize, bedge_lim, s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] + 4, dst[2] + 4,\
inner_limit, hev_thresh); uvlinesize, bedge_lim_uv,\
inner_limit, hev_thresh);\
} }
H_LOOP_FILTER_16Y_INNER(!vp7)
if (mb_y) { if (mb_y) {
s->vp8dsp.vp8_v_loop_filter16y(dst[0], linesize, s->vp8dsp.vp8_v_loop_filter16y(dst[0], linesize,
mbedge_lim, inner_limit, hev_thresh); mbedge_lim, inner_limit, hev_thresh);
...@@ -1553,19 +1985,21 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter ...@@ -1553,19 +1985,21 @@ static av_always_inline void filter_mb(VP8Context *s, uint8_t *dst[3], VP8Filter
if (inner_filter) { if (inner_filter) {
s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 4*linesize, s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 4*linesize,
linesize, bedge_lim, linesize, bedge_lim_y,
inner_limit, hev_thresh); inner_limit, hev_thresh);
s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 8*linesize, s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 8*linesize,
linesize, bedge_lim, linesize, bedge_lim_y,
inner_limit, hev_thresh); inner_limit, hev_thresh);
s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+12*linesize, s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+12*linesize,
linesize, bedge_lim, linesize, bedge_lim_y,
inner_limit, hev_thresh); inner_limit, hev_thresh);
s->vp8dsp.vp8_v_loop_filter8uv_inner(dst[1] + 4 * uvlinesize, s->vp8dsp.vp8_v_loop_filter8uv_inner(dst[1] + 4 * uvlinesize,
dst[2] + 4 * uvlinesize, dst[2] + 4 * uvlinesize,
uvlinesize, bedge_lim, uvlinesize, bedge_lim_uv,
inner_limit, hev_thresh); inner_limit, hev_thresh);
} }
H_LOOP_FILTER_16Y_INNER(vp7)
} }
static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f, int mb_x, int mb_y) static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f, int mb_x, int mb_y)
...@@ -1600,8 +2034,9 @@ static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8Fi ...@@ -1600,8 +2034,9 @@ static av_always_inline void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8Fi
} }
#define MARGIN (16 << 2) #define MARGIN (16 << 2)
static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, static av_always_inline
VP8Frame *prev_frame) void decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
VP8Frame *prev_frame, int vp7)
{ {
VP8Context *s = avctx->priv_data; VP8Context *s = avctx->priv_data;
int mb_x, mb_y; int mb_x, mb_y;
...@@ -1621,7 +2056,7 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, ...@@ -1621,7 +2056,7 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
AV_WN32A((mb-s->mb_width-1)->intra4x4_pred_mode_top, DC_PRED*0x01010101); AV_WN32A((mb-s->mb_width-1)->intra4x4_pred_mode_top, DC_PRED*0x01010101);
decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy, decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy,
prev_frame && prev_frame->seg_map ? prev_frame && prev_frame->seg_map ?
prev_frame->seg_map->data + mb_xy : NULL, 1); prev_frame->seg_map->data + mb_xy : NULL, 1, vp7);
s->mv_min.x -= 64; s->mv_min.x -= 64;
s->mv_max.x -= 64; s->mv_max.x -= 64;
} }
...@@ -1630,6 +2065,22 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, ...@@ -1630,6 +2065,22 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
} }
} }
#if CONFIG_VP7_DECODER
static void vp7_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
VP8Frame *prev_frame)
{
decode_mv_mb_modes(avctx, curframe, prev_frame, 1);
}
#endif
#if CONFIG_VP8_DECODER
static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
VP8Frame *prev_frame)
{
decode_mv_mb_modes(avctx, curframe, prev_frame, 0);
}
#endif
#if HAVE_THREADS #if HAVE_THREADS
#define check_thread_pos(td, otd, mb_x_check, mb_y_check)\ #define check_thread_pos(td, otd, mb_x_check, mb_y_check)\
do {\ do {\
...@@ -1667,8 +2118,8 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe, ...@@ -1667,8 +2118,8 @@ static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
#define update_pos(td, mb_y, mb_x) #define update_pos(td, mb_y, mb_x)
#endif #endif
static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, static av_always_inline void decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr) int jobnr, int threadnr, int vp7)
{ {
VP8Context *s = avctx->priv_data; VP8Context *s = avctx->priv_data;
VP8ThreadData *prev_td, *next_td, *td = &s->thread_data[threadnr]; VP8ThreadData *prev_td, *next_td, *td = &s->thread_data[threadnr];
...@@ -1700,6 +2151,7 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, ...@@ -1700,6 +2151,7 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED*0x01010101); AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED*0x01010101);
} }
if (!vp7 || mb_y == 0)
memset(td->left_nnz, 0, sizeof(td->left_nnz)); memset(td->left_nnz, 0, sizeof(td->left_nnz));
s->mv_min.x = -MARGIN; s->mv_min.x = -MARGIN;
...@@ -1709,9 +2161,9 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, ...@@ -1709,9 +2161,9 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
// Wait for previous thread to read mb_x+2, and reach mb_y-1. // Wait for previous thread to read mb_x+2, and reach mb_y-1.
if (prev_td != td) { if (prev_td != td) {
if (threadnr != 0) { if (threadnr != 0) {
check_thread_pos(td, prev_td, mb_x+1, mb_y-1); check_thread_pos(td, prev_td, mb_x+(vp7?2:1), mb_y-(vp7?2:1));
} else { } else {
check_thread_pos(td, prev_td, (s->mb_width+3) + (mb_x+1), mb_y-1); check_thread_pos(td, prev_td, (s->mb_width+3) + (mb_x+(vp7?2:1)), mb_y-(vp7?2:1));
} }
} }
...@@ -1721,15 +2173,15 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, ...@@ -1721,15 +2173,15 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
if (!s->mb_layout) if (!s->mb_layout)
decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy, decode_mb_mode(s, mb, mb_x, mb_y, curframe->seg_map->data + mb_xy,
prev_frame && prev_frame->seg_map ? prev_frame && prev_frame->seg_map ?
prev_frame->seg_map->data + mb_xy : NULL, 0); prev_frame->seg_map->data + mb_xy : NULL, 0, vp7);
prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_PREVIOUS); prefetch_motion(s, mb, mb_x, mb_y, mb_xy, VP56_FRAME_PREVIOUS);
if (!mb->skip) if (!mb->skip)
decode_mb_coeffs(s, td, c, mb, s->top_nnz[mb_x], td->left_nnz); decode_mb_coeffs(s, td, c, mb, s->top_nnz[mb_x], td->left_nnz, vp7);
if (mb->mode <= MODE_I4x4) if (mb->mode <= MODE_I4x4)
intra_predict(s, td, dst, mb, mb_x, mb_y); intra_predict(s, td, dst, mb, mb_x, mb_y, vp7);
else else
inter_predict(s, td, dst, mb, mb_x, mb_y); inter_predict(s, td, dst, mb, mb_x, mb_y);
...@@ -1749,7 +2201,7 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, ...@@ -1749,7 +2201,7 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
} }
if (s->deblock_filter) if (s->deblock_filter)
filter_level_for_mb(s, mb, &td->filter_strength[mb_x]); filter_level_for_mb(s, mb, &td->filter_strength[mb_x], vp7);
if (s->deblock_filter && num_jobs != 1 && threadnr == num_jobs-1) { if (s->deblock_filter && num_jobs != 1 && threadnr == num_jobs-1) {
if (s->filter.simple) if (s->filter.simple)
...@@ -1774,8 +2226,24 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata, ...@@ -1774,8 +2226,24 @@ static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
} }
} }
static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, #if CONFIG_VP7_DECODER
static void vp7_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr)
{
decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr, 1);
}
#endif
#if CONFIG_VP8_DECODER
static void vp8_decode_mb_row_no_filter(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr) int jobnr, int threadnr)
{
decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr, 0);
}
#endif
static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr, int vp7)
{ {
VP8Context *s = avctx->priv_data; VP8Context *s = avctx->priv_data;
VP8ThreadData *td = &s->thread_data[threadnr]; VP8ThreadData *td = &s->thread_data[threadnr];
...@@ -1819,7 +2287,7 @@ static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, ...@@ -1819,7 +2287,7 @@ static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata,
if (s->filter.simple) if (s->filter.simple)
filter_mb_simple(s, dst[0], f, mb_x, mb_y); filter_mb_simple(s, dst[0], f, mb_x, mb_y);
else else
filter_mb(s, dst, f, mb_x, mb_y); filter_mb(s, dst, f, mb_x, mb_y, vp7);
dst[0] += 16; dst[0] += 16;
dst[1] += 8; dst[1] += 8;
dst[2] += 8; dst[2] += 8;
...@@ -1828,6 +2296,22 @@ static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata, ...@@ -1828,6 +2296,22 @@ static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata,
} }
} }
#if CONFIG_VP7_DECODER
static void vp7_filter_mb_row(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr)
{
filter_mb_row(avctx, tdata, jobnr, threadnr, 1);
}
#endif
#if CONFIG_VP8_DECODER
static void vp8_filter_mb_row(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr)
{
filter_mb_row(avctx, tdata, jobnr, threadnr, 0);
}
#endif
static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata,
int jobnr, int threadnr) int jobnr, int threadnr)
{ {
...@@ -1840,9 +2324,9 @@ static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, ...@@ -1840,9 +2324,9 @@ static int vp8_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata,
for (mb_y = jobnr; mb_y < s->mb_height; mb_y += num_jobs) { for (mb_y = jobnr; mb_y < s->mb_height; mb_y += num_jobs) {
if (mb_y >= s->mb_height) break; if (mb_y >= s->mb_height) break;
td->thread_mb_pos = mb_y<<16; td->thread_mb_pos = mb_y<<16;
vp8_decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr); s->decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr);
if (s->deblock_filter) if (s->deblock_filter)
vp8_filter_mb_row(avctx, tdata, jobnr, threadnr); s->filter_mb_row(avctx, tdata, jobnr, threadnr);
update_pos(td, mb_y, INT_MAX & 0xFFFF); update_pos(td, mb_y, INT_MAX & 0xFFFF);
s->mv_min.y -= 64; s->mv_min.y -= 64;
...@@ -1863,7 +2347,7 @@ int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -1863,7 +2347,7 @@ int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
enum AVDiscard skip_thresh; enum AVDiscard skip_thresh;
VP8Frame *av_uninit(curframe), *prev_frame; VP8Frame *av_uninit(curframe), *prev_frame;
if ((ret = decode_frame_header(s, avpkt->data, avpkt->size)) < 0) if ((ret = VPX(s->vp7, decode_frame_header)(s, avpkt->data, avpkt->size)) < 0)
goto err; goto err;
prev_frame = s->framep[VP56_FRAME_CURRENT]; prev_frame = s->framep[VP56_FRAME_CURRENT];
...@@ -1947,7 +2431,7 @@ int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -1947,7 +2431,7 @@ int ff_vp8_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (prev_frame && s->segmentation.enabled && if (prev_frame && s->segmentation.enabled &&
!s->segmentation.update_map) !s->segmentation.update_map)
ff_thread_await_progress(&prev_frame->tf, 1, 0); ff_thread_await_progress(&prev_frame->tf, 1, 0);
vp8_decode_mv_mb_modes(avctx, curframe, prev_frame); VPX(s->vp7, decode_mv_mb_modes)(avctx, curframe, prev_frame);
} }
if (avctx->active_thread_type == FF_THREAD_FRAME) if (avctx->active_thread_type == FF_THREAD_FRAME)
...@@ -2015,12 +2499,16 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx) ...@@ -2015,12 +2499,16 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx)
int ret; int ret;
s->avctx = avctx; s->avctx = avctx;
s->vp7 = avctx->codec->id == AV_CODEC_ID_VP7;
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
avctx->internal->allocate_progress = 1; avctx->internal->allocate_progress = 1;
ff_videodsp_init(&s->vdsp, 8); ff_videodsp_init(&s->vdsp, 8);
ff_h264_pred_init(&s->hpc, AV_CODEC_ID_VP8, 8, 1); ff_h264_pred_init(&s->hpc, s->vp7 ? AV_CODEC_ID_VP7 : AV_CODEC_ID_VP8, 8, 1);
ff_vp8dsp_init(&s->vp8dsp, 0); ff_vp8dsp_init(&s->vp8dsp, s->vp7);
s->decode_mb_row_no_filter = VPX(s->vp7, decode_mb_row_no_filter);
s->filter_mb_row = VPX(s->vp7, filter_mb_row);
if ((ret = vp8_init_frames(s)) < 0) { if ((ret = vp8_init_frames(s)) < 0) {
ff_vp8_decode_free(avctx); ff_vp8_decode_free(avctx);
...@@ -2030,6 +2518,7 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx) ...@@ -2030,6 +2518,7 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
#if CONFIG_VP8_DECODER
static av_cold int vp8_decode_init_thread_copy(AVCodecContext *avctx) static av_cold int vp8_decode_init_thread_copy(AVCodecContext *avctx)
{ {
VP8Context *s = avctx->priv_data; VP8Context *s = avctx->priv_data;
...@@ -2080,7 +2569,24 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo ...@@ -2080,7 +2569,24 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
return 0; return 0;
} }
#endif
#if CONFIG_VP7_DECODER
AVCodec ff_vp7_decoder = {
.name = "vp7",
.long_name = NULL_IF_CONFIG_SMALL("On2 VP7"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP7,
.priv_data_size = sizeof(VP8Context),
.init = ff_vp8_decode_init,
.close = ff_vp8_decode_free,
.decode = ff_vp8_decode_frame,
.capabilities = CODEC_CAP_DR1,
.flush = vp8_decode_flush,
};
#endif
#if CONFIG_VP8_DECODER
AVCodec ff_vp8_decoder = { AVCodec ff_vp8_decoder = {
.name = "vp8", .name = "vp8",
.long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"),
...@@ -2095,4 +2601,5 @@ AVCodec ff_vp8_decoder = { ...@@ -2095,4 +2601,5 @@ AVCodec ff_vp8_decoder = {
.init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context),
}; };
#endif
libavcodec/vp8.h
View file @ 89f2f5db
...@@ -238,6 +238,7 @@ typedef struct VP8Context { ...@@ -238,6 +238,7 @@ typedef struct VP8Context {
uint8_t pred8x8c[3]; uint8_t pred8x8c[3];
uint8_t token[4][16][3][NUM_DCT_TOKENS-1]; uint8_t token[4][16][3][NUM_DCT_TOKENS-1];
uint8_t mvc[2][19]; uint8_t mvc[2][19];
uint8_t scan[16];
} prob[2]; } prob[2];
VP8Macroblock *macroblocks_base; VP8Macroblock *macroblocks_base;
...@@ -271,6 +272,31 @@ typedef struct VP8Context { ...@@ -271,6 +272,31 @@ typedef struct VP8Context {
* 1 -> Macroblocks for entire frame alloced (sliced thread). * 1 -> Macroblocks for entire frame alloced (sliced thread).
*/ */
int mb_layout; int mb_layout;
void (*decode_mb_row_no_filter)(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr);
void (*filter_mb_row)(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr);
int vp7;
/**
* Fade bit present in bitstream (VP7)
*/
int fade_present;
/**
* Interframe DC prediction (VP7)
* [0] VP56_FRAME_PREVIOUS
* [1] VP56_FRAME_GOLDEN
*/
uint16_t inter_dc_pred[2][2];
/**
* Macroblock features (VP7)
*/
uint8_t feature_enabled[4];
uint8_t feature_present_prob[4];
uint8_t feature_index_prob[4][3];
uint8_t feature_value[4][4];
} VP8Context; } VP8Context;
int ff_vp8_decode_init(AVCodecContext *avctx); int ff_vp8_decode_init(AVCodecContext *avctx);
......
libavcodec/vp8data.h
View file @ 89f2f5db
...@@ -30,6 +30,14 @@ ...@@ -30,6 +30,14 @@
#include "vp8.h" #include "vp8.h"
#include "h264pred.h" #include "h264pred.h"
static const uint8_t vp7_pred4x4_mode[] =
{
[DC_PRED8x8] = DC_PRED,
[VERT_PRED8x8] = TM_VP8_PRED,
[HOR_PRED8x8] = TM_VP8_PRED,
[PLANE_PRED8x8] = TM_VP8_PRED,
};
static const uint8_t vp8_pred4x4_mode[] = static const uint8_t vp8_pred4x4_mode[] =
{ {
[DC_PRED8x8] = DC_PRED, [DC_PRED8x8] = DC_PRED,
...@@ -54,6 +62,63 @@ static const int8_t vp8_pred16x16_tree_inter[4][2] = ...@@ -54,6 +62,63 @@ static const int8_t vp8_pred16x16_tree_inter[4][2] =
{ -PLANE_PRED8x8, -MODE_I4x4 }, // '110', '111' { -PLANE_PRED8x8, -MODE_I4x4 }, // '110', '111'
}; };
typedef struct {
int8_t yoffset;
int8_t xoffset;
uint8_t subblock;
uint8_t score;
} VP7MVPred;
#define VP7_MV_PRED_COUNT 12
static const VP7MVPred vp7_mv_pred[VP7_MV_PRED_COUNT] = {
{ -1, 0, 12, 8 },
{ 0, -1, 3, 8 },
{ -1, -1, 15, 2 },
{ -1, 1, 12, 2 },
{ -2, 0, 12, 2 },
{ 0, -2, 3, 2 },
{ -1, -2, 15, 1 },
{ -2, -1, 15, 1 },
{ -2, 1, 12, 1 },
{ -1, 2, 12, 1 },
{ -2, -2, 15, 1 },
{ -2, 2, 12, 1 },
};
static const int vp7_mode_contexts[31][4] = {
{ 3, 3, 1, 246 },
{ 7, 89, 66, 239 },
{ 10, 90, 78, 238 },
{ 14, 118, 95, 241 },
{ 14, 123, 106, 238 },
{ 20, 140, 109, 240 },
{ 13, 155, 103, 238 },
{ 21, 158, 99, 240 },
{ 27, 82, 108, 232 },
{ 19, 99, 123, 217 },
{ 45, 139, 148, 236 },
{ 50, 117, 144, 235 },
{ 57, 128, 164, 238 },
{ 69, 139, 171, 239 },
{ 74, 154, 179, 238 },
{ 112, 165, 186, 242 },
{ 98, 143, 185, 245 },
{ 105, 153, 190, 250 },
{ 124, 167, 192, 245 },
{ 131, 186, 203, 246 },
{ 59, 184, 222, 224 },
{ 148, 215, 214, 213 },
{ 137, 211, 210, 219 },
{ 190, 227, 128, 228 },
{ 183, 228, 128, 228 },
{ 194, 234, 128, 228 },
{ 202, 236, 128, 228 },
{ 205, 240, 128, 228 },
{ 205, 244, 128, 228 },
{ 225, 246, 128, 228 },
{ 233, 251, 128, 228 },
};
static const int vp8_mode_contexts[6][4] = { static const int vp8_mode_contexts[6][4] = {
{ 7, 1, 1, 143 }, { 7, 1, 1, 143 },
{ 14, 18, 14, 107 }, { 14, 18, 14, 107 },
...@@ -85,6 +150,8 @@ static const uint8_t vp8_mbfirstidx[4][16] = { ...@@ -85,6 +150,8 @@ static const uint8_t vp8_mbfirstidx[4][16] = {
static const uint8_t vp8_mbsplit_count[4] = { 2, 2, 4, 16 }; static const uint8_t vp8_mbsplit_count[4] = { 2, 2, 4, 16 };
static const uint8_t vp8_mbsplit_prob[3] = { 110, 111, 150 }; static const uint8_t vp8_mbsplit_prob[3] = { 110, 111, 150 };
static const uint8_t vp7_submv_prob[3] = { 180, 162, 25 };
static const uint8_t vp8_submv_prob[5][3] = { static const uint8_t vp8_submv_prob[5][3] = {
{ 147, 136, 18 }, { 147, 136, 18 },
{ 106, 145, 1 }, { 106, 145, 1 },
...@@ -670,11 +737,22 @@ static const uint8_t vp8_mv_update_prob[2][19] = { ...@@ -670,11 +737,22 @@ static const uint8_t vp8_mv_update_prob[2][19] = {
{ 237, { 237,
246, 246,
253, 253, 254, 254, 254, 254, 254, 253, 253, 254, 254, 254, 254, 254,
254, 254, 254, 254, 254, 250, 250, 252, 254, 254 }, 254, 254, 254, 254, 254, 250, 250, 252, /* VP8 only: */ 254, 254 },
{ 231, { 231,
243, 243,
245, 253, 254, 254, 254, 254, 254, 245, 253, 254, 254, 254, 254, 254,
254, 254, 254, 254, 254, 251, 251, 254, 254, 254 } 254, 254, 254, 254, 254, 251, 251, 254, /* VP8 only: */ 254, 254 }
};
static const uint8_t vp7_mv_default_prob[2][17] = {
{ 162,
128,
225, 146, 172, 147, 214, 39, 156,
247, 210, 135, 68, 138, 220, 239, 246 },
{ 164,
128,
204, 170, 119, 235, 140, 230, 228,
244, 184, 201, 44, 173, 221, 239, 253 }
}; };
static const uint8_t vp8_mv_default_prob[2][19] = { static const uint8_t vp8_mv_default_prob[2][19] = {
...@@ -688,4 +766,60 @@ static const uint8_t vp8_mv_default_prob[2][19] = { ...@@ -688,4 +766,60 @@ static const uint8_t vp8_mv_default_prob[2][19] = {
128, 130, 130, 74, 148, 180, 203, 236, 254, 254 } 128, 130, 130, 74, 148, 180, 203, 236, 254, 254 }
}; };
static const uint8_t vp7_feature_value_size[2][4] = {
{7, 6, 0, 8},
{7, 6, 0, 5},
};
static const int8_t vp7_feature_index_tree[4][2] =
{
{ 1, 2 },
{ -0, -1 }, // '00', '01'
{ -2, -3 }, // '10', '11'
};
static const uint16_t vp7_ydc_qlookup[] = {
4, 4, 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 33, 34, 35, 36, 36, 37, 38, 39, 39, 40, 41, 41, 42, 43,
43, 44, 45, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, 54, 56,
57, 58, 59, 60, 62, 63, 65, 66, 68, 70, 72, 74, 76, 79, 81, 84,
87, 90, 93, 96, 100, 104, 108, 112, 116, 121, 126, 131, 136, 142, 148, 154,
160, 167, 174, 182, 189, 198, 206, 215, 224, 234, 244, 254, 265, 277, 288, 301,
313, 327, 340, 355, 370, 385, 401, 417, 434, 452, 470, 489, 509, 529, 550, 572,
};
static const uint16_t vp7_yac_qlookup[] = {
4, 4, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17,
19, 20, 22, 23, 25, 26, 28, 29, 31, 32, 34, 35, 37, 38, 40, 41,
42, 44, 45, 46, 48, 49, 50, 51, 53, 54, 55, 56, 57, 58, 59, 61,
62, 63, 64, 65, 67, 68, 69, 70, 72, 73, 75, 76, 78, 80, 82, 84,
86, 88, 91, 93, 96, 99, 102, 105, 109, 112, 116, 121, 125, 130, 135, 140,
146, 152, 158, 165, 172, 180, 188, 196, 205, 214, 224, 234, 245, 256, 268, 281,
294, 308, 322, 337, 353, 369, 386, 404, 423, 443, 463, 484, 506, 529, 553, 578,
604, 631, 659, 688, 718, 749, 781, 814, 849, 885, 922, 960, 1000, 1041, 1083, 1127,
};
static const uint16_t vp7_y2dc_qlookup[] = {
7, 9, 11, 13, 15, 17, 19, 21, 23, 26, 28, 30, 33, 35, 37, 39,
42, 44, 46, 48, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 70, 72,
74, 75, 77, 78, 80, 81, 83, 84, 85, 87, 88, 89, 90, 92, 93, 94,
95, 96, 97, 99, 100, 101, 102, 104, 105, 106, 108, 109, 111, 113, 114, 116,
118, 120, 123, 125, 128, 131, 134, 137, 140, 144, 148, 152, 156, 161, 166, 171,
176, 182, 188, 195, 202, 209, 217, 225, 234, 243, 253, 263, 274, 285, 297, 309,
322, 336, 350, 365, 381, 397, 414, 432, 450, 470, 490, 511, 533, 556, 579, 604,
630, 656, 684, 713, 742, 773, 805, 838, 873, 908, 945, 983, 1022, 1063, 1105, 1148,
};
static const uint16_t vp7_y2ac_qlookup[] = {
7, 9, 11, 13, 16, 18, 21, 24, 26, 29, 32, 35, 38, 41, 43, 46,
49, 52, 55, 58, 61, 64, 66, 69, 72, 74, 77, 79, 82, 84, 86, 88,
91, 93, 95, 97, 98, 100, 102, 104, 105, 107, 109, 110, 112, 113, 115, 116,
117, 119, 120, 122, 123, 125, 127, 128, 130, 132, 134, 136, 138, 141, 143, 146,
149, 152, 155, 158, 162, 166, 171, 175, 180, 185, 191, 197, 204, 210, 218, 226,
234, 243, 252, 262, 273, 284, 295, 308, 321, 335, 350, 365, 381, 398, 416, 435,
455, 476, 497, 520, 544, 569, 595, 622, 650, 680, 711, 743, 776, 811, 848, 885,
925, 965, 1008, 1052, 1097, 1144, 1193, 1244, 1297, 1351, 1407, 1466, 1526, 1588, 1652, 1719,
};
#endif /* AVCODEC_VP8DATA_H */ #endif /* AVCODEC_VP8DATA_H */
libavcodec/x86/Makefile
View file @ 89f2f5db
...@@ -43,6 +43,7 @@ OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o ...@@ -43,6 +43,7 @@ OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_init.o OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_init.o
OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp_init.o OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp_init.o
OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp_init.o OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp_init.o
OBJS-$(CONFIG_VP7_DECODER) += x86/vp8dsp_init.o
OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o
OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o
OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp_init.o
...@@ -111,6 +112,8 @@ YASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o ...@@ -111,6 +112,8 @@ YASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o
YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp.o YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp.o
YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o
YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o
YASM-OBJS-$(CONFIG_VP7_DECODER) += x86/vp8dsp.o \
x86/vp8dsp_loopfilter.o
YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o \ YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o \
x86/vp8dsp_loopfilter.o x86/vp8dsp_loopfilter.o
YASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \ YASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \
......
libavcodec/x86/h264_intrapred_init.c
View file @ 89f2f5db
...@@ -195,7 +195,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, ...@@ -195,7 +195,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
h->pred8x8 [VERT_PRED8x8 ] = ff_pred8x8_vertical_8_mmx; h->pred8x8 [VERT_PRED8x8 ] = ff_pred8x8_vertical_8_mmx;
h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_8_mmx; h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_8_mmx;
} }
if (codec_id == AV_CODEC_ID_VP8) { if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_tm_vp8_8_mmx; h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_tm_vp8_8_mmx;
h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_mmx; h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_mmx;
h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_8_mmx; h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_8_mmx;
...@@ -231,7 +231,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, ...@@ -231,7 +231,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
h->pred4x4 [VERT_RIGHT_PRED ] = ff_pred4x4_vertical_right_8_mmxext; h->pred4x4 [VERT_RIGHT_PRED ] = ff_pred4x4_vertical_right_8_mmxext;
h->pred4x4 [HOR_DOWN_PRED ] = ff_pred4x4_horizontal_down_8_mmxext; h->pred4x4 [HOR_DOWN_PRED ] = ff_pred4x4_horizontal_down_8_mmxext;
h->pred4x4 [DC_PRED ] = ff_pred4x4_dc_8_mmxext; h->pred4x4 [DC_PRED ] = ff_pred4x4_dc_8_mmxext;
if (codec_id == AV_CODEC_ID_VP8 || codec_id == AV_CODEC_ID_H264) { if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8 || codec_id == AV_CODEC_ID_H264) {
h->pred4x4 [DIAG_DOWN_LEFT_PRED] = ff_pred4x4_down_left_8_mmxext; h->pred4x4 [DIAG_DOWN_LEFT_PRED] = ff_pred4x4_down_left_8_mmxext;
} }
if (codec_id == AV_CODEC_ID_SVQ3 || codec_id == AV_CODEC_ID_H264) { if (codec_id == AV_CODEC_ID_SVQ3 || codec_id == AV_CODEC_ID_H264) {
...@@ -246,7 +246,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, ...@@ -246,7 +246,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_8_mmxext; h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_8_mmxext;
} }
} }
if (codec_id == AV_CODEC_ID_VP8) { if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_tm_vp8_8_mmxext; h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_tm_vp8_8_mmxext;
h->pred8x8 [DC_PRED8x8 ] = ff_pred8x8_dc_rv40_8_mmxext; h->pred8x8 [DC_PRED8x8 ] = ff_pred8x8_dc_rv40_8_mmxext;
h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_mmxext; h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_mmxext;
...@@ -276,7 +276,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, ...@@ -276,7 +276,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
h->pred8x8l [VERT_RIGHT_PRED ] = ff_pred8x8l_vertical_right_8_sse2; h->pred8x8l [VERT_RIGHT_PRED ] = ff_pred8x8l_vertical_right_8_sse2;
h->pred8x8l [VERT_LEFT_PRED ] = ff_pred8x8l_vertical_left_8_sse2; h->pred8x8l [VERT_LEFT_PRED ] = ff_pred8x8l_vertical_left_8_sse2;
h->pred8x8l [HOR_DOWN_PRED ] = ff_pred8x8l_horizontal_down_8_sse2; h->pred8x8l [HOR_DOWN_PRED ] = ff_pred8x8l_horizontal_down_8_sse2;
if (codec_id == AV_CODEC_ID_VP8) { if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_tm_vp8_8_sse2; h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_tm_vp8_8_sse2;
h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_sse2; h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_sse2;
} else { } else {
...@@ -307,7 +307,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, ...@@ -307,7 +307,7 @@ av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
h->pred8x8l [VERT_LEFT_PRED ] = ff_pred8x8l_vertical_left_8_ssse3; h->pred8x8l [VERT_LEFT_PRED ] = ff_pred8x8l_vertical_left_8_ssse3;
h->pred8x8l [HOR_UP_PRED ] = ff_pred8x8l_horizontal_up_8_ssse3; h->pred8x8l [HOR_UP_PRED ] = ff_pred8x8l_horizontal_up_8_ssse3;
h->pred8x8l [HOR_DOWN_PRED ] = ff_pred8x8l_horizontal_down_8_ssse3; h->pred8x8l [HOR_DOWN_PRED ] = ff_pred8x8l_horizontal_down_8_ssse3;
if (codec_id == AV_CODEC_ID_VP8) { if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {
h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_ssse3; h->pred8x8 [PLANE_PRED8x8 ] = ff_pred8x8_tm_vp8_8_ssse3;
h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_8_ssse3; h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_8_ssse3;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment