From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 39F3E4314F for ; Fri, 14 Jan 2022 09:30:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25B7F68B4DE; Fri, 14 Jan 2022 11:30:43 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 136C068B460 for ; Fri, 14 Jan 2022 11:30:36 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 20E9UZGm008998-20E9UZGn008998; Fri, 14 Jan 2022 11:30:35 +0200 Received: from foo.martin.st (host-97-187.parnet.fi [77.234.97.187]) by mail9.parnet.fi (Postfix) with ESMTPS id 806C8A1428; Fri, 14 Jan 2022 11:30:35 +0200 (EET) Date: Fri, 14 Jan 2022 11:30:35 +0200 (EET) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <1642150837-22960-3-git-send-email-lance.lmwang@gmail.com> Message-ID: References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> <1642150837-22960-1-git-send-email-lance.lmwang@gmail.com> <1642150837-22960-3-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 14 Jan 2022, lance.lmwang@gmail.com wrote: > 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: > -- > 1.8.3.1 This looks good to me now I think, thanks! // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".