mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: Fix crash with FFmpeg n6.0

Browse source 
FFmpeg version 6.0 has an AV_CODEC_FLAG_COPY_OPAQUE related bug.

See a3bf63c26e

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6184>
This commit is contained in:
Seungha Yang 2024-02-22 23:13:53 +09:00 committed by GStreamer Marge Bot
parent 03f8968119
commit 781fc4a1b6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-libav/ext/libav/gstavviddec.c
View file

@ -450,7 +450,7 @@ gst_ffmpegviddec_open (GstFFMpegVidDec * ffmpegdec)
gst_ffmpegviddec_context_set_flags (ffmpegdec->context, gst_ffmpegviddec_context_set_flags (ffmpegdec->context,
AV_CODEC_FLAG_OUTPUT_CORRUPT, ffmpegdec->output_corrupt); AV_CODEC_FLAG_OUTPUT_CORRUPT, ffmpegdec->output_corrupt);
#if LIBAVCODEC_VERSION_MAJOR >= 60 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (60, 31, 100)
gst_ffmpegviddec_context_set_flags (ffmpegdec->context, gst_ffmpegviddec_context_set_flags (ffmpegdec->context,
AV_CODEC_FLAG_COPY_OPAQUE, TRUE); AV_CODEC_FLAG_COPY_OPAQUE, TRUE);
#endif #endif
@ -925,7 +925,7 @@ gst_ffmpegviddec_can_direct_render (GstFFMpegVidDec * ffmpegdec)
AV_CODEC_CAP_DR1); AV_CODEC_CAP_DR1);
} }
#if LIBAVCODEC_VERSION_MAJOR >= 60 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (60, 31, 100)
static void static void
gst_ffmpeg_opaque_free (void *opaque, guint8 * data) gst_ffmpeg_opaque_free (void *opaque, guint8 * data)
{ {
@ -959,7 +959,7 @@ gst_ffmpegviddec_get_buffer2 (AVCodecContext * context, AVFrame * picture,
/* apply the last info we have seen to this picture, when we get the /* apply the last info we have seen to this picture, when we get the
* picture back from ffmpeg we can use this to correctly timestamp the output * picture back from ffmpeg we can use this to correctly timestamp the output
* buffer */ * buffer */
#if LIBAVCODEC_VERSION_MAJOR >= 60 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (60, 31, 100)
{ {
GstVideoCodecFrame *input_frame = GstVideoCodecFrame *input_frame =
av_buffer_get_opaque (picture->opaque_ref); av_buffer_get_opaque (picture->opaque_ref);
@ -1803,7 +1803,7 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
gst_video_frame_unmap (&vframe); gst_video_frame_unmap (&vframe);
#if LIBAVCODEC_VERSION_MAJOR < 60 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (60, 31, 100)
ffmpegdec->picture->reordered_opaque = -1; ffmpegdec->picture->reordered_opaque = -1;
#endif #endif
@ -1921,7 +1921,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
GST_DEBUG_OBJECT (ffmpegdec, "picture: display %d", GST_DEBUG_OBJECT (ffmpegdec, "picture: display %d",
ffmpegdec->picture->display_picture_number); ffmpegdec->picture->display_picture_number);
#endif #endif
#if LIBAVCODEC_VERSION_MAJOR >= 60 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (60, 31, 100)
GST_DEBUG_OBJECT (ffmpegdec, "picture: opaque_ref %p", GST_DEBUG_OBJECT (ffmpegdec, "picture: opaque_ref %p",
ffmpegdec->picture->opaque_ref); ffmpegdec->picture->opaque_ref);
#else #else
@ -2234,7 +2234,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
/* Store a reference to the input frame. This will be carried along by FFmpeg /* Store a reference to the input frame. This will be carried along by FFmpeg
* to the resulting AVPicture */ * to the resulting AVPicture */
#if LIBAVCODEC_VERSION_MAJOR >= 60 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (60, 31, 100)
{ {
packet->opaque_ref = packet->opaque_ref =
av_buffer_create (NULL, 0, gst_ffmpeg_opaque_free, av_buffer_create (NULL, 0, gst_ffmpeg_opaque_free,