highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vaapi: do not parse MVMODE for VC-1 interlaced frame pictures

Browse Source 
Interlaced frame pictures do not contain the MVMODE or MVMODE2 bitstream
element. Trying to parse this element and passing a nonzero value to the
hardware decoder results in small inaccuracies in the decoded picture.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
This commit is contained in:
Jerome Borsboom 2018-03-29 13:43:34 +02:00 committed by Mark Thompson
parent daba369471
commit 8132d362fa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vaapi_vc1.c
View File

@ -138,8 +138,9 @@ static int vc1_get_FPTYPE(const VC1Context *v)
/** Reconstruct bitstream MVMODE (7.1.1.32) */ /** Reconstruct bitstream MVMODE (7.1.1.32) */
static inline VAMvModeVC1 vc1_get_MVMODE(const VC1Context *v) static inline VAMvModeVC1 vc1_get_MVMODE(const VC1Context *v)
{ {
if ((v->s.pict_type == AV_PICTURE_TYPE_P && !v->p_frame_skipped) || if ((v->fcm == PROGRESSIVE || v->fcm == ILACE_FIELD) &&
(v->s.pict_type == AV_PICTURE_TYPE_B && !v->bi_type)) ((v->s.pict_type == AV_PICTURE_TYPE_P && !v->p_frame_skipped) ||
(v->s.pict_type == AV_PICTURE_TYPE_B && !v->bi_type)))
return get_VAMvModeVC1(v->mv_mode); return get_VAMvModeVC1(v->mv_mode);
return 0; return 0;
} }
@ -147,7 +148,8 @@ static inline VAMvModeVC1 vc1_get_MVMODE(const VC1Context *v)
/** Reconstruct bitstream MVMODE2 (7.1.1.33) */ /** Reconstruct bitstream MVMODE2 (7.1.1.33) */
static inline VAMvModeVC1 vc1_get_MVMODE2(const VC1Context *v) static inline VAMvModeVC1 vc1_get_MVMODE2(const VC1Context *v)
{ {
if ((v->s.pict_type == AV_PICTURE_TYPE_P && !v->p_frame_skipped) && if ((v->fcm == PROGRESSIVE || v->fcm == ILACE_FIELD) &&
(v->s.pict_type == AV_PICTURE_TYPE_P && !v->p_frame_skipped) &&
v->mv_mode == MV_PMODE_INTENSITY_COMP) v->mv_mode == MV_PMODE_INTENSITY_COMP)
return get_VAMvModeVC1(v->mv_mode2); return get_VAMvModeVC1(v->mv_mode2);
return 0; return 0;