mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 15:06:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264decoder,h265decoder: Do not hold codec_data buffer

Browse source 
... also do not need to extract it from caps.

Decoder uses codec_data only once per set_format() and
baseclass will extract codec_data buffer already.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2212>
This commit is contained in:
Seungha Yang 2022-04-18 00:25:18 +09:00 committed by GStreamer Marge Bot
parent dd32e2efbc
commit 9d51cae7ee
2 changed files with 14 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
subprojects/gst-plugins-bad/gst-libs/gst/codecs/gsth264decoder.c
View file

@ -85,8 +85,6 @@ struct _GstH264DecoderPrivate
guint8 profile_idc; guint8 profile_idc;
gint width, height; gint width, height;
/* input codec_data, if any */
GstBuffer *codec_data;
guint nal_length_size; guint nal_length_size;
/* state */ /* state */
@ -408,7 +406,6 @@ gst_h264_decoder_reset (GstH264Decoder * self)
{ {
GstH264DecoderPrivate *priv = self->priv; GstH264DecoderPrivate *priv = self->priv;
gst_clear_buffer (&priv->codec_data);
g_clear_pointer (&self->input_state, gst_video_codec_state_unref); g_clear_pointer (&self->input_state, gst_video_codec_state_unref);
g_clear_pointer (&priv->parser, gst_h264_nal_parser_free); g_clear_pointer (&priv->parser, gst_h264_nal_parser_free);
g_clear_pointer (&priv->dpb, gst_h264_dpb_free); g_clear_pointer (&priv->dpb, gst_h264_dpb_free);
@ -1412,26 +1409,14 @@ gst_h264_decoder_set_format (GstVideoDecoder * decoder,
self->input_state = gst_video_codec_state_ref (state); self->input_state = gst_video_codec_state_ref (state);
if (state->caps) { if (state->caps) {
GstStructure *str;
const GValue *codec_data_value;
GstH264DecoderFormat format; GstH264DecoderFormat format;
GstH264DecoderAlign align; GstH264DecoderAlign align;
gst_h264_decoder_format_from_caps (self, state->caps, &format, &align); gst_h264_decoder_format_from_caps (self, state->caps, &format, &align);
str = gst_caps_get_structure (state->caps, 0);
codec_data_value = gst_structure_get_value (str, "codec_data");
if (GST_VALUE_HOLDS_BUFFER (codec_data_value)) {
gst_buffer_replace (&priv->codec_data,
gst_value_get_buffer (codec_data_value));
} else {
gst_buffer_replace (&priv->codec_data, NULL);
}
if (format == GST_H264_DECODER_FORMAT_NONE) { if (format == GST_H264_DECODER_FORMAT_NONE) {
/* codec_data implies avc */ /* codec_data implies avc */
if (codec_data_value != NULL) { if (state->codec_data) {
GST_WARNING_OBJECT (self, GST_WARNING_OBJECT (self,
"video/x-h264 caps with codec_data but no stream-format=avc"); "video/x-h264 caps with codec_data but no stream-format=avc");
format = GST_H264_DECODER_FORMAT_AVC; format = GST_H264_DECODER_FORMAT_AVC;
@ -1445,7 +1430,7 @@ gst_h264_decoder_set_format (GstVideoDecoder * decoder,
if (format == GST_H264_DECODER_FORMAT_AVC) { if (format == GST_H264_DECODER_FORMAT_AVC) {
/* AVC requires codec_data, AVC3 might have one and/or SPS/PPS inline */ /* AVC requires codec_data, AVC3 might have one and/or SPS/PPS inline */
if (codec_data_value == NULL) { if (!state->codec_data) {
/* Try it with size 4 anyway */ /* Try it with size 4 anyway */
priv->nal_length_size = 4; priv->nal_length_size = 4;
GST_WARNING_OBJECT (self, GST_WARNING_OBJECT (self,
@ -1457,27 +1442,24 @@ gst_h264_decoder_set_format (GstVideoDecoder * decoder,
align = GST_H264_DECODER_ALIGN_AU; align = GST_H264_DECODER_ALIGN_AU;
} }
if (format == GST_H264_DECODER_FORMAT_BYTE) { if (format == GST_H264_DECODER_FORMAT_BYTE && state->codec_data)
if (codec_data_value != NULL) { GST_WARNING_OBJECT (self, "bytestream with codec data");
GST_WARNING_OBJECT (self, "bytestream with codec data");
}
}
priv->in_format = format; priv->in_format = format;
priv->align = align; priv->align = align;
} }
if (priv->codec_data) { if (state->codec_data) {
GstMapInfo map; GstMapInfo map;
gst_buffer_map (priv->codec_data, &map, GST_MAP_READ); gst_buffer_map (state->codec_data, &map, GST_MAP_READ);
if (gst_h264_decoder_parse_codec_data (self, map.data, map.size) != if (gst_h264_decoder_parse_codec_data (self, map.data, map.size) !=
GST_FLOW_OK) { GST_FLOW_OK) {
/* keep going without error. /* keep going without error.
* Probably inband SPS/PPS might be valid data */ * Probably inband SPS/PPS might be valid data */
GST_WARNING_OBJECT (self, "Failed to handle codec data"); GST_WARNING_OBJECT (self, "Failed to handle codec data");
} }
gst_buffer_unmap (priv->codec_data, &map); gst_buffer_unmap (state->codec_data, &map);
} }
/* in case live streaming, we will run on low-latency mode */ /* in case live streaming, we will run on low-latency mode */

33
subprojects/gst-plugins-bad/gst-libs/gst/codecs/gsth265decoder.c
View file

@ -61,8 +61,6 @@ struct _GstH265DecoderPrivate
gint crop_rect_x; gint crop_rect_x;
gint crop_rect_y; gint crop_rect_y;
/* input codec_data, if any */
GstBuffer *codec_data;
guint nal_length_size; guint nal_length_size;
/* state */ /* state */
@ -274,8 +272,6 @@ gst_h265_decoder_stop (GstVideoDecoder * decoder)
self->input_state = NULL; self->input_state = NULL;
} }
gst_clear_buffer (&priv->codec_data);
if (priv->parser) { if (priv->parser) {
gst_h265_parser_free (priv->parser); gst_h265_parser_free (priv->parser);
priv->parser = NULL; priv->parser = NULL;
@ -1012,26 +1008,14 @@ gst_h265_decoder_set_format (GstVideoDecoder * decoder,
self->input_state = gst_video_codec_state_ref (state); self->input_state = gst_video_codec_state_ref (state);
if (state->caps) { if (state->caps) {
GstStructure *str;
const GValue *codec_data_value;
GstH265DecoderFormat format; GstH265DecoderFormat format;
GstH265DecoderAlign align; GstH265DecoderAlign align;
gst_h265_decoder_format_from_caps (self, state->caps, &format, &align); gst_h265_decoder_format_from_caps (self, state->caps, &format, &align);
str = gst_caps_get_structure (state->caps, 0);
codec_data_value = gst_structure_get_value (str, "codec_data");
if (GST_VALUE_HOLDS_BUFFER (codec_data_value)) {
gst_buffer_replace (&priv->codec_data,
gst_value_get_buffer (codec_data_value));
} else {
gst_buffer_replace (&priv->codec_data, NULL);
}
if (format == GST_H265_DECODER_FORMAT_NONE) { if (format == GST_H265_DECODER_FORMAT_NONE) {
/* codec_data implies packetized */ /* codec_data implies packetized */
if (codec_data_value != NULL) { if (state->codec_data) {
GST_WARNING_OBJECT (self, GST_WARNING_OBJECT (self,
"video/x-h265 caps with codec_data but no stream-format=hev1 or hvc1"); "video/x-h265 caps with codec_data but no stream-format=hev1 or hvc1");
format = GST_H265_DECODER_FORMAT_HEV1; format = GST_H265_DECODER_FORMAT_HEV1;
@ -1045,7 +1029,7 @@ gst_h265_decoder_set_format (GstVideoDecoder * decoder,
if (format == GST_H265_DECODER_FORMAT_HEV1 || if (format == GST_H265_DECODER_FORMAT_HEV1 ||
format == GST_H265_DECODER_FORMAT_HVC1) { format == GST_H265_DECODER_FORMAT_HVC1) {
if (codec_data_value == NULL) { if (!state->codec_data) {
/* Try it with size 4 anyway */ /* Try it with size 4 anyway */
priv->nal_length_size = 4; priv->nal_length_size = 4;
GST_WARNING_OBJECT (self, GST_WARNING_OBJECT (self,
@ -1057,27 +1041,24 @@ gst_h265_decoder_set_format (GstVideoDecoder * decoder,
align = GST_H265_DECODER_ALIGN_AU; align = GST_H265_DECODER_ALIGN_AU;
} }
if (format == GST_H265_DECODER_FORMAT_BYTE) { if (format == GST_H265_DECODER_FORMAT_BYTE && state->codec_data)
if (codec_data_value != NULL) { GST_WARNING_OBJECT (self, "bytestream with codec data");
GST_WARNING_OBJECT (self, "bytestream with codec data");
}
}
priv->in_format = format; priv->in_format = format;
priv->align = align; priv->align = align;
} }
if (priv->codec_data) { if (state->codec_data) {
GstMapInfo map; GstMapInfo map;
gst_buffer_map (priv->codec_data, &map, GST_MAP_READ); gst_buffer_map (state->codec_data, &map, GST_MAP_READ);
if (gst_h265_decoder_parse_codec_data (self, map.data, map.size) != if (gst_h265_decoder_parse_codec_data (self, map.data, map.size) !=
GST_FLOW_OK) { GST_FLOW_OK) {
/* keep going without error. /* keep going without error.
* Probably inband SPS/PPS might be valid data */ * Probably inband SPS/PPS might be valid data */
GST_WARNING_OBJECT (self, "Failed to handle codec data"); GST_WARNING_OBJECT (self, "Failed to handle codec data");
} }
gst_buffer_unmap (priv->codec_data, &map); gst_buffer_unmap (state->codec_data, &map);
} }
priv->is_live = FALSE; priv->is_live = FALSE;