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 540F14D70E for ; Sun, 23 Feb 2025 22:07:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47EC768CA9D; Mon, 24 Feb 2025 00:06:55 +0200 (EET) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 657BB68CA55 for ; Mon, 24 Feb 2025 00:06:47 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2fa48404207so7766864a91.1 for ; Sun, 23 Feb 2025 14:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740348405; x=1740953205; 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=jpQ3gAepiySqUWruRhDfQnExObJ3zc74O8ggVz2IQ+k=; b=jwuw4MUEnzjm72//ouJQsA5oZPPsBbsa23WfeWSWpNcp5HJJ/LHonKMByAbmeuApxv xyRZ4pHFvbpolKUn1nxxFHC4gXL0htfFi55ef53NZo55UuPMKOsRJG/xiEspS2n2rXBt 2TzYpVs6aQOh4kb9KQyULeZxD40foFM+m6cYnsv+DvfCSHwuT+P4O1ktmWSAYQh76tWZ hA4ujRkUHleDJKtS1kaZT2DBwZvV2yr2Ryl71rL2LJXUnBF7Hyveo6IukgWgD0nYQykk giveqkZ8QizlCeUIk2YAYKsa4xhfoV1hG8a5++5CBpEvHfvBcFpjzoQHsaTnG+zcFgRj 4wMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740348405; x=1740953205; 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=jpQ3gAepiySqUWruRhDfQnExObJ3zc74O8ggVz2IQ+k=; b=HG8QuKlPONCs8qlQYnR9lHj0BgxiE2HlNblJPiLzxWjSmCe2m4WAWeV7ZtfnvuthAk V6H+V1p9ueKMpEm9LeHPrpWa+/UFtjAVEjJh4WO+ihk9xi+FrZoX/BLDQ8zYtYCTPeW1 63Ua0NfCgY23Ib6osqSC2PPD0ulPP6qfEq6MkrIzdSjGVpJsO9VOHtC4oLB9c5u2HqaX 7BjGaUfjPErhjU4x9Q+M6GiRGo2S+epZ/pDXLbnyGA7BXGNi3QLljQfVWB+kSHhMJXJj 4hpa37Z+oFSI2QsSdIYfUK+jp3tTs3m+jQ6RA0kTXsidXJYLVfDVIt0Om4KX8sTg9/4a rh9A== X-Gm-Message-State: AOJu0YynG97wFiFteby69Mm28u4qmlwI0azBHqiSfePQ5B8+7gHjNWYY Si6ZuP2N8bao+xZrpJUWEflsddyZY+rWEDH7wFwJAqlP+9RKkt70+UgJ1Xam X-Gm-Gg: ASbGncu8Ln8EuzOl97tYtYpYC8eWP2PTRSgJqdZhgj/Z75O966ZXu9gzMEjRTvnPTJk 6P4yg0Thhv8B01AggWT5+l1ZLwsMEZVEUQbo+alXM4XoU4Rm3qryQELLQqaOVxsI+swJlrposTh 7GlhJsITpGwXS2lq8SWN0SSOLVw1PJxwPq0iVRuf63+/XC04kV8PGABlBfNOCy9XE256cqwpKGe SXsOviUr8LPV553n6KyBeLsv7K/1Y5gwFp+n5XZLNHfG6ROSB8+cBqyMaudd9T1qtB/WtAlIAYU c57m6lYtQOig4TIkZPRkRawMAePzvJZrq1ObsTieng== X-Google-Smtp-Source: AGHT+IEy6lB4a3KvdudXqUCmumwunh7cRqI95+cMJ9pZiVmKcTH2vbBJ2LpKiiChVWxK3+4yoA3WOw== X-Received: by 2002:a17:90b:3806:b0:2fa:ba3:5457 with SMTP id 98e67ed59e1d1-2fce78c808cmr21826274a91.17.1740348404819; Sun, 23 Feb 2025 14:06:44 -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.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 14:06:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2025 19:06:03 -0300 Message-ID: <20250223220630.18756-4-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 03/30] avcodec: remove deprecated FF_API_DROPCHANGED 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-07-15. Signed-off-by: James Almer --- libavcodec/avcodec.c | 4 --- libavcodec/avcodec.h | 9 ------- libavcodec/decode.c | 52 -------------------------------------- libavcodec/internal.h | 9 ------- libavcodec/options_table.h | 3 --- libavcodec/version_major.h | 1 - 6 files changed, 78 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index e7e2c09222..3f97f5d161 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -462,10 +462,6 @@ av_cold void ff_codec_close(AVCodecContext *avctx) av_bsf_free(&avci->bsf); -#if FF_API_DROPCHANGED - av_channel_layout_uninit(&avci->initial_ch_layout); -#endif - #if CONFIG_LCMS2 ff_icc_context_uninit(&avci->icc); #endif diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f6de3c6b42..c35e65868e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -234,15 +234,6 @@ typedef struct RcOverride{ * Use qpel MC. */ #define AV_CODEC_FLAG_QPEL (1 << 4) -#if FF_API_DROPCHANGED -/** - * Don't output frames whose parameters differ from first - * decoded frame in stream. - * - * @deprecated callers should implement this functionality in their own code - */ -#define AV_CODEC_FLAG_DROPCHANGED (1 << 5) -#endif /** * Request the encoder to output reconstructed frames, i.e.\ frames that would * be produced by decoding the encoded bistream. These frames may be retrieved diff --git a/libavcodec/decode.c b/libavcodec/decode.c index cac7e620d2..a28279bd36 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -840,53 +840,6 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) avctx->frame_num++; -#if FF_API_DROPCHANGED - if (avctx->flags & AV_CODEC_FLAG_DROPCHANGED) { - - if (avctx->frame_num == 1) { - avci->initial_format = frame->format; - switch(avctx->codec_type) { - case AVMEDIA_TYPE_VIDEO: - avci->initial_width = frame->width; - avci->initial_height = frame->height; - break; - case AVMEDIA_TYPE_AUDIO: - avci->initial_sample_rate = frame->sample_rate ? frame->sample_rate : - avctx->sample_rate; - ret = av_channel_layout_copy(&avci->initial_ch_layout, &frame->ch_layout); - if (ret < 0) - goto fail; - break; - } - } - - if (avctx->frame_num > 1) { - int changed = avci->initial_format != frame->format; - - switch(avctx->codec_type) { - case AVMEDIA_TYPE_VIDEO: - changed |= avci->initial_width != frame->width || - avci->initial_height != frame->height; - break; - case AVMEDIA_TYPE_AUDIO: - changed |= avci->initial_sample_rate != frame->sample_rate || - avci->initial_sample_rate != avctx->sample_rate || - av_channel_layout_compare(&avci->initial_ch_layout, &frame->ch_layout); - break; - } - - if (changed) { - avci->changed_frames_dropped++; - av_log(avctx, AV_LOG_INFO, "dropped changed frame #%"PRId64" pts %"PRId64 - " drop count: %d \n", - avctx->frame_num, frame->pts, - avci->changed_frames_dropped); - ret = AVERROR_INPUT_CHANGED; - goto fail; - } - } - } -#endif return 0; fail: av_frame_unref(frame); @@ -2065,11 +2018,6 @@ int ff_decode_preinit(AVCodecContext *avctx) return ret; } -#if FF_API_DROPCHANGED - if (avctx->flags & AV_CODEC_FLAG_DROPCHANGED) - av_log(avctx, AV_LOG_WARNING, "The dropchanged flag is deprecated.\n"); -#endif - return 0; } diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 62a37f473f..137fd52745 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -145,15 +145,6 @@ typedef struct AVCodecInternal { AVFrame *buffer_frame; int draining_done; -#if FF_API_DROPCHANGED - /* used when avctx flag AV_CODEC_FLAG_DROPCHANGED is set */ - int changed_frames_dropped; - int initial_format; - int initial_width, initial_height; - int initial_sample_rate; - AVChannelLayout initial_ch_layout; -#endif - #if CONFIG_LCMS2 FFIccContext icc; /* used to read and write embedded ICC profiles */ #endif diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index c115d8c18c..1711e56cd3 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -74,9 +74,6 @@ static const AVOption avcodec_options[] = { {"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, .unit = "flags"}, {"cgop", "closed GOP", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, .unit = "flags"}, {"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, .unit = "flags"}, -#if FF_API_DROPCHANGED -{"drop_changed", "Drop frames whose parameters differ from first decoded frame", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_DROPCHANGED }, INT_MIN, INT_MAX, A|V|D | AV_OPT_FLAG_DEPRECATED, .unit = "flags"}, -#endif {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D|S, .unit = "flags2"}, {"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, .unit = "flags2"}, {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, .unit = "flags2"}, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 3cde4cdd8b..ee3277cb76 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_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_FF_PROFILE_LEVEL (LIBAVCODEC_VERSION_MAJOR < 62) -- 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".