From patchwork Fri Apr 3 15:15:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 18600 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:ab15:0:0:0:0:0 with SMTP id h21csp1051294qvb; Fri, 3 Apr 2020 08:22:03 -0700 (PDT) X-Google-Smtp-Source: APiQypKBuJUkcO/y7gKI+n7+T363WQcMv0lRPB5ew7mGFDsRNgHASLX8rjvxHmBmLfv+IBMBdbdD X-Received: by 2002:a17:906:1959:: with SMTP id b25mr9219778eje.220.1585927323666; Fri, 03 Apr 2020 08:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585927323; cv=none; d=google.com; s=arc-20160816; b=IeTqg3PcYcn0e3NnMcp2zCowNSfjsmhA03iyBuDskKylUHcj9z3yGpvjWgkZTzbQTM wd3V8vR+ZSrXUo2fHoVP9DXtwEwYXlnMq4XsfizJxCdZHhTtYXrNsUriEykBQ0H/jyMi UXxgAwO90yst1C04jN2G5fpL2Jbv9wOiHSV3HTjWLtk8DkkkG+Y6dviIkn4AFHZ3E3to r/D2I/me2uK3zLHyXWoQlG+9x/6IHRasxifTBRrOUlAezKU3Lx4bPbxEIxTj0dqC6Hap fPtO7woT2Ncg/pFqzYK4YBX0Il6OpUDHbxjzaZEO7nxX0FbyGJGICDiLQauWuxIVUZOM KvhA== 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:ironport-sdr :ironport-sdr:delivered-to; bh=kBWMABc1Zj+XUcrRXXhZDwmAwoMOSCjNf6481gnY+fM=; b=Qxs6YkDDBK7GT73V0DGWqkyZqAByN/wEicKdVJZotOgtlCm/rTCUFia7QaYGTFruAA LFtGrF3VN7c42WVC7i8RbkLIpLiWcG6k1DZZeJUpg5kCk6/1o0CpVOUZgNZEluf6v8W2 YbBb33OPT3frFrNaow75Dm55iGeQ6oI+iaJWI18Ch+Vl/l6Nr0AzFZ9VizOMJFixn/MJ BK5knl84V6lr9DWc79AOTZxT/+rAwbTTqprMgLzGYTU35tNE+vs/3JHBtnPZmTo9Z43s GxpPK+K6FsgXBdj2kHHtIeckwd2FKJKDFGERRQT2POP7yA7uo2z/ldvTEbdxLuncjQK0 GPGQ== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t20si5712691edi.362.2020.04.03.08.22.03; Fri, 03 Apr 2020 08:22:03 -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; 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=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6311468AFE6; Fri, 3 Apr 2020 18:22:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A29168AF97 for ; Fri, 3 Apr 2020 18:22:00 +0300 (EEST) IronPort-SDR: MUOQOchzYtURNUXugr8cNqiEhOawGmONIuM9hLUUNqpU6lvsesGLcJAN1ypARHWlL68Iyc6XcL 6aBlImyOOWgA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2020 08:21:58 -0700 IronPort-SDR: ZOJMhD2bwo80H5V8jd8z0iTw6uUEq9nl47KPJ73/50wnZc7gixDK1tQfUaLDqMl5gutrCqEZJQ YKb2FjWy/nyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,340,1580803200"; d="scan'208";a="273984778" Received: from unknown (HELO icl-dev.sh.intel.com) ([10.239.158.73]) by fmsmga004.fm.intel.com with ESMTP; 03 Apr 2020 08:21:57 -0700 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Apr 2020 23:15:32 +0800 Message-Id: <1585926932-23744-1-git-send-email-linjie.fu@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 10/10] lavc/libopenh264enc: replace cabac option with coder 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: Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JphMfZiGOAG4 Content-Length: 4462 Change the default option to -1 and allow the default cabac to be decided by profile. Signed-off-by: Linjie Fu --- libavcodec/libopenh264enc.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 70ded55..94faeef 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -46,7 +46,7 @@ typedef struct SVCContext { int max_nal_size; int skip_frames; int skipped; - int cabac; + int coder; // rate control mode int rc_mode; @@ -78,7 +78,12 @@ static const AVOption options[] = { #undef PROFILE { "max_nal_size", "set maximum NAL size in bytes", OFFSET(max_nal_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "allow_skip_frames", "allow skipping frames to hit the target bitrate", OFFSET(skip_frames), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, - { "cabac", "Enable cabac", OFFSET(cabac), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "coder", "Coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "coder" }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, INT_MIN, INT_MAX, VE, "coder" }, + { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "coder" }, + { "cabac", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "coder" }, + { "vlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "coder" }, + { "ac", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "coder" }, { "rc_mode", "Select rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = RC_QUALITY_MODE }, RC_OFF_MODE, RC_TIMESTAMP_MODE, VE, "rc_mode" }, { "off", "bit rate control off", 0, AV_OPT_TYPE_CONST, { .i64 = RC_OFF_MODE }, 0, 0, VE, "rc_mode" }, @@ -127,8 +132,15 @@ static av_cold int svc_encode_init_profile(AVCodecContext *avctx, SEncParamExt * break; } - if (s->profile == FF_PROFILE_UNKNOWN) - s->profile = s->cabac ? FF_PROFILE_H264_HIGH : +#if FF_API_CODER_TYPE +FF_DISABLE_DEPRECATION_WARNINGS + if (s->coder < 0 && avctx->coder_type == FF_CODER_TYPE_AC) + s->coder = 1; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + if (s->profile == FF_PROFILE_UNKNOWN && s->coder >= 0) + s->profile = s->coder ? FF_PROFILE_H264_HIGH : FF_PROFILE_H264_CONSTRAINED_BASELINE; switch (s->profile) { @@ -348,13 +360,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) (*s->encoder)->GetDefaultParams(s->encoder, ¶m); -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (!s->cabac) - s->cabac = avctx->coder_type == FF_CODER_TYPE_AC; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (err = svc_encode_init_params(avctx, ¶m) < 0) return err;