From patchwork Tue May 1 19:00:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 8712 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4878161jad; Tue, 1 May 2018 12:09:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZprnYWwGhYNC/HG+/+r4ZYVHEFEPvnUTa1ugxfGLZLU1xQL8p7+TnZraoIEQfoRrBiJ0f7b X-Received: by 10.28.172.138 with SMTP id v132mr4339425wme.105.1525201763538; Tue, 01 May 2018 12:09:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525201763; cv=none; d=google.com; s=arc-20160816; b=LcB9iRMjAlplxXL4D1gJn3iEU8//Qv5+iO/mSpQiCoyhsPz430FIurKTx5qSdDMzY1 EtA56EUYV47bRHLyCPQXvVOc6v+AFc9ZTRA/HWh3vriCAbjYqHAehAYTy1nayyHhRmDk n7JUgj2t7cFTD3f1rJv75yZV8XEASp+ko/b20oB0M6fmpO1LtSHfidg5jMrMKdtqOB+F rqZNaodb6r5qYqSp1jYPEcMJMfFoST8/5CjFZ2CTE9ev+XXC0dePxzrLtGXxaCgMoxwz 66iXlCOvOGRrXcwm1+43i/5kHNE315StW1lCTEE88BLsg9/AwzJUFSPoonL/OIWKObLr i/qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=AkZryMGBxD/zM8eR6W+V1E17uhufnBHLJWVNT+EAO6o=; b=r/UgDGNhyp392c/6O7tWMDewnplcpMxKa1tIjEIt0usm7d3lgt4DaCjpLilWA5bWdN Gy4hvUMu4iEMphOlge0SU6Buggikcj5sgUxb4M44Z8xjUH+QFLL7CRAJ/43GgU0h2tXp 6QKXnseXRuYZfZwl83CD1YOMAgN0+FGch27VuwtFnYuojMld3pTCCpfUg7w5ftMasOhF s1m57HsH1tG250HSHMNJsceDBBpr+I0hAS0e57YDKFe1PPPH4hz8Asu/iJqkWOOhCJMc rddjHxiM4sRduLa/peXBRpUTbwCnWP/b/11zMrY3uDc97AeNdZBEOPepof4nNEZ0KUJ0 8MQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Q2UEoq49; 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 y145si7254764wmc.152.2018.05.01.12.09.22; Tue, 01 May 2018 12:09:23 -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=Q2UEoq49; 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 2219968A2C7; Tue, 1 May 2018 22:08:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACCC268A1BC for ; Tue, 1 May 2018 22:08:45 +0300 (EEST) Received: by mail-wm0-f45.google.com with SMTP id n10so20380450wmc.1 for ; Tue, 01 May 2018 12:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=jMx1xqO0ZKmQzlpokbUQMs/oTiiZ913uOjDdd6Q4ad4=; b=Q2UEoq49CoMl0R/LaurgUAnF+bilqGJOcjRWdjvaAw2yz9CpImjKkOxEwQ8vQsh4uh eaGpKPMCaLqrIGlx46aC52pd4g/1lLrNsfzsMoZfN1uebWYt/0hoEUx/JoblMbjskZZN eUQk/pdwBagZ1HUJaComIm5laTSKlfRZEwfYZmSad74DJiXObLJuEQGivGClS5bY5dkY KGAs+z4mGtf1ggW37Ok7eRZWaKTzYY16TuLCo8YitaXNTzu3owP7Z3mie9+AW6aHtdU9 wor4EqKfvKKh8BupgutiQNo/8UvKxB9NKbEvBSXvARL5sDLGkb7JGXNmTIz9MIM1zBXk X3tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jMx1xqO0ZKmQzlpokbUQMs/oTiiZ913uOjDdd6Q4ad4=; b=IH7NwEwthcjYhZna7u64X5ViKfRoI23FNfVvuqRI7rIe9TaSz3RADFWUXW+a+41k9S KCk9oWcSk6xLRG2T948hooaaGlQ7paLPgZBFr0BTXxUT0c21gZevrKAZa6tWrZkIRLEi rmMEicvttr3i0SwA9qsG4UzJvN5VbowH1IVDjAYsEPgsDYdH5FQ7i/6E7BE2GH0DXagh q3MgUFwl0vLcAw7DjdiN7WuSGV3+Rf38Q8GOycKyGYTmBPAxpUuh5bsvPDGS8cBiTI9y 2zUMwja2zZuf9uB2ElN94JpwmAEgNIB98PBy/p4hzJHN5dWDdVGLgA+5eo3sU6mIYhqx d8jA== X-Gm-Message-State: ALQs6tB7O78FdKguQN1O4OxPo0EtYaH8ndpFH1lofzW4u8wmRs3RF5HC 0gyjBALHjoIl6pNLSQ7PeDNlhELD X-Received: by 10.28.211.78 with SMTP id k75mr4638352wmg.29.1525201307525; Tue, 01 May 2018 12:01:47 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c8c:8e00:317f:4d59:d4ab:d4a5]) by smtp.gmail.com with ESMTPSA id u20-v6sm15709902wru.33.2018.05.01.12.01.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:01:46 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 20:00:43 +0100 Message-Id: <20180501190043.2313-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] mpegvideo: remove support for libxvid's RC system X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Its a reminder of a bygone era. Less flexible than the internal RC system, probably worse and most definitely broken. Drop it. No one ever used it either, except for mislead people. --- MAINTAINERS | 1 - libavcodec/Makefile | 2 +- libavcodec/libxvid_rc.c | 164 ------------------------------------- libavcodec/mpegvideo.h | 14 +--- libavcodec/mpegvideo_enc.c | 24 +----- 5 files changed, 6 insertions(+), 199 deletions(-) delete mode 100644 libavcodec/libxvid_rc.c diff --git a/MAINTAINERS b/MAINTAINERS index b61856243c..ca3f4e5a2f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -121,7 +121,6 @@ Generic Parts: motion* Michael Niedermayer rate control: ratecontrol.c Michael Niedermayer - libxvid_rc.c Michael Niedermayer simple IDCT: simple_idct.c, simple_idct.h Michael Niedermayer postprocessing: diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d727b218dc..4b55875964 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -984,7 +984,7 @@ OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o -OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o libxvid_rc.o +OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o # parsers diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c deleted file mode 100644 index 076c32c413..0000000000 --- a/libavcodec/libxvid_rc.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Xvid rate control wrapper for lavc video encoders - * - * Copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" - -#if HAVE_IO_H -#include -#endif - -#if HAVE_UNISTD_H -#include -#endif - -#include - -#include "libavutil/attributes.h" -#include "libavutil/internal.h" - -#include "avcodec.h" -#include "libxvid.h" -#include "mpegvideo.h" - -av_cold int ff_xvid_rate_control_init(MpegEncContext *s) -{ - char *tmp_name; - int fd, i; - xvid_plg_create_t xvid_plg_create = { 0 }; - xvid_plugin_2pass2_t xvid_2pass2 = { 0 }; - - fd = avpriv_tempfile("xvidrc.", &tmp_name, 0, s->avctx); - if (fd < 0) { - av_log(s, AV_LOG_ERROR, "Can't create temporary pass2 file.\n"); - return fd; - } - - for (i = 0; i < s->rc_context.num_entries; i++) { - static const char frame_types[] = " ipbs"; - char tmp[256]; - RateControlEntry *rce; - - rce = &s->rc_context.entry[i]; - - snprintf(tmp, sizeof(tmp), "%c %d %d %d %d %d %d\n", - frame_types[rce->pict_type], - (int) lrintf(rce->qscale / FF_QP2LAMBDA), - rce->i_count, s->mb_num - rce->i_count - rce->skip_count, - rce->skip_count, - (rce->i_tex_bits + rce->p_tex_bits + rce->misc_bits + 7) / 8, - (rce->header_bits + rce->mv_bits + 7) / 8); - - if (write(fd, tmp, strlen(tmp)) < 0) { - int ret = AVERROR(errno); - av_log(s, AV_LOG_ERROR, "Error %s writing 2pass logfile\n", av_err2str(ret)); - av_free(tmp_name); - close(fd); - return ret; - } - } - - close(fd); - - xvid_2pass2.version = XVID_MAKE_VERSION(1, 1, 0); - xvid_2pass2.filename = tmp_name; - xvid_2pass2.bitrate = s->avctx->bit_rate; - xvid_2pass2.vbv_size = s->avctx->rc_buffer_size; - xvid_2pass2.vbv_maxrate = s->avctx->rc_max_rate; - xvid_2pass2.vbv_initial = s->avctx->rc_initial_buffer_occupancy; - - xvid_plg_create.version = XVID_MAKE_VERSION(1, 1, 0); - xvid_plg_create.fbase = s->avctx->time_base.den; - xvid_plg_create.fincr = s->avctx->time_base.num; - xvid_plg_create.param = &xvid_2pass2; - - if (xvid_plugin_2pass2(NULL, XVID_PLG_CREATE, &xvid_plg_create, - &s->rc_context.non_lavc_opaque) < 0) { - av_log(s, AV_LOG_ERROR, "xvid_plugin_2pass2 failed\n"); - return -1; - } - return 0; -} - -float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run) -{ - xvid_plg_data_t xvid_plg_data = { 0 }; - - xvid_plg_data.version = XVID_MAKE_VERSION(1, 1, 0); - xvid_plg_data.width = s->width; - xvid_plg_data.height = s->height; - xvid_plg_data.mb_width = s->mb_width; - xvid_plg_data.mb_height = s->mb_height; - xvid_plg_data.fbase = s->avctx->time_base.den; - xvid_plg_data.fincr = s->avctx->time_base.num; - xvid_plg_data.min_quant[0] = s->avctx->qmin; - xvid_plg_data.min_quant[1] = s->avctx->qmin; - xvid_plg_data.min_quant[2] = s->avctx->qmin; // FIXME i/b factor & offset - xvid_plg_data.max_quant[0] = s->avctx->qmax; - xvid_plg_data.max_quant[1] = s->avctx->qmax; - xvid_plg_data.max_quant[2] = s->avctx->qmax; // FIXME i/b factor & offset - xvid_plg_data.bquant_offset = 0; // 100 * s->avctx->b_quant_offset; - xvid_plg_data.bquant_ratio = 100; // * s->avctx->b_quant_factor; - - if (!s->rc_context.dry_run_qscale) { - if (s->picture_number) { - xvid_plg_data.length = - xvid_plg_data.stats.length = (s->frame_bits + 7) / 8; - xvid_plg_data.frame_num = s->rc_context.last_picture_number; - xvid_plg_data.quant = s->qscale; - xvid_plg_data.type = s->last_pict_type; - if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, - XVID_PLG_AFTER, &xvid_plg_data, NULL)) { - av_log(s, AV_LOG_ERROR, - "xvid_plugin_2pass2(handle, XVID_PLG_AFTER, ...) FAILED\n"); - return -1; - } - } - s->rc_context.last_picture_number = - xvid_plg_data.frame_num = s->picture_number; - xvid_plg_data.quant = 0; - if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, - XVID_PLG_BEFORE, &xvid_plg_data, NULL)) { - av_log(s, AV_LOG_ERROR, - "xvid_plugin_2pass2(handle, XVID_PLG_BEFORE, ...) FAILED\n"); - return -1; - } - s->rc_context.dry_run_qscale = xvid_plg_data.quant; - } - xvid_plg_data.quant = s->rc_context.dry_run_qscale; - if (!dry_run) - s->rc_context.dry_run_qscale = 0; - - // FIXME this is not exactly identical to Xvid - if (s->pict_type == AV_PICTURE_TYPE_B) - return xvid_plg_data.quant * FF_QP2LAMBDA * s->avctx->b_quant_factor + - s->avctx->b_quant_offset; - else - return xvid_plg_data.quant * FF_QP2LAMBDA; -} - -av_cold void ff_xvid_rate_control_uninit(MpegEncContext *s) -{ - xvid_plg_destroy_t xvid_plg_destroy; - - xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, XVID_PLG_DESTROY, - &xvid_plg_destroy, NULL); -} diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 541909cbb1..8a5296e493 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -369,7 +369,7 @@ typedef struct MpegEncContext { uint8_t *mb_info_ptr; int mb_info_size; int ehc_mode; - int rc_strategy; + int rc_strategy; ///< deprecated /* H.263+ specific */ int umvplus; ///< == H.263+ && unrestricted_mv @@ -587,12 +587,6 @@ typedef struct MpegEncContext { #define FF_MPV_FLAG_NAQ 0x0010 #define FF_MPV_FLAG_MV0 0x0020 -enum rc_strategy { - MPV_RC_STRATEGY_FFMPEG, - MPV_RC_STRATEGY_XVID, - NB_MPV_RC_STRATEGY -}; - #define FF_MPV_OPT_CMP_FUNC \ { "sad", "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \ { "sse", "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \ @@ -646,9 +640,9 @@ FF_MPV_OPT_CMP_FUNC, \ {"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"ibias", "intra quant bias", FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"pbias", "inter quant bias", FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = MPV_RC_STRATEGY_FFMPEG }, 0, NB_MPV_RC_STRATEGY-1, FF_MPV_OPT_FLAGS, "rc_strategy" }, \ - { "ffmpeg", "default native rate control", 0, AV_OPT_TYPE_CONST, { .i64 = MPV_RC_STRATEGY_FFMPEG }, 0, 0, FF_MPV_OPT_FLAGS, "rc_strategy" }, \ - { "xvid", "libxvid (2 pass only)", 0, AV_OPT_TYPE_CONST, { .i64 = MPV_RC_STRATEGY_XVID }, 0, 0, FF_MPV_OPT_FLAGS, "rc_strategy" }, \ +{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS, "rc_strategy" }, \ + { "ffmpeg", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS, "rc_strategy" }, \ + { "xvid", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS, "rc_strategy" }, \ {"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 979e138b88..9fdab31a25 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1024,18 +1024,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ff_rate_control_init(s) < 0) return -1; - if ((s->avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == MPV_RC_STRATEGY_XVID) { -#if CONFIG_LIBXVID - ret = ff_xvid_rate_control_init(s); -#else - ret = AVERROR(ENOSYS); - av_log(s->avctx, AV_LOG_ERROR, - "Xvid ratecontrol requires libavcodec compiled with Xvid support.\n"); -#endif - if (ret < 0) - return ret; - } - #if FF_API_PRIVATE_OPT FF_DISABLE_DEPRECATION_WARNINGS if (avctx->brd_scale) @@ -1082,10 +1070,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) int i; ff_rate_control_uninit(s); -#if CONFIG_LIBXVID - if ((avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == MPV_RC_STRATEGY_XVID) - ff_xvid_rate_control_uninit(s); -#endif ff_mpv_common_end(s); if (CONFIG_MJPEG_ENCODER && @@ -3620,13 +3604,7 @@ static int estimate_qp(MpegEncContext *s, int dry_run){ s->current_picture.f->quality = s->next_lambda; if(!dry_run) s->next_lambda= 0; } else if (!s->fixed_qscale) { - int quality; -#if CONFIG_LIBXVID - if ((s->avctx->flags & AV_CODEC_FLAG_PASS2) && s->rc_strategy == MPV_RC_STRATEGY_XVID) - quality = ff_xvid_rate_estimate_qscale(s, dry_run); - else -#endif - quality = ff_rate_estimate_qscale(s, dry_run); + int quality = ff_rate_estimate_qscale(s, dry_run); s->current_picture_ptr->f->quality = s->current_picture.f->quality = quality; if (s->current_picture.f->quality < 0)