From patchwork Fri Apr 14 16:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp642565pzb; Fri, 14 Apr 2023 09:43:34 -0700 (PDT) X-Google-Smtp-Source: AKy350ZjOIpEN02741lvh1VLMqnqm3iPpSW3yEhv2WxdlxRFZcpvPdU+CasCmHwAEXCad/8xiOhG X-Received: by 2002:a17:906:7c81:b0:94e:732f:a594 with SMTP id w1-20020a1709067c8100b0094e732fa594mr7881289ejo.23.1681490613844; Fri, 14 Apr 2023 09:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681490613; cv=none; d=google.com; s=arc-20160816; b=ukPiCRJM9Y+RjpxW7k+Jzq87QxYnBIztZLjypPflRJd31oGLkyraDcqhSUcri6vM9E ZLlCZ1K05whPvdoWG/S19uK43WSioKMiBnin2D6J2DY7ZYwZhEGrOKWIehW4MaH4XsuM eouK6s8sSwMeYegFHqBXv8vEx7pxm/FCTSntoxvKG7Nnb4+v+0MGWI0bmFcAsScH6KJY j0UydBqbJn8mccXlTWzzCMeg/Fsg0FlzCOEB77F0ta4YVA7sSp5atHfFNgHydaSzGuHe 6G4ve0FyA8gDFCb7YJGw1wyews2Xo6sJmC3QCYheb3VTZpxyEtQXBOAjXUwO+4ZveB2J v1+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=hsA4qIBmuhCM+xXDsfJ8AKLJsjxi3kqPlFYqKnN/r8k=; b=nfTpJY+PNJsEEhyLR+fqRfVTTwiaNGA15IbDJVGX/zOYlL5fhxHhxKhZZWjnzIfK3z SyhFeSlb9z+CQhfDQOHXMqFSvMdUEm5sncxvfdBXx6fI/QlHX+bNCfLcDZYAWlrq+7VZ oTDPbRGHXomygLst7f+glgUM4ttT8sxsMrlOQzqdoUVfXK+8uSAaU/k2jFqhXQvH4Vly k2bANh1jQzKK6UWnwG6VyfGS25ccEtOaFCk4Hg3UcALIMNbQM+g4BBzjCdBHwyCdizWp ZJq/xiu4E/ea0eNaDzNvM9mTgbgAFF/9shb0XAJIQoFa85lbTxhMe9PoDIpCL3+eSUKy Z7TA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fb21-20020a1709073a1500b0094ede5840d4si2172372ejc.704.2023.04.14.09.43.29; Fri, 14 Apr 2023 09:43:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7ACEB68BEEC; Fri, 14 Apr 2023 19:43:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D843E68B79A for ; Fri, 14 Apr 2023 19:42:55 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9D4352404EE for ; Fri, 14 Apr 2023 18:42:55 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id IDMrDLvl4-2v for ; Fri, 14 Apr 2023 18:42:55 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 30464240591 for ; Fri, 14 Apr 2023 18:42:54 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C16493A0404 for ; Fri, 14 Apr 2023 18:42:47 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Apr 2023 18:42:41 +0200 Message-Id: <20230414164244.15264-4-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230414164244.15264-1-anton@khirnov.net> References: <20230414164244.15264-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] lavc/mjpegdec: properly set pts and duration for smvjpeg X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0qd5Bumf8wdB 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);