From patchwork Thu Jan 13 10:45:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp335339iog; Thu, 13 Jan 2022 02:45:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7v06FJJtQKUDWeZ0lnpuUbb3DOxcN7/1IUlEGFrDnmGAnyy8Tax/IdBAiDlk1XAYr+31W X-Received: by 2002:a17:907:1709:: with SMTP id le9mr2952026ejc.449.1642070755733; Thu, 13 Jan 2022 02:45:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642070755; cv=none; d=google.com; s=arc-20160816; b=dV/YjgTnSD+wbiCNtcUi/hKwu3RyP7dnx/3ucmbt+k7KxEjTaUHpnI9KE2bLuTNzA7 c6X9JnS5PJRN6+XGjpwXGXGMPUO/OmbbcupAj43lv/P2/7yzHj5joy3yCDER/LA5Nwpe 3TR4xWc9eTGqxrR+PA7NriMMxulqOa+Z4iA65OuWxZMTpMFg2bWfC33RpgEvFzmuiYvq 3O3OpgvlTEnEw6K92B9zH05HEV17sisJdRiCDdtuvn3tBGJb7AEJXvB72Gr4hwzRYy+L Zs43Oso3VXATdCPKPfPCkVI2AUoUdcgVu0Z37UgseCQWDaCyVUHOKAWbRp/jCRqhXL/C Myow== 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=s6e24RLAZDQK1Vpvq/RFuymu6Ppc7fGXS22ESagAPhs=; b=KI+wmtysIpYKJjFQTD3V/exZlu5/dBloX1qs8ycuFVmBDV4KRbfp2lo7w0gbHWoN3E F7lK+WwF2On/svJilgYhweY3aAjZ38jG38tADf0llbyKsu6KoQ5Wg1YFDm5QYQxMIvmb qHbgI0tx4ss/6XWhRLhX1UTyzUu+4AnfVLO7mjzRJ0ATmQz8x2N+lbNNoQ+z+Qp3VEQi JOEOvzpIlkvrD6ygUkUdbU/SEV+EXjQqCAwfN1seNMupulmQTc3EAFg0cnHhpKqnlX40 5qGle/c3psB3tIfjLCaxz7/JOcOkLY5cwdv5uHMpClsOLnyuRaquRQGEMK6EP1kb+ghJ kntA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gCIy5zzv; 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 dp14si1413970ejc.237.2022.01.13.02.45.54; Thu, 13 Jan 2022 02:45:55 -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=gCIy5zzv; 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 B238368B750; Thu, 13 Jan 2022 12:45:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84DF768B75E for ; Thu, 13 Jan 2022 12:45:21 +0200 (EET) Received: by mail-pj1-f52.google.com with SMTP id c14-20020a17090a674e00b001b31e16749cso18249185pjm.4 for ; Thu, 13 Jan 2022 02:45:21 -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=94harNBleYoOTSfFkgC8VzWfnoWd+QArYTA03vuSCWQ=; b=gCIy5zzvxmqiRn+JpoWLoZRidv+Lz+fFmX+GtgLbqyBUOVxVB4C7cT/HtEVD3Cg0/z bit2+MGmp4yZY8MAUecDtbRvFUrtRZ2RnOm3Xg+fsg6TcLMFnVhuOjhLAlBpgcqDuDtW 6h1e1bW/ouyBrn5D6bee3W9k5vf1R1Hiyj+hXvqP1h378vum69kAakX9O2zeo0pUVJnQ +UtoWQ0kndmB85iwvhO7CWyj4AhcY5OIyFUQ72YUYmHSvK9PqmtrkdRfPQ5awKHyaYlc DG7pokWjhfbXKyc3jpul39j/qdACy90LmUXnF0tca88swGOLnwB29VyYDiE7TBIUAqnV wDvg== 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=94harNBleYoOTSfFkgC8VzWfnoWd+QArYTA03vuSCWQ=; b=XfXxiMwt5/6Oi+HstYcPGmADnfza7T3ZwMS+GIC67uL2nIbdDxhm7oNWJUG3wId/4Y wmZD0sdbKyl0P2aDapzSjTiGSsGUWuIgNvWk1Ba8HL4r1ajhf6ZSK6xw47Qt02EKBkVZ ZD78GdxaElb79B/Jp26o2MbeYO6gT+/OhBqQzFET3oPoXv2VjnPy/l9/NAA5t4NCCtN3 mIVrvnWBzt63UwpipHmpXHImKJ0mDTQBhktjWR+3WErW1Ei6piKe6gwAGKcksB2zwPh1 0l71nGIpqdXk9korNJ4Wmg7GTvuDa1oSG/ofDHzWKmIb37E+JJ8SxPa1fHUANwlQclLR VvPg== X-Gm-Message-State: AOAM530uzI/9wARPOX7Ak3GG2/oqURaJFMmz8C8/x5jMX4fv3pnGlfv1 Ke+QVe+zkVUuq1DwJ0+hb6NjEsN/0S/3hg== X-Received: by 2002:a17:90a:3d06:: with SMTP id h6mr4370042pjc.67.1642070719859; Thu, 13 Jan 2022 02:45:19 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q9sm9091451pjg.1.2022.01.13.02.45.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jan 2022 02:45:19 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 18:45:09 +0800 Message-Id: <1642070709-3104-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 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: oz2surbuCXPI From: Limin Wang 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 995ee37..91deb6c 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 : 0; param.iMultipleThreadIdc = avctx->thread_count; /* Allow specifying the libopenh264 profile through AVCodecContext. */ @@ -222,15 +222,15 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) switch (s->profile) { case FF_PROFILE_H264_HIGH: s->profile = PRO_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", + s->coder == 1 ? "CABAC" : "CAVLC"); break; case FF_PROFILE_H264_MAIN: s->profile = PRO_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", + s->coder == 1 ? "CABAC" : "CAVLC"); break; case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_UNKNOWN: