mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 13:11:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: Only use 2 ticks per frame if decoding interlaced video

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6505>
This commit is contained in:
Sebastian Dröge 2024-05-01 16:50:30 +03:00 committed by GStreamer Marge Bot
parent dc0aebbea0
commit 1953bc6122
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -670,7 +670,9 @@ update_state:
const gint fps_n = ffmpegdec->context->time_base.den; const gint fps_n = ffmpegdec->context->time_base.den;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 100) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 100)
const gint ticks_per_frame = const gint ticks_per_frame =
(ffmpegdec->context-> (GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info)
&& ffmpegdec->context->codec_descriptor
&& ffmpegdec->context->
codec_descriptor->props & AV_CODEC_PROP_FIELDS) ? 2 : 1; codec_descriptor->props & AV_CODEC_PROP_FIELDS) ? 2 : 1;
#else #else
const gint ticks_per_frame = ffmpegdec->context->ticks_per_frame; const gint ticks_per_frame = ffmpegdec->context->ticks_per_frame;
@ -1155,8 +1157,11 @@ static gboolean
context_changed (GstFFMpegVidDec * ffmpegdec, AVCodecContext * context) context_changed (GstFFMpegVidDec * ffmpegdec, AVCodecContext * context)
{ {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 100) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 100)
const gint ticks_per_frame = (context->codec_descriptor const gint ticks_per_frame =
&& context->codec_descriptor->props & AV_CODEC_PROP_FIELDS) ? 2 : 1; (GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info)
&& ffmpegdec->context->codec_descriptor
&& ffmpegdec->context->
codec_descriptor->props & AV_CODEC_PROP_FIELDS) ? 2 : 1;
#else #else
const gint ticks_per_frame = context->ticks_per_frame; const gint ticks_per_frame = context->ticks_per_frame;
#endif #endif
@ -1228,8 +1233,11 @@ update_video_context (GstFFMpegVidDec * ffmpegdec, AVCodecContext * context,
ffmpegdec->pic_field_order_changed = FALSE; ffmpegdec->pic_field_order_changed = FALSE;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 100) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 100)
const gint ticks_per_frame = (context->codec_descriptor const gint ticks_per_frame =
&& context->codec_descriptor->props & AV_CODEC_PROP_FIELDS) ? 2 : 1; (GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info)
&& ffmpegdec->context->codec_descriptor
&& ffmpegdec->context->
codec_descriptor->props & AV_CODEC_PROP_FIELDS) ? 2 : 1;
#else #else
const gint ticks_per_frame = context->ticks_per_frame; const gint ticks_per_frame = context->ticks_per_frame;
#endif #endif