mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdkdec: Fix advanced profile vc1 decode when codec_data presents

Browse source 
The gst-msdk decoders only support packetized formats for
all codecs except VC1. For VC1, it supports codec_data for advanced
profiles and this codec_data wan't submitting to MSDK's DecodeHeader APIs.
Make sure the subclass deocders correctly configured so that
the codec_data buffers are in place in the internal adapter for
MediaSDK's DecoderHeader usage.
This commit is contained in:
Sreerenj Balachandran 2018-07-02 16:48:11 -08:00
parent 9efb4c9179
commit ad6162e99b
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sys/msdk/gstmsdkdec.c
View file

@ -842,6 +842,30 @@ gst_msdkdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
gsize data_size; gsize data_size;
gboolean hard_reset = FALSE; gboolean hard_reset = FALSE;
/* configure the subclss inorder to fill the CodecID field of mfxVideoParam
* and also to load the PluginID for some of the codecs which is mandatory
* to invoke the MFXVideoDECODE_DecodeHeader API.
*
* For non packetized formats (currently only vc1), there
* could be headers received as codec_data which are not available
* instream and in that case subclass implementation will
* push it to the internal adapter. We invoke the subclass configure
* well early to make sure the codec_data received has been correctly
* pushed to the adapter by the subclasses before doing
* the DecodeHeader() later on
*/
if (!thiz->initialized || thiz->do_renego) {
/* Clear the internal adapter in renegotiation for non-packetized
* formats */
if (!thiz->is_packetized)
gst_adapter_clear (thiz->adapter);
if (!klass->configure || !klass->configure (thiz)) {
flow = GST_FLOW_OK;
goto error;
}
}
if (!gst_buffer_map (frame->input_buffer, &map_info, GST_MAP_READ)) if (!gst_buffer_map (frame->input_buffer, &map_info, GST_MAP_READ))
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -871,14 +895,6 @@ gst_msdkdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
if (!thiz->initialized || thiz->do_renego) { if (!thiz->initialized || thiz->do_renego) {
/* configure the subclss inorder to fill the CodecID field of mfxVideoParam
* and also to load the PluginID for some of the codecs which is mandatory
* to invoke the MFXVideoDECODE_DecodeHeader API */
if (!klass->configure || !klass->configure (thiz)) {
flow = GST_FLOW_OK;
goto error;
}
/* gstreamer caps will not bring all the necessary parameters /* gstreamer caps will not bring all the necessary parameters
* required for optimal decode configuration. For eg: the required numbers * required for optimal decode configuration. For eg: the required numbers
* of surfaces to be allocated can be calculated based on H264 SEI header * of surfaces to be allocated can be calculated based on H264 SEI header