mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvdec: Add support for mpeg4 video decoding with codec_data

Browse source 
Decoder should handle codec_data of mpeg4 video which includes essential
config data.
This commit is contained in:
Seungha Yang 2019-08-28 23:46:44 +09:00 committed by Matthew Waters
parent af77988b9f
commit 14b9a1cffd
2 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sys/nvcodec/gstnvdec.c
View file

@ -806,6 +806,8 @@ gst_nvdec_stop (GstVideoDecoder * decoder)
nvdec->output_state = NULL; nvdec->output_state = NULL;
} }
gst_clear_buffer (&nvdec->codec_data);
return TRUE; return TRUE;
} }
@ -868,6 +870,19 @@ gst_nvdec_set_format (GstVideoDecoder * decoder, GstVideoCodecState * state)
gst_cuda_context_pop (NULL); gst_cuda_context_pop (NULL);
/* store codec data */
if (ret && nvdec->input_state->caps) {
const GValue *codec_data_value;
GstStructure *str;
str = gst_caps_get_structure (nvdec->input_state->caps, 0);
codec_data_value = gst_structure_get_value (str, "codec_data");
if (codec_data_value && GST_VALUE_HOLDS_BUFFER (codec_data_value)) {
GstBuffer *codec_data = gst_value_get_buffer (codec_data_value);
gst_buffer_replace (&nvdec->codec_data, codec_data);
}
}
return ret; return ret;
} }
@ -1077,16 +1092,28 @@ static GstFlowReturn
gst_nvdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame) gst_nvdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
{ {
GstNvDec *nvdec = GST_NVDEC (decoder); GstNvDec *nvdec = GST_NVDEC (decoder);
GstNvDecClass *klass = GST_NVDEC_GET_CLASS (nvdec);
GstMapInfo map_info = GST_MAP_INFO_INIT; GstMapInfo map_info = GST_MAP_INFO_INIT;
CUVIDSOURCEDATAPACKET packet = { 0, }; CUVIDSOURCEDATAPACKET packet = { 0, };
GstBuffer *in_buffer;
GST_LOG_OBJECT (nvdec, "handle frame"); GST_LOG_OBJECT (nvdec, "handle frame");
/* initialize with zero to keep track of frames */ /* initialize with zero to keep track of frames */
gst_video_codec_frame_set_user_data (frame, GUINT_TO_POINTER (0), NULL); gst_video_codec_frame_set_user_data (frame, GUINT_TO_POINTER (0), NULL);
if (!gst_buffer_map (frame->input_buffer, &map_info, GST_MAP_READ)) { in_buffer = gst_buffer_ref (frame->input_buffer);
if (GST_BUFFER_IS_DISCONT (frame->input_buffer)) {
packet.flags = CUVID_PKT_DISCONTINUITY;
if (nvdec->codec_data && klass->codec_type == cudaVideoCodec_MPEG4) {
in_buffer = gst_buffer_append (gst_buffer_ref (nvdec->codec_data),
in_buffer);
}
}
if (!gst_buffer_map (in_buffer, &map_info, GST_MAP_READ)) {
GST_ERROR_OBJECT (nvdec, "failed to map input buffer"); GST_ERROR_OBJECT (nvdec, "failed to map input buffer");
gst_buffer_unref (in_buffer);
gst_video_codec_frame_unref (frame); gst_video_codec_frame_unref (frame);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -1094,10 +1121,7 @@ gst_nvdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
packet.payload_size = (gulong) map_info.size; packet.payload_size = (gulong) map_info.size;
packet.payload = map_info.data; packet.payload = map_info.data;
packet.timestamp = frame->pts; packet.timestamp = frame->pts;
packet.flags = CUVID_PKT_TIMESTAMP; packet.flags |= CUVID_PKT_TIMESTAMP;
if (GST_BUFFER_IS_DISCONT (frame->input_buffer))
packet.flags |= CUVID_PKT_DISCONTINUITY;
nvdec->state = GST_NVDEC_STATE_PARSE; nvdec->state = GST_NVDEC_STATE_PARSE;
nvdec->last_ret = GST_FLOW_OK; nvdec->last_ret = GST_FLOW_OK;
@ -1105,7 +1129,8 @@ gst_nvdec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
if (!gst_cuda_result (CuvidParseVideoData (nvdec->parser, &packet))) if (!gst_cuda_result (CuvidParseVideoData (nvdec->parser, &packet)))
GST_WARNING_OBJECT (nvdec, "parser failed"); GST_WARNING_OBJECT (nvdec, "parser failed");
gst_buffer_unmap (frame->input_buffer, &map_info); gst_buffer_unmap (in_buffer, &map_info);
gst_buffer_unref (in_buffer);
gst_video_codec_frame_unref (frame); gst_video_codec_frame_unref (frame);
return nvdec->last_ret; return nvdec->last_ret;

2
sys/nvcodec/gstnvdec.h
View file

@ -87,6 +87,8 @@ struct _GstNvDec
GstFlowReturn last_ret; GstFlowReturn last_ret;
GstNvDecState state; GstNvDecState state;
GstNvDecMemType mem_type; GstNvDecMemType mem_type;
GstBuffer *codec_data;
}; };
struct _GstNvDecClass struct _GstNvDecClass