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 E3C5B430BB for ; Thu, 13 Jan 2022 21:57:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E268668B52E; Thu, 13 Jan 2022 23:57:42 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16A3C68B4B7 for ; Thu, 13 Jan 2022 23:57:37 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 20DLvacL029807-20DLvacM029807; Thu, 13 Jan 2022 23:57:36 +0200 Received: from foo.martin.st (host-97-187.parnet.fi [77.234.97.187]) by mail9.parnet.fi (Postfix) with ESMTPS id 6D5CCA1428; Thu, 13 Jan 2022 23:57:36 +0200 (EET) Date: Thu, 13 Jan 2022 23:57:36 +0200 (EET) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <1642070709-3104-2-git-send-email-lance.lmwang@gmail.com> Message-ID: <86fb71a6-491b-43c-ff60-6d1bba657dcd@martin.st> References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> <1642070709-3104-2-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH 2/3] avcodec/libopenh264enc: make the profile configuablable correctly 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 Thu, 13 Jan 2022, lance.lmwang@gmail.com wrote: > From: Limin Wang > > If the version of libopenh264 >= 1.8, we can't configured main profile as > expected, below is the testing cli: > > ffmpeg -y -f lavfi -i testsrc -c:v libopenh264 -profile:v main -frames:v 1 test.ts > It'll report: > [libopenh264 @ 0x5638300] Unsupported profile, select EProfileIdc PRO_BASELINE in libopenh264. > > Signed-off-by: Limin Wang > --- > libavcodec/libopenh264enc.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c > index a55bef8..995ee37 100644 > --- a/libavcodec/libopenh264enc.c > +++ b/libavcodec/libopenh264enc.c > @@ -220,26 +220,27 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) > #endif > > switch (s->profile) { > -#if OPENH264_VER_AT_LEAST(1, 8) > case FF_PROFILE_H264_HIGH: > + s->profile = PRO_HIGH; I don't think we should reuse the s->profile field for this value here. In practice, both FF_PROFILE_H264_HIGH and PRO_HIGH have the same values, but they're enums from different namespaces, so would it be clearer to use one variable for profiles set with FF_PROFILE_* and one with the PRO_* values? > param.iEntropyCodingModeFlag = 1; > av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " > "select EProfileIdc PRO_HIGH in libopenh264.\n"); > break; > -#else > 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"); > break; > -#endif > case FF_PROFILE_H264_CONSTRAINED_BASELINE: > case FF_PROFILE_UNKNOWN: > + s->profile = PRO_BASELINE; > param.iEntropyCodingModeFlag = 0; > av_log(avctx, AV_LOG_VERBOSE, "Using CAVLC, " > "select EProfileIdc PRO_BASELINE in libopenh264.\n"); > break; > default: > + s->profile = PRO_BASELINE; > param.iEntropyCodingModeFlag = 0; > av_log(avctx, AV_LOG_WARNING, "Unsupported profile, " > "select EProfileIdc PRO_BASELINE in libopenh264.\n"); > @@ -251,6 +252,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) > param.sSpatialLayers[0].fFrameRate = param.fMaxFrameRate; > param.sSpatialLayers[0].iSpatialBitrate = param.iTargetBitrate; > param.sSpatialLayers[0].iMaxSpatialBitrate = param.iMaxBitrate; > + param.sSpatialLayers[0].uiProfileIdc = s->profile; So this assignment is what was missing, and was what caused the incorrect conclusion in d3a7bdd4ac54349aea9150a234478635d50ebd87? I think it'd be good to explicitly spell this out in the commit message, saying that d3a7bdd4ac54349aea9150a234478635d50ebd87 was based on incorrect conclusions because we had missed to set uiProfileIdc. // 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".