From patchwork Fri Jan 14 09:00:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp142692iog; Fri, 14 Jan 2022 01:01:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMj4PQNAC2h+q3VmJZsVlCkD77Jmxhse7+bJ2qd2N/oxDl4r+uM9yJ7mmiAUHpgafJNpHu X-Received: by 2002:a17:906:7945:: with SMTP id l5mr6568435ejo.82.1642150884742; Fri, 14 Jan 2022 01:01:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642150884; cv=none; d=google.com; s=arc-20160816; b=qLm8f4UqA6yFUhouZKwhCix+8XJrw2A17LZuNSQzahzY3DK7gyBW4SYLDcgJDlP/Fj jDu8Dk9QZr2NG10f+0AKFWBeHJMBPQQvCWaSxrbQyeSUxOH1/i2cfLSweCfL+bbqvEPV Dq4ch8z3p/EOviJwT/5RHp1SP34XBI5FM++8Fm0OJF7Upa4Q9nx6e7/mz4bOM82uw9EG 5Huv/EAKSPkWc6NX97hcHKC3ztiV+PQJFLpwe9QF5Rv2bhzdQA0/8IxmiO7gYpDGZ9Ke jyyhGlII6fGjHWSd8TBYfFo8lCWm+qUu+y+fl/oM6MyqU8qrrpcbfpN6iKjf5O2NwyAz iIig== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=ilXN0d7PWR/JBp/XdcY2LFvljhdr7kIEHnD29DOsXgY=; b=ABbnxRp+Ng/kRv5g7S/UYRAzB+7cbQL8IGggnWIPqm4IwHfJSCr9SuUpsVtyLPuxmA JczuUjNmH9paaS4REwqzIRNrY2hKPeUC415LJdecFIVFYxUuS8u/0D6iFF9RN28omCGp dQXiLE9L1p9uqVrw4ZtEEeV+43aTlezfFQLncNml8K0f6l2HVJkREw/gLNXSSfk0MxWs k+zpaOeK8eEhCuaDVjTxYTVEAuMorlVt94z/uS0vU0BPMutJB7ovL90vLXdrLJIw+GSD 5aS0sQNDwraBkekPa1yffNS8HfW4C5ypsmrdoo9O+nXIcwslXiWSLf2vqCQyrhbPLU3m 2MIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PewGttrb; 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 rs26si2595387ejb.492.2022.01.14.01.01.23; Fri, 14 Jan 2022 01:01:24 -0800 (PST) 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=20210112 header.b=PewGttrb; 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 B054C68B4B8; Fri, 14 Jan 2022 11:00:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEBA068B47C for ; Fri, 14 Jan 2022 11:00:49 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id w204so2205483pfc.7 for ; Fri, 14 Jan 2022 01:00:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3CJZjYwD8EA1U1o9cbRrj9hJas5EYaJJaiBN4mBbspc=; b=PewGttrbCL9+kbOeGB+bBoB4hUwyTcTuXMDbvV895+tIy5ervkKmr83+pSE0I9x7AK kEKerClREE5KKg4tL3Ko3R9IUvhD+kdUs3frvlaxZpOzhoyNuFvn96c4OXW2zxyGbNz4 c+TSntdLAWEiIia0P6aFFyBVdeKcO/gWiBT8nX4vZTKHRC58VAX3bF98XdjT1u/ZXg01 2HNLJjVYff47tXeQRt/BjQpKSjn+YkUCxy5nk9STVmo3ulCPOn+PYHizSfSQOtJJm+Jn C63p1K8yZk2xI8tZSKMBHP0CqrQmo5owgRKd02YepE6ScF2SOusq279obuel75scrvRX FoYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3CJZjYwD8EA1U1o9cbRrj9hJas5EYaJJaiBN4mBbspc=; b=Lm/AtbfXtVfPYOwLtmIeRSe5oiv8YC8oVoFa/jUXEnW0zVvElncuh3X1C6jeHD+8TH aKLUaANUVBAuACYzhswq224118Xw29eKaR7PD7XePGHJn3HhyWcV5zNq1LtshB/y+HV9 iSxQMpTKGep8g9IUbzgPjc/XRga9DUivST9kfSqRPHVQOcK6U8u4vjT5N6r3t1736bdO QZOArFX1s+NEWJ7dFUpUnuzXQJDTsRn0cn8Ps2drVY2BBRncfbPt3is1imgn2Fs0iZaq 9RBs05BZNmU9XFZE5XXIUT2TBTHhRlzCMN6TWoqmHLl5R/bmUEGjiTg5z/FXLudtk/lW TcFw== X-Gm-Message-State: AOAM530Gu8SF4PEAxei5udaAgS98ViE+YU3eIDKCeCIDImt10UIvRbAW BmwMwYKSa2ZtoPZPTL1MJ/guccR174M= X-Received: by 2002:a05:6a00:10cd:b0:4bc:a950:41e2 with SMTP id d13-20020a056a0010cd00b004bca95041e2mr8174308pfu.30.1642150847900; Fri, 14 Jan 2022 01:00:47 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n15sm10555434pjj.12.2022.01.14.01.00.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 01:00:47 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 17:00:37 +0800 Message-Id: <1642150837-22960-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1642150837-22960-1-git-send-email-lance.lmwang@gmail.com> References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> <1642150837-22960-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec/libopenh264enc: set iEntropyCodingModeFlag by coder option 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6bimn3D4qnx5 From: Limin Wang For high/main profile, user can choose to use cavlc by specify "-coder cavlc", for default, it'll will use cabac, if it's baseline, we'll use cavlc by specs anyway. ffmpeg -y -f lavfi -i testsrc -c:v libopenh264 -profile:v main -coder cavlc -frames:v 1 -bsf trace_headers -f null - before the patch: entropy_coding_mode_flag 0 = 1 after the patch: entropy_coding_mode_flag 0 = 0 Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 8e27edb..4c0997b 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -193,7 +193,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) #endif param.bPrefixNalAddingCtrl = 0; param.iLoopFilterDisableIdc = !s->loopfilter; - param.iEntropyCodingModeFlag = 0; + param.iEntropyCodingModeFlag = s->coder >= 0 ? s->coder : 1; param.iMultipleThreadIdc = avctx->thread_count; /* Allow specifying the libopenh264 profile through AVCodecContext. */ @@ -221,14 +221,14 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) switch (s->profile) { case FF_PROFILE_H264_HIGH: - param.iEntropyCodingModeFlag = 1; - av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " - "select EProfileIdc PRO_HIGH in libopenh264.\n"); + av_log(avctx, AV_LOG_VERBOSE, "Using %s, " + "select EProfileIdc PRO_HIGH in libopenh264.\n", + param.iEntropyCodingModeFlag ? "CABAC" : "CAVLC"); break; case FF_PROFILE_H264_MAIN: - param.iEntropyCodingModeFlag = 1; - av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " - "select EProfileIdc PRO_MAIN in libopenh264.\n"); + av_log(avctx, AV_LOG_VERBOSE, "Using %s, " + "select EProfileIdc PRO_MAIN in libopenh264.\n", + param.iEntropyCodingModeFlag ? "CABAC" : "CAVLC"); break; case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_UNKNOWN: