From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9AA2B44954 for ; Wed, 28 Sep 2022 09:34:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8165968BBDA; Wed, 28 Sep 2022 12:34:16 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F029568BBC1 for ; Wed, 28 Sep 2022 12:34:07 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 677D62404E4 for ; Wed, 28 Sep 2022 11:34:07 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 76IZa2a_mqGp for ; Wed, 28 Sep 2022 11:34:05 +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 DAD242400F4 for ; Wed, 28 Sep 2022 11:34:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id ED5F43A014F for ; Wed, 28 Sep 2022 11:34:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 11:32:11 +0200 Message-Id: <20220928093213.947-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/encode: make sure frame timebase matches encoder, when set 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: AVFrame.time_base has been added recently, but is currently not used for anything. Prepare for its use in encoders by rejecting frames where time_base is set, but differs from the AVCodecContext one. --- libavcodec/avcodec.h | 4 ++++ libavcodec/encode.c | 8 ++++++++ libavutil/frame.h | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7365eb5cc0..4030675d4f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2645,6 +2645,10 @@ int avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame); * packets are ignored, and sending frames will return * AVERROR_EOF. * + * frame->time_base should be set to the same value as + * avctx->time_base. This is not required yet, but may be in + * the future. + * * For audio: * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame * can have any number of samples. diff --git a/libavcodec/encode.c b/libavcodec/encode.c index b275344bd1..0f78012747 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -386,6 +386,14 @@ static int encode_send_frame_internal(AVCodecContext *avctx, const AVFrame *src) AVFrame *dst = avci->buffer_frame; int ret; + /* make sure the frame's timebase (if set) matches the encoder one */ + if (src->time_base.num && + (src->time_base.num != avctx->time_base.num || + src->time_base.den != avctx->time_base.den)) { + av_log(avctx, AV_LOG_ERROR, "Mismatching frame/encoder time base\n"); + return AVERROR(EINVAL); + } + if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { /* extract audio service type metadata */ AVFrameSideData *sd = av_frame_get_side_data(src, AV_FRAME_DATA_AUDIO_SERVICE_TYPE); diff --git a/libavutil/frame.h b/libavutil/frame.h index 6d9563bc5d..c5e2de85b3 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -441,8 +441,9 @@ typedef struct AVFrame { /** * Time base for the timestamps in this frame. * In the future, this field may be set on frames output by decoders or - * filters, but its value will be by default ignored on input to encoders - * or filters. + * filters; its value will be by default ignored on input to filters. + * For frames sent to encoders, it should be set by the user to the same + * value as AVCodecContext.time_base. */ AVRational time_base; -- 2.35.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".