From patchwork Mon Apr 19 14:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp580156iob; Mon, 19 Apr 2021 07:40:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbwbb61jnZHBcOb7KlerfDlAyElqjzIkm3OgRENux7luOo4agAtHfdCJImkTDyLbeFLtOg X-Received: by 2002:a17:906:1101:: with SMTP id h1mr22617361eja.179.1618843229157; Mon, 19 Apr 2021 07:40:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618843229; cv=none; d=google.com; s=arc-20160816; b=vI9JJs2MWlMhWW6Krfcy67PzyLre+V7ZK7honmq+GurdqFn01BmQ0YS5VlDrw9fJio iT0EPM41BaV2paj/rIs93A+ESa5wfvw57JvkucWYtgoJxFlz93KZ60Io3TB5Z0tc3R39 MSmPiob2CW6CgfnsIUJqfjAt9FPz95kj78rUcVSBhmEsQw9gZgOCdQhq2j/ZlfICU2OT 1j+hJq0hkEOXv6ZbesVNNJAxvszNdMz0RArGAga7iSbGxWIPb0f8zs7ZXO5XmFLUXo8D Lm/S9FoGKP6dTfaXkYJyi+yVERfpzfE2n+/j3LryKdflCx1Qj7vQ0u8mJtAPLiJkM21C IU5Q== 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:dkim-signature:delivered-to; bh=wdq/pcrS5j4kir/c+ZABCORiQEnIG5g3V4NFXsTwygA=; b=ivkVUZQK4N1AAJmDu+S33j1XdkQdv+0arImjjIQKlzgHomqvDm1qaCTeHyfcH2vyz3 VxX0Y5ahC+RPcCOaA6IksnPz+hWllV6Q1XX78gSwPOpkbTMYzvxOjBnMTjsoYRbynlMq 0cF0bApRMemU+HDGSwOS/heTUuMo9JpaancTqCyE6cF3GI9JSGnY28DIy88efotLwxFx u1Ks7hIh5FaL9/81swu4LaRRZbm2vSN2SXQn7911QUFnvPItPEboJSAm4E8BVK3OwptV N51MvheS4KbrB+LVM0fVohihtZSJYUZq70ld/+R5y2xNVt920cAtscvid9q+ld0BYqK7 l/6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="pZq//6Nn"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gx23si3791824ejb.463.2021.04.19.07.40.28; Mon, 19 Apr 2021 07:40:29 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="pZq//6Nn"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BD4868A451; Mon, 19 Apr 2021 17:40:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C36C68004F for ; Mon, 19 Apr 2021 17:40:19 +0300 (EEST) Received: by mail-io1-f51.google.com with SMTP id s16so29826013iog.9 for ; Mon, 19 Apr 2021 07:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FJjGslHmc2VPqwxxHKZlheTyV9mZwXpbxNPEE8alwNY=; b=pZq//6Nn7NE9amhw5Hg9JPLalOC0bKsOmR4HgqP8gkii6g0z5GmcrEcNpjYkGZRUc3 EblaHkGH+gYW9sOz2iGfMqnOLD1aAVCBTA8jc/T0Rn7Tm6Qtc1rAHVu6Zatxr2oelVhR sA0ej8Dz9FzrC4rp0PHrmkdxvnyH4TkTMqiO2Zg3JRp8UnzOZ2h3C7yALPsV7lGFAHC9 2oazDaCKGhzAmbbYUb7NtwQDuvTR+34WSIWP51cI0ETgkLSeODpdvxvD8oblOVhyodU5 zapbBXQx7gF4mpv0g6+q9WExTTc+Aitx/nnsVDB/p0QQeMznk1uQq61hmCRpLkn3ZmPI O3ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FJjGslHmc2VPqwxxHKZlheTyV9mZwXpbxNPEE8alwNY=; b=HBtDQwTMoQkGCilrVdJJc//zWfczSPViSlG/wzTirXXgacvzyl3TupwWKWuGGgKQC9 xz6RD6h185bhAhxThei2HxRUJn5VOQmnrTKAQpqTvuwsWVGyPVEArGB2Rc20T+HActWL shIwtJJLLYEIH0pHvPNQvkjbDx/j+U5hULYAw7DChae5njDNZdczOq9gK1jOPGgTaV7v +J3/ayDIwrhce85tIawLZRlFTCDWX4r8lopykme2Lf1FPmlqnD0AjzT5gSwr88qO6dMv MlctU/EC4zrja+DOlsPOEqTmW2QXe5gXCYRCAGHvviXAgEbj92uq10pNmT8ZBszUSONY /aSw== X-Gm-Message-State: AOAM531+bMrsaXW0aOLqm7doxCVCzZQLkCtQTbMu5DGWVvpWle9Q2fXl oMejq64+9iid0F1sZUov5xB8nX/WBAw= X-Received: by 2002:ac8:5913:: with SMTP id 19mr11968754qty.391.1618841471142; Mon, 19 Apr 2021 07:11:11 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:04 -0300 Message-Id: <20210419141024.8174-8-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/87] avcodec: Remove deprecated stat-bits fields 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: tfPzIY0+mKMT From: Andreas Rheinhardt Deprecated in 16216b713f9a21865cc07993961cf5d0ece24916. Signed-off-by: Andreas Rheinhardt --- doc/codecs.texi | 9 --------- libavcodec/avcodec.h | 24 ------------------------ libavcodec/mpegvideo_enc.c | 20 -------------------- libavcodec/options_table.h | 11 ----------- libavcodec/snowenc.c | 8 -------- libavcodec/version.h | 3 --- 6 files changed, 75 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 9add7629cf..4a481dd5bf 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -150,15 +150,6 @@ Set strategy to choose between I/P/B-frames. @item ps @var{integer} (@emph{encoding,video}) Set RTP payload size in bytes. -@item mv_bits @var{integer} -@item header_bits @var{integer} -@item i_tex_bits @var{integer} -@item p_tex_bits @var{integer} -@item i_count @var{integer} -@item p_count @var{integer} -@item skip_count @var{integer} -@item misc_bits @var{integer} -@item frame_bits @var{integer} @item codec_tag @var{integer} @item bug @var{flags} (@emph{decoding,video}) Workaround not auto detected encoder bugs. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 81a18e2cde..ee2350bcb0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1525,30 +1525,6 @@ typedef struct AVCodecContext { /* headers inside the transmitted RTP payload. */ #endif -#if FF_API_STAT_BITS - /* statistics, used for 2-pass encoding */ - attribute_deprecated - int mv_bits; - attribute_deprecated - int header_bits; - attribute_deprecated - int i_tex_bits; - attribute_deprecated - int p_tex_bits; - attribute_deprecated - int i_count; - attribute_deprecated - int p_count; - attribute_deprecated - int skip_count; - attribute_deprecated - int misc_bits; - - /** @deprecated this field is unused */ - attribute_deprecated - int frame_bits; -#endif - /** * pass1 encoding statistics output buffer * - encoding: Set by libavcodec. diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7909a5630a..e1864f2afb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1841,20 +1841,6 @@ vbv_retry: if (ret < 0) return -1; -#if FF_API_STAT_BITS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->header_bits = s->header_bits; - avctx->mv_bits = s->mv_bits; - avctx->misc_bits = s->misc_bits; - avctx->i_tex_bits = s->i_tex_bits; - avctx->p_tex_bits = s->p_tex_bits; - avctx->i_count = s->i_count; - // FIXME f/b_count in avctx - avctx->p_count = s->mb_num - s->i_count - s->skip_count; - avctx->skip_count = s->skip_count; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - frame_end(s); if ((CONFIG_MJPEG_ENCODER || CONFIG_AMV_ENCODER) && s->out_format == FMT_MJPEG) @@ -2006,12 +1992,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif } s->total_bits += s->frame_bits; -#if FF_API_STAT_BITS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_bits = s->frame_bits; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - pkt->pts = s->current_picture.f->pts; if (!s->low_delay && s->pict_type != AV_PICTURE_TYPE_B) { diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 956132437a..b3d8a79f11 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -105,17 +105,6 @@ static const AVOption avcodec_options[] = { {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, {"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif -#if FF_API_STAT_BITS -{"mv_bits", NULL, OFFSET(mv_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"header_bits", NULL, OFFSET(header_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"i_tex_bits", NULL, OFFSET(i_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"p_tex_bits", NULL, OFFSET(p_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"i_count", NULL, OFFSET(i_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"p_count", NULL, OFFSET(p_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"skip_count", NULL, OFFSET(skip_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"misc_bits", NULL, OFFSET(misc_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"frame_bits", NULL, OFFSET(frame_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 16d2b7c302..1c1080ac76 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1890,14 +1890,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if(avctx->flags&AV_CODEC_FLAG_PASS1) ff_write_pass1_stats(&s->m); s->m.last_pict_type = s->m.pict_type; -#if FF_API_STAT_BITS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_bits = s->m.frame_bits; - avctx->mv_bits = s->m.mv_bits; - avctx->misc_bits = s->m.misc_bits; - avctx->p_tex_bits = s->m.p_tex_bits; -FF_ENABLE_DEPRECATION_WARNINGS -#endif emms_c(); diff --git a/libavcodec/version.h b/libavcodec/version.h index 3e8e429153..03aba06056 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -69,9 +69,6 @@ #ifndef FF_API_CODER_TYPE #define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_STAT_BITS -#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_PRIVATE_OPT #define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59) #endif