FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msdkdec: don't set unknown picture struct to progressive for vc1

Browse Source 
MFXVideoDECODE_DecodeHeader only parses the sequence layer for VC1, so
the structure is unknown for a stream with interlace flag set in the
sequence layer. If forcing the struct to progressive in this plugin,
MediaSDK will fail to decode such streams.
This commit is contained in:
Haihao Xiang 2019-03-29 12:53:38 +08:00
parent 5b0247db33
commit 01051e7dfd
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/msdk/gstmsdkdec.c
View File

@ -319,9 +319,6 @@ gst_msdkdec_init_decoder (GstMsdkDec * thiz)
thiz->param.mfx.FrameInfo.AspectRatioH = info->par_d; thiz->param.mfx.FrameInfo.AspectRatioH = info->par_d;
} }
thiz->param.mfx.FrameInfo.PicStruct =
thiz->param.mfx.FrameInfo.PicStruct ? thiz->param.mfx.
FrameInfo.PicStruct : MFX_PICSTRUCT_PROGRESSIVE;
thiz->param.mfx.FrameInfo.FourCC = thiz->param.mfx.FrameInfo.FourCC =
thiz->param.mfx.FrameInfo.FourCC ? thiz->param.mfx. thiz->param.mfx.FrameInfo.FourCC ? thiz->param.mfx.
FrameInfo.FourCC : MFX_FOURCC_NV12; FrameInfo.FourCC : MFX_FOURCC_NV12;
@ -1468,6 +1465,10 @@ gst_msdkdec_preinit_decoder (GstMsdkDec * decoder)
decoder->param.mfx.FrameInfo.Height = decoder->param.mfx.FrameInfo.Height =
GST_ROUND_UP_32 (decoder->param.mfx.FrameInfo.Height); GST_ROUND_UP_32 (decoder->param.mfx.FrameInfo.Height);
decoder->param.mfx.FrameInfo.PicStruct =
decoder->param.mfx.FrameInfo.PicStruct ? decoder->param.mfx.
FrameInfo.PicStruct : MFX_PICSTRUCT_PROGRESSIVE;
return TRUE; return TRUE;
} }

3
sys/msdk/gstmsdkdec.h
View File

@ -108,8 +108,7 @@ struct _GstMsdkDecClass
gboolean (*configure) (GstMsdkDec * decoder); gboolean (*configure) (GstMsdkDec * decoder);
/* reset mfx parameters per codec, currently it is only used for /* reset mfx parameters per codec */
* the alignment exception for frame width and height */
gboolean (*preinit_decoder) (GstMsdkDec * decoder); gboolean (*preinit_decoder) (GstMsdkDec * decoder);
}; };

4
sys/msdk/gstmsdkvp8dec.c
View File

@ -140,6 +140,10 @@ gst_msdkvp8dec_preinit_decoder (GstMsdkDec * decoder)
decoder->param.mfx.FrameInfo.Height = decoder->param.mfx.FrameInfo.Height =
GST_ROUND_UP_16 (decoder->param.mfx.FrameInfo.Height); GST_ROUND_UP_16 (decoder->param.mfx.FrameInfo.Height);
decoder->param.mfx.FrameInfo.PicStruct =
decoder->param.mfx.FrameInfo.PicStruct ? decoder->param.mfx.
FrameInfo.PicStruct : MFX_PICSTRUCT_PROGRESSIVE;
return TRUE; return TRUE;
} }

4
sys/msdk/gstmsdkvp9dec.c
View File

@ -156,6 +156,10 @@ gst_msdkvp9dec_preinit_decoder (GstMsdkDec * decoder)
decoder->param.mfx.FrameInfo.Height = decoder->param.mfx.FrameInfo.Height =
GST_ROUND_UP_16 (decoder->param.mfx.FrameInfo.Height); GST_ROUND_UP_16 (decoder->param.mfx.FrameInfo.Height);
decoder->param.mfx.FrameInfo.PicStruct =
decoder->param.mfx.FrameInfo.PicStruct ? decoder->param.mfx.
FrameInfo.PicStruct : MFX_PICSTRUCT_PROGRESSIVE;
return TRUE; return TRUE;
} }