Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 4/7] lavc/mjpegdec: properly set pts and duration for smvjpeg
Date: Fri, 14 Apr 2023 18:42:41 +0200
Message-ID: <20230414164244.15264-4-anton@khirnov.net> (raw)
In-Reply-To: <20230414164244.15264-1-anton@khirnov.net>

A single smvjpeg packet decodes into one large mjpeg frame, slices of
which are then returned as output frames. Packet duration covers all of
these slices.
---
 libavcodec/mjpegdec.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 0a69c42459..9b0137c91c 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -3010,6 +3010,8 @@ static void smv_process_frame(AVCodecContext *avctx, AVFrame *frame)
     frame->crop_top    = FFMIN(s->smv_next_frame * avctx->height, frame->height);
     frame->crop_bottom = frame->height - (s->smv_next_frame + 1) * avctx->height;
 
+    if (s->smv_frame->pts != AV_NOPTS_VALUE)
+        s->smv_frame->pts += s->smv_frame->duration;
     s->smv_next_frame = (s->smv_next_frame + 1) % s->smv_frames_per_jpeg;
 
     if (s->smv_next_frame == 0)
@@ -3041,6 +3043,9 @@ static int smvjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame)
     if (!got_frame)
         return AVERROR(EAGAIN);
 
+    // packet duration covers all the frames in the packet
+    s->smv_frame->duration /= s->smv_frames_per_jpeg;
+
 return_frame:
     av_assert0(s->smv_frame->buf[0]);
     ret = av_frame_ref(frame, s->smv_frame);
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2023-04-14 16:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-14 16:42 [FFmpeg-devel] [PATCH 1/7] lavfi: ensure audio frame durations match the sample count Anton Khirnov
2023-04-14 16:42 ` [FFmpeg-devel] [PATCH 2/7] lavc/encode: do not use pkt_duration for encoding Anton Khirnov
2023-04-14 16:42 ` [FFmpeg-devel] [PATCH 3/7] lavc/mjpegdec: simplify smvjpeg_receive_frame() Anton Khirnov
2023-04-14 16:42 ` Anton Khirnov [this message]
2023-04-14 16:42 ` [FFmpeg-devel] [PATCH 5/7] fftools/sync_queue: update audio frame duration when re-chunking Anton Khirnov
2023-04-14 16:42 ` [FFmpeg-devel] [PATCH 6/7] fftools/ffmpeg_enc: set audio frame duration when encoding Anton Khirnov
2023-04-14 16:42 ` [FFmpeg-devel] [PATCH 7/7] fftools/ffmpeg: propagate frame durations to packets " Anton Khirnov
2023-04-14 16:51   ` Anton Khirnov
2023-04-17  7:33 ` [FFmpeg-devel] [PATCH 1/7] lavfi: ensure audio frame durations match the sample count Nicolas George
2023-04-17  9:51   ` Anton Khirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230414164244.15264-4-anton@khirnov.net \
    --to=anton@khirnov.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git