[FFmpeg-cvslog] avdevice/decklink_enc: fix setting of last_pts to only be set for video

Devin Heitmueller git at videolan.org
Thu Mar 9 01:44:44 EET 2023

ffmpeg | branch: master | Devin Heitmueller <devin.heitmueller at ltnglobal.com> | Fri Mar  3 16:08:14 2023 -0500| [25d09ac0eb175fa75da7107eb2f05e5b17152ffa] | committer: Marton Balint

avdevice/decklink_enc: fix setting of last_pts to only be set for video

The ff_decklink_write_packet() was always caching the last pts
received, to be used when calling StopScheduledPlayback(). However
because audio and video are on different timebases and the call to
StopScheduledPlayback() expects the video timebase, we'll end up
sending a weird value to the stop routine if the last packet
received contained audio.

Move the setting of last_pts to just be for the video stream.

Signed-off-by: Devin Heitmueller <dheitmueller at ltnglobal.com>
Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25d09ac0eb175fa75da7107eb2f05e5b17152ffa

 libavdevice/decklink_enc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 5a435ddc78..573b9e687c 100644
--- a/libavdevice/decklink_enc.cpp
+++ b/libavdevice/decklink_enc.cpp
@@ -441,6 +441,8 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt)
     uint32_t buffered;
     HRESULT hr;
+    ctx->last_pts = FFMAX(ctx->last_pts, pkt->pts);
     if (st->codecpar->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME) {
         if (tmp->format != AV_PIX_FMT_UYVY422 ||
             tmp->width  != ctx->bmd_width ||
@@ -629,8 +631,6 @@ int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt)
     struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
     AVStream *st = avctx->streams[pkt->stream_index];
-    ctx->last_pts = FFMAX(ctx->last_pts, pkt->pts);
     if      (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
         return decklink_write_video_packet(avctx, pkt);
     else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)

More information about the ffmpeg-cvslog mailing list