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

libav: Only allocate extradata while decoding

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9056>
This commit is contained in:
Doug Nazar 2025-05-22 09:10:49 -04:00 committed by GStreamer Marge Bot
parent d0b2e6cb68
commit 50cad4a7fa
6 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/gst-libav/ext/libav/gstavauddec.c
View File

@ -297,7 +297,7 @@ gst_ffmpegauddec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
/* get size and so */ /* get size and so */
gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id,
oclass->in_plugin->type, caps, ffmpegdec->context); oclass->in_plugin->type, caps, ffmpegdec->context, FALSE);
/* workaround encoder bugs */ /* workaround encoder bugs */
ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT; ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT;

2
subprojects/gst-libav/ext/libav/gstavaudenc.c
View File

@ -286,7 +286,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
} }
GST_DEBUG_OBJECT (ffmpegaudenc, "chose caps %" GST_PTR_FORMAT, allowed_caps); GST_DEBUG_OBJECT (ffmpegaudenc, "chose caps %" GST_PTR_FORMAT, allowed_caps);
gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id,
oclass->in_plugin->type, allowed_caps, ffmpegaudenc->context); oclass->in_plugin->type, allowed_caps, ffmpegaudenc->context, TRUE);
/* open codec */ /* open codec */
if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) {

17
subprojects/gst-libav/ext/libav/gstavcodecmap.c
View File

@ -3858,7 +3858,8 @@ full_copy:
void void
gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
enum AVMediaType codec_type, const GstCaps * caps, AVCodecContext * context) enum AVMediaType codec_type, const GstCaps * caps,
AVCodecContext * context, gboolean encode)
{ {
GstStructure *str; GstStructure *str;
const GValue *value; const GValue *value;
@ -3872,6 +3873,12 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
str = gst_caps_get_structure (caps, 0); str = gst_caps_get_structure (caps, 0);
/* only add extradata for decoding */
if (!encode) {
/* free the old one if it is there */
if (context->extradata)
av_free (context->extradata);
/* extradata parsing (esds [mpeg4], wma/wmv, msmpeg4v1/2/3, etc.) */ /* extradata parsing (esds [mpeg4], wma/wmv, msmpeg4v1/2/3, etc.) */
if ((value = gst_structure_get_value (str, "codec_data"))) { if ((value = gst_structure_get_value (str, "codec_data"))) {
GstMapInfo map; GstMapInfo map;
@ -3879,10 +3886,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
buf = gst_value_get_buffer (value); buf = gst_value_get_buffer (value);
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
/* free the old one if it is there */
if (context->extradata)
av_free (context->extradata);
#if 0 #if 0
if (codec_id == AV_CODEC_ID_H264) { if (codec_id == AV_CODEC_ID_H264) {
guint extrasize; guint extrasize;
@ -3926,6 +3929,7 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
context->extradata_size = 0; context->extradata_size = 0;
GST_DEBUG ("no codec data"); GST_DEBUG ("no codec data");
} }
}
switch (codec_id) { switch (codec_id) {
case AV_CODEC_ID_MPEG4: case AV_CODEC_ID_MPEG4:
@ -5107,7 +5111,8 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
context->codec_type = AVMEDIA_TYPE_UNKNOWN; context->codec_type = AVMEDIA_TYPE_UNKNOWN;
} }
context->codec_id = id; context->codec_id = id;
gst_ffmpeg_caps_with_codecid (id, context->codec_type, caps, context); // Say we're encoding since we don't want to allocate the extradata region
gst_ffmpeg_caps_with_codecid (id, context->codec_type, caps, context, TRUE);
} }
if (id != AV_CODEC_ID_NONE) { if (id != AV_CODEC_ID_NONE) {

3
subprojects/gst-libav/ext/libav/gstavcodecmap.h
View File

@ -81,7 +81,8 @@ void
gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id,
enum AVMediaType codec_type, enum AVMediaType codec_type,
const GstCaps *caps, const GstCaps *caps,
AVCodecContext *context); AVCodecContext *context,
gboolean encode);
/* /*
* caps_with_codectype () transforms a GstCaps that belongs to * caps_with_codectype () transforms a GstCaps that belongs to

2
subprojects/gst-libav/ext/libav/gstavviddec.c
View File

@ -624,7 +624,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
/* FIXME : Create a method that takes GstVideoCodecState instead */ /* FIXME : Create a method that takes GstVideoCodecState instead */
/* get size and so */ /* get size and so */
gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id,
oclass->in_plugin->type, state->caps, ffmpegdec->context); oclass->in_plugin->type, state->caps, ffmpegdec->context, FALSE);
GST_LOG_OBJECT (ffmpegdec, "size after %dx%d", ffmpegdec->context->width, GST_LOG_OBJECT (ffmpegdec, "size after %dx%d", ffmpegdec->context->width,
ffmpegdec->context->height); ffmpegdec->context->height);

2
subprojects/gst-libav/ext/libav/gstavvidenc.c
View File

@ -323,7 +323,7 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder,
} }
GST_DEBUG_OBJECT (ffmpegenc, "chose caps %" GST_PTR_FORMAT, allowed_caps); GST_DEBUG_OBJECT (ffmpegenc, "chose caps %" GST_PTR_FORMAT, allowed_caps);
gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id,
oclass->in_plugin->type, allowed_caps, ffmpegenc->context); oclass->in_plugin->type, allowed_caps, ffmpegenc->context, TRUE);
/* open codec */ /* open codec */
if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) { if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) {