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 ESMTPS id CA0D24D708 for ; Sun, 23 Feb 2025 22:07:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C769668CA7E; Mon, 24 Feb 2025 00:06:52 +0200 (EET) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2FCB68CA68 for ; Mon, 24 Feb 2025 00:06:45 +0200 (EET) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fc20e0f0ceso5688897a91.3 for ; Sun, 23 Feb 2025 14:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740348403; x=1740953203; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bTBHw5ySPK0oppj6LrfMDxNWfNKstWnQ6mhZ3HZxTSw=; b=K5rLvbTnYTNNXP9mCTSkD/7y1JBBkff6g9t6kuYEdx7y73Gtn/i0+l4mNF0nirr9f2 S4L/G7SoVOHUkzROxTC1V8WJV+vZwRppWeLfeOBghNYFcAHoMNa9m5ZbTTCB++PBud3r BtqMuupmxzSmWz+PqD59ebKYxsWlH35GivlKIqnrxNdQn+E/Cr9pA/swNXPXHzQffdds hbwWJ3pso5mh8BWhtcYtXlojwCKI5btKCwUf9ITCC4Xj+Hspot5AXltsFffKgx7edR4n TtLaErdjXzQOydXwG3/PWoSrm4S6sl0ZocELIpFlyXgUhWmuGiC5YnM54LnvrOvlFhe9 FKZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740348403; x=1740953203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bTBHw5ySPK0oppj6LrfMDxNWfNKstWnQ6mhZ3HZxTSw=; b=Y47/ydYnUdwwo6D5eJyEhVj1GlH1yZA/okjV4U1EY7dsDOuBU0A6fj0GflzogqP0KD 3w+VCXynhtWuzFUa2FCHsttKQ5Nz6HdYeipkAn4DDZs+gUSHzKsSVDLERaiIXZev5PvE CUBhTi5dtjfSj/4CMHLhhKJRrScQWQektkZHefX8jvLoSySmHWfBT5krQtyKxcNiqWZZ FS8iQ75fjgrruRx7HZ7GuaWJnjwCZBeBQPdQbgBWMRaMnVq3maG6r29f2kvx0GEhak3F ogGFPZARRM6tIwGkY3FJ89TH/owmThnH1oMqplC1ulJVkcXc/7+NDRHhEeMBUOy22Uss EzbA== X-Gm-Message-State: AOJu0YySjpDHtPtWT87eWFGumr+mAthXC//VwA63iARlyHaGeRc7qrSt mmak70nxQlePvOzRQfwgoRQq3q4iqREdK3CoUIyh44vj/P/my6lL2viw7vEC X-Gm-Gg: ASbGncsfSWWBa7K5MAzID8SODhhkRejvl2oCapMtdDdAD4h4urVLMchfRUI2zcWjZVj 9/QG94hgDCXJbf+b+8GLJw23rAcXC5KALOqO16dPsjbqZHHpuFezLNgt5eTBXqFRVQ2inPREjSY crbarL9GKz8twrmRkNUMI1BmjqyREm6L19g3NvRV3FlURsAp8HNLkr7R//Rg6xMgurXskk14ToH dnYOxz2du+LnDFYpNArtJlommWFX5oWek0tQitkq0hSBVjfiL3RGmYrvz+vPfLQg3adegNnQR6b EFRz37O5nqWmqqxGlGCyYlykd82oMx3ufIY/xkEE5g== X-Google-Smtp-Source: AGHT+IGzbTHEcAtXCEkHVmBGPDTfavdfSBx9897e+uZuQtTbZuo/E+eKv69Sq9Kik4G5I+HOZKN4Cw== X-Received: by 2002:a17:90b:2688:b0:2fa:20f4:d27a with SMTP id 98e67ed59e1d1-2fce77a6382mr20410342a91.7.1740348403105; Sun, 23 Feb 2025 14:06:43 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:b49d:85a5:a7d1:4da6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fceb04bf70sm5091848a91.16.2025.02.23.14.06.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 14:06:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2025 19:06:02 -0300 Message-ID: <20250223220630.18756-3-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250223220630.18756-1-jamrial@gmail.com> References: <20250223220630.18756-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/30] avcodec: remove deprecated FF_API_TICKS_PER_FRAME 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: Deprecated since 2023-05-15. Signed-off-by: James Almer --- libavcodec/amfenc_av1.c | 8 +------- libavcodec/amfenc_h264.c | 8 +------- libavcodec/amfenc_hevc.c | 8 +------- libavcodec/avcodec.h | 17 ----------------- libavcodec/encode.c | 14 -------------- libavcodec/flashsv2enc.c | 5 ++--- libavcodec/h264dec.c | 6 ------ libavcodec/libaomenc.c | 8 +------- libavcodec/libkvazaar.c | 8 +------- libavcodec/libopenh264enc.c | 8 +------- libavcodec/librav1e.c | 8 +------- libavcodec/libsvtav1.c | 8 +------- libavcodec/libvpxenc.c | 8 +------- libavcodec/libvvenc.c | 15 +-------------- libavcodec/libx264.c | 8 +------- libavcodec/libx265.c | 7 +------ libavcodec/mfenc.c | 5 ----- libavcodec/mpeg12dec.c | 11 ----------- libavcodec/mpegvideo_parser.c | 10 ---------- libavcodec/msmpeg4enc.c | 8 +------- libavcodec/nvenc.c | 8 +------- libavcodec/options_table.h | 3 --- libavcodec/pthread_frame.c | 5 ----- libavcodec/ratecontrol.c | 6 ------ libavcodec/vc1.c | 8 -------- libavcodec/version_major.h | 1 - libavformat/avformat.c | 11 ----------- libavformat/demux.c | 6 ------ 28 files changed, 16 insertions(+), 210 deletions(-) diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 4c815add03..f672585c57 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -207,13 +207,7 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); } else { -FF_DISABLE_DEPRECATION_WARNINGS - framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ); -FF_ENABLE_DEPRECATION_WARNINGS + framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num); } if ((ret = ff_amf_encode_init(avctx)) < 0) diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 1a217350ae..c22241fd68 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -208,13 +208,7 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); } else { -FF_DISABLE_DEPRECATION_WARNINGS - framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ); -FF_ENABLE_DEPRECATION_WARNINGS + framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num); } if ((ret = ff_amf_encode_init(avctx)) != 0) diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 3530c453dd..56598939c4 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -173,13 +173,7 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den); } else { -FF_DISABLE_DEPRECATION_WARNINGS - framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ); -FF_ENABLE_DEPRECATION_WARNINGS + framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num); } if ((ret = ff_amf_encode_init(avctx)) < 0) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 403f02d841..f6de3c6b42 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -573,23 +573,6 @@ typedef struct AVCodecContext { */ AVRational framerate; -#if FF_API_TICKS_PER_FRAME - /** - * For some codecs, the time base is closer to the field rate than the frame rate. - * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration - * if no telecine is used ... - * - * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2. - * - * @deprecated - * - decoding: Use AVCodecDescriptor.props & AV_CODEC_PROP_FIELDS - * - encoding: Set AVCodecContext.framerate instead - * - */ - attribute_deprecated - int ticks_per_frame; -#endif - /** * Codec delay. * diff --git a/libavcodec/encode.c b/libavcodec/encode.c index cd10dcf3cd..7935bb971b 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -613,20 +613,6 @@ static int encode_preinit_video(AVCodecContext *avctx) return AVERROR(EINVAL); } -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->ticks_per_frame && avctx->time_base.num && - avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) { - av_log(avctx, AV_LOG_ERROR, - "ticks_per_frame %d too large for the timebase %d/%d.", - avctx->ticks_per_frame, - avctx->time_base.num, - avctx->time_base.den); - return AVERROR(EINVAL); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (avctx->hw_frames_ctx) { AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data; if (frames_ctx->format != avctx->pix_fmt) { diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 6156d00d0d..52fe0a8730 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -786,7 +786,7 @@ static int optimum_block_height(FlashSV2Context * s) static int optimum_use15_7(FlashSV2Context * s) { #ifndef FLASHSV2_DUMB - double ideal = ((double)(s->avctx->bit_rate * s->avctx->time_base.den * s->avctx->ticks_per_frame)) / + double ideal = ((double)(s->avctx->bit_rate * s->avctx->time_base.den)) / ((double) s->avctx->time_base.num) * s->avctx->frame_num; if (ideal + use15_7_threshold < s->total_bits) { return 1; @@ -802,8 +802,7 @@ static int optimum_dist(FlashSV2Context * s) { #ifndef FLASHSV2_DUMB double ideal = - s->avctx->bit_rate * s->avctx->time_base.den * - s->avctx->ticks_per_frame; + s->avctx->bit_rate * s->avctx->time_base.den; int dist = pow((s->total_bits / ideal) * color15_7_factor, 3); av_log(s->avctx, AV_LOG_DEBUG, "dist: %d\n", dist); return dist; diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 45ebe2656d..829427f99b 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -397,12 +397,6 @@ static av_cold int h264_decode_init(AVCodecContext *avctx) return AVERROR_UNKNOWN; } -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->ticks_per_frame = 2; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (!avctx->internal->is_copy) { if (avctx->extradata_size > 0 && avctx->extradata) { ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size, diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 0f7571ee7a..9a384fcc39 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1270,13 +1270,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, else if (avctx->framerate.num > 0 && avctx->framerate.den > 0) duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base); else { -FF_DISABLE_DEPRECATION_WARNINGS - duration = -#if FF_API_TICKS_PER_FRAME - avctx->ticks_per_frame ? avctx->ticks_per_frame : -#endif - 1; -FF_ENABLE_DEPRECATION_WARNINGS + duration = 1; } switch (frame->color_range) { diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index e82be2a35f..17ef6a5736 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -86,13 +86,7 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx) cfg->framerate_denom = avctx->framerate.den; } else { cfg->framerate_num = avctx->time_base.den; -FF_DISABLE_DEPRECATION_WARNINGS - cfg->framerate_denom = avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ; -FF_ENABLE_DEPRECATION_WARNINGS + cfg->framerate_denom = avctx->time_base.num; } cfg->target_bitrate = avctx->bit_rate; cfg->vui.sar_width = avctx->sample_aspect_ratio.num; diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 7107c1a679..18150fa3b6 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -135,13 +135,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { param.fMaxFrameRate = av_q2d(avctx->framerate); } else { -FF_DISABLE_DEPRECATION_WARNINGS - param.fMaxFrameRate = 1.0 / av_q2d(avctx->time_base) -#if FF_API_TICKS_PER_FRAME - / FFMAX(avctx->ticks_per_frame, 1) -#endif - ; -FF_ENABLE_DEPRECATION_WARNINGS + param.fMaxFrameRate = 1.0 / av_q2d(avctx->time_base); } param.iPicWidth = avctx->width; param.iPicHeight = avctx->height; diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 546d00297d..a1fb1539b6 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -217,15 +217,9 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) avctx->framerate.den, avctx->framerate.num }); } else { -FF_DISABLE_DEPRECATION_WARNINGS rav1e_config_set_time_base(cfg, (RaRational) { - avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - , avctx->time_base.den + avctx->time_base.num, avctx->time_base.den }); -FF_ENABLE_DEPRECATION_WARNINGS } if ((avctx->flags & AV_CODEC_FLAG_PASS1 || avctx->flags & AV_CODEC_FLAG_PASS2) && !avctx->bit_rate) { diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 43fe531fde..40ab489f1f 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -311,13 +311,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->frame_rate_denominator = avctx->framerate.den; } else { param->frame_rate_numerator = avctx->time_base.den; -FF_DISABLE_DEPRECATION_WARNINGS - param->frame_rate_denominator = avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ; -FF_ENABLE_DEPRECATION_WARNINGS + param->frame_rate_denominator = avctx->time_base.num; } /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 228ede7c84..189774ff03 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1831,13 +1831,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, else if (avctx->framerate.num > 0 && avctx->framerate.den > 0) duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base); else { -FF_DISABLE_DEPRECATION_WARNINGS - duration = -#if FF_API_TICKS_PER_FRAME - avctx->ticks_per_frame ? avctx->ticks_per_frame : -#endif - 1; -FF_ENABLE_DEPRECATION_WARNINGS + duration = 1; } res = vpx_codec_encode(&ctx->encoder, rawimg, timestamp, diff --git a/libavcodec/libvvenc.c b/libavcodec/libvvenc.c index ece9badb19..2966c4e2fd 100644 --- a/libavcodec/libvvenc.c +++ b/libavcodec/libvvenc.c @@ -128,20 +128,7 @@ static void vvenc_set_framerate(AVCodecContext *avctx, vvenc_config *params) params->m_FrameScale = avctx->time_base.num; } -FF_DISABLE_DEPRECATION_WARNINGS - -#if FF_API_TICKS_PER_FRAME - if (avctx->ticks_per_frame == 1) { -#endif - params->m_TicksPerSecond = -1; /* auto mode for ticks per frame = 1 */ -#if FF_API_TICKS_PER_FRAME - } else { - params->m_TicksPerSecond = - ceil((avctx->time_base.den / (double) avctx->time_base.num) * - (double) avctx->ticks_per_frame); - } -#endif -FF_ENABLE_DEPRECATION_WARNINGS + params->m_TicksPerSecond = -1; /* auto mode for ticks per frame = 1 */ } static int vvenc_parse_vvenc_params(AVCodecContext *avctx, vvenc_config *params) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 409f45fc7d..2c97913887 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1317,13 +1317,7 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.i_fps_den = avctx->framerate.den; } else { x4->params.i_fps_num = avctx->time_base.den; -FF_DISABLE_DEPRECATION_WARNINGS - x4->params.i_fps_den = avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ; -FF_ENABLE_DEPRECATION_WARNINGS + x4->params.i_fps_den = avctx->time_base.num; } x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR; diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index db0f0972df..d897707dd7 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -292,12 +292,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->fpsDenom = avctx->framerate.den; } else { ctx->params->fpsNum = avctx->time_base.den; -FF_DISABLE_DEPRECATION_WARNINGS - ctx->params->fpsDenom = avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ; + ctx->params->fpsDenom = avctx->time_base.num; FF_ENABLE_DEPRECATION_WARNINGS } ctx->params->sourceWidth = avctx->width; diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index c062d87f11..c0a7d438ad 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -660,11 +660,6 @@ static int mf_encv_output_adjust(AVCodecContext *avctx, IMFMediaType *type) framerate = avctx->framerate; } else { framerate = av_inv_q(avctx->time_base); -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - framerate.den *= avctx->ticks_per_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } ff_MFSetAttributeRatio((IMFAttributes *)type, &MF_MT_FRAME_RATE, framerate.num, framerate.den); diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 262e213a61..bd05fe0814 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -970,12 +970,6 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) { // MPEG-1 fps avctx->framerate = ff_mpeg12_frame_rate_tab[s1->frame_rate_index]; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->ticks_per_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; } else { // MPEG-2 // MPEG-2 fps @@ -984,11 +978,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_mpeg12_frame_rate_tab[s1->frame_rate_index].num * s1->frame_rate_ext.num, ff_mpeg12_frame_rate_tab[s1->frame_rate_index].den * s1->frame_rate_ext.den, 1 << 30); -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->ticks_per_frame = 2; -FF_ENABLE_DEPRECATION_WARNINGS -#endif switch (s->chroma_format) { case 1: avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; break; diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 2cd0348317..663399a919 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -147,11 +147,6 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, pc->frame_rate = avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_index]; bit_rate = (buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6); avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->ticks_per_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } break; case EXT_START_CODE: @@ -181,11 +176,6 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1); avctx->framerate.den = pc->frame_rate.den * (frame_rate_ext_d + 1); avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->ticks_per_frame = 2; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } break; case 0x8: /* picture coding extension */ diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 5ce4e6e30c..73922879ac 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -284,13 +284,7 @@ void ff_msmpeg4_encode_ext_header(MpegEncContext * s) if (s->avctx->framerate.num > 0 && s->avctx->framerate.den > 0) fps = s->avctx->framerate.num / s->avctx->framerate.den; else { -FF_DISABLE_DEPRECATION_WARNINGS - fps = s->avctx->time_base.den / s->avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - / FFMAX(s->avctx->ticks_per_frame, 1) -#endif - ; -FF_ENABLE_DEPRECATION_WARNINGS + fps = s->avctx->time_base.den / s->avctx->time_base.num; } put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index f9221174f0..85e9261640 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1794,13 +1794,7 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ctx->init_encode_params.frameRateDen = avctx->framerate.den; } else { ctx->init_encode_params.frameRateNum = avctx->time_base.den; -FF_DISABLE_DEPRECATION_WARNINGS - ctx->init_encode_params.frameRateDen = avctx->time_base.num -#if FF_API_TICKS_PER_FRAME - * avctx->ticks_per_frame -#endif - ; -FF_ENABLE_DEPRECATION_WARNINGS + ctx->init_encode_params.frameRateDen = avctx->time_base.num; } #ifdef NVENC_HAVE_UNIDIR_B diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 47da41b0ad..c115d8c18c 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -272,9 +272,6 @@ static const AVOption avcodec_options[] = { {"ch_layout", NULL, OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL }, 0, 0, A|E|D, .unit = "ch_layout"}, {"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E}, {"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E}, -#if FF_API_TICKS_PER_FRAME -{"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D}, -#endif {"color_primaries", "color primaries", OFFSET(color_primaries), AV_OPT_TYPE_INT, {.i64 = AVCOL_PRI_UNSPECIFIED }, 1, INT_MAX, V|E|D, .unit = "color_primaries_type"}, {"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT709 }, INT_MIN, INT_MAX, V|E|D, .unit = "color_primaries_type"}, {"unknown", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, .unit = "color_primaries_type"}, diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index d9df0d62a8..6800f38bf3 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -378,11 +378,6 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->level = src->level; dst->bits_per_raw_sample = src->bits_per_raw_sample; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dst->ticks_per_frame = src->ticks_per_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->color_primaries = src->color_primaries; dst->color_trc = src->color_trc; diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 86ec7a3443..36fac4665d 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -61,13 +61,7 @@ static AVRational get_fpsQ(AVCodecContext *avctx) if (avctx->framerate.num > 0 && avctx->framerate.den > 0) return avctx->framerate; -FF_DISABLE_DEPRECATION_WARNINGS -#if FF_API_TICKS_PER_FRAME - return av_div_q((AVRational){1, FFMAX(avctx->ticks_per_frame, 1)}, avctx->time_base); -#else return av_inv_q(avctx->time_base); -#endif -FF_ENABLE_DEPRECATION_WARNINGS } static double get_fps(AVCodecContext *avctx) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index d263c70be7..f4bcf8bf3c 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -418,14 +418,6 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace, v->tfcntrflag, v->finterpflag); -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - if (v->broadcast) { // Pulldown may be present - v->s.avctx->ticks_per_frame = 2; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - v->psf = get_bits1(gb); if (v->psf) { //PsF, 6.1.13 av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n"); diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 5b30be148c..3cde4cdd8b 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -38,7 +38,6 @@ */ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 62) -#define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 3801ef5d58..f53299cc40 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -797,11 +797,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, : (ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ? (AVRational){0, 1} : ist->time_base); AVRational enc_tb = ist->time_base; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - int ticks_per_frame = dec_ctx ? dec_ctx->ticks_per_frame : 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* * Avi is a special case here because it supports variable fps but @@ -827,9 +822,6 @@ FF_ENABLE_DEPRECATION_WARNINGS (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { enc_tb = dec_ctx_tb; enc_tb.den *= 2; -#if FF_API_TICKS_PER_FRAME - enc_tb.num *= ticks_per_frame; -#endif } } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS) && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,f4v")) { @@ -839,9 +831,6 @@ FF_ENABLE_DEPRECATION_WARNINGS || (copy_tb == AVFMT_TBCF_DECODER && (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { enc_tb = dec_ctx_tb; -#if FF_API_TICKS_PER_FRAME - enc_tb.num *= ticks_per_frame; -#endif } } diff --git a/libavformat/demux.c b/libavformat/demux.c index 0e39346f62..c0bfb9cb67 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1316,12 +1316,6 @@ static int codec_close(FFStream *sti) avctx_new->pkt_timebase = sti->avctx->pkt_timebase; -#if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx_new->ticks_per_frame = sti->avctx->ticks_per_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - avcodec_free_context(&sti->avctx); sti->avctx = avctx_new; -- 2.48.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".