From patchwork Thu Jan 13 10:45:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33551 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp335117iog; Thu, 13 Jan 2022 02:45:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwami1ERrOjVpUm3BSRY7oJEnBYTAF2kQgXbnOALgEJ92RJSHVle6z8YZIHzkTr0Pv/imLB X-Received: by 2002:a50:ce4a:: with SMTP id k10mr3598037edj.31.1642070732177; Thu, 13 Jan 2022 02:45:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642070732; cv=none; d=google.com; s=arc-20160816; b=rT1dVZZxP4DaZ3ixXTRbhrZODpv6c7BUD3C/Ah4QX3uv2+ToUNKR2G7Zh7K2AOff6j 9Cu9QlBKfC8zNP3Ef8v/RX18PK4BlEg6MD41YRmLezChH9HzSCjE6RXd+nGp32LTWrQE KwPocqJVkBwhKCUC9uSRDdAIAX5hx6q25PwQQEhdSDxG5m/BQi5g8cQuOWIFnLitxpmc XCZp5Q12eDd8gmkP9aceGJbgio7Ze3gjDsgH0F4oB4Av+6CKFfzLtq1abQGRYTEUziL0 ShPO++wF6k/8Hn2dNXwl9wDNTquxtOquE2x02GeNsb3/oSv3YTXXadc15ha7glQVMEj+ /yeg== 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:dkim-signature :delivered-to; bh=iV29swGQvKzHFQ4qLji0XOtFrmkud17FcZ/GG0/AKJ8=; b=XZ1evJhBYVI7o5SPPZrycrOB3Vq4lKIe7GrTzoshG6gmTwOtmfcHmaK3vfh7xXM6jL mpJDOk1ooROj2Ci/cebagDUbbFcg8eFCp5T43v7t3zUcTvPBE7rn9hG0JDrFdcQXbviu 4ohJjpC5TJ4C0xOfEJ0bw0IlflzT5WgaTnF2vAe6zLNJUEOykHzHe1YPEUY76TFaKjlt s1EB3CUrY98bv/TpODrlM4lfnR2NVCgPj01CcO1yx2O6VZ3cauqRBGyMfpRleIC2ysPz jQEgx3PD9elAeTB52akwKM/gXbWyQZKly7t/lIEsz7K5vp28w2getsl9KtdoxJy8opmK Bkcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="JNb8AZ/u"; 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 e4si1169211ejd.1002.2022.01.13.02.45.31; Thu, 13 Jan 2022 02:45:32 -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="JNb8AZ/u"; 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 A6BB568B75E; Thu, 13 Jan 2022 12:45:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3A1668B700 for ; Thu, 13 Jan 2022 12:45:19 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id c3so9062390pls.5 for ; Thu, 13 Jan 2022 02:45:19 -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; bh=I55VPZphpWeBZShUSvVJqkRSdhxSsHh+Well53e2y8I=; b=JNb8AZ/ubEasHgDQQvnmJ0X9euX+kz3K6XbvJ7cZLVVxnUcBue9kO50JRragfVCQhz QOLSXNTOSqeyLlVtp9xe9SfQ7Aocuft9+fawonv5kZQ6NdaERlBo59dlGJT500X73+NJ JMEZ/7n32S0mKa3YVUe/bo8YqjKo/WhHaaDO++33vf+/XXonfJh8uPWlHxh0UJhwQtaV J0k/f6bG8Mbb3Rm4YBqw1dIz4q7lvCy29/yh73MzSTjnx1f/Vs82+mnkk0dhnLtd/LL0 GHsIYFpQfvOM2J3s6iQY+MeBSaCUgG3rWCRqcJvixjqrEptO6RRTvUSC+dF/0SyTM4qS rgKQ== 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; bh=I55VPZphpWeBZShUSvVJqkRSdhxSsHh+Well53e2y8I=; b=U8Wwf8i1UZUBzkqbrTXPKT/QecL4xbP3TX6JBsa2kDbZnMNWhlK0BTixlfGqSj7oi7 eB+aWvKcQ5z0mMMzvWLU1Sg5Seyda3dywAJY7ZK2iNzcZUZe7rfbVtKgpiE2BRoUbWoC Jq5CFS3GaBxk3E1JAlle4g0fQTzYd88Sj4KVsWRGc2zMBI7fP5Lz1jolfcK0D8VUf4qM 3GOu40buv/rUurOpW9adDQtCINVFdvYWBFT922dqbtWgEzm7u/GtOEdHGzGrwzmcxRLB xsYmf3XWf/AmagRu7giY3SqF77mda+FRjK1E2pb7aec3B9UChbNBVSAkQGNCmjJ4nV1n p5Zw== X-Gm-Message-State: AOAM530Buq8toLrLfFsAUs1IZyESJwVJF4NLGARFYodKO4Q3NBKJXFm4 qv4SI1PX2RXCj7rjYd2Idct0GkICYb2dbg== X-Received: by 2002:a17:90b:4d91:: with SMTP id oj17mr13725263pjb.224.1642070717115; Thu, 13 Jan 2022 02:45:17 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q9sm9091451pjg.1.2022.01.13.02.45.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jan 2022 02:45:16 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 18:45:07 +0800 Message-Id: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/libopenh264enc: support for colorspace and range information 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: JBSjnFJjZms+ From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index de4b85c..a55bef8 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -330,6 +330,21 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) } } +#if OPENH264_VER_AT_LEAST(1, 6) + param.sSpatialLayers[0].uiVideoFormat = VF_UNDEF; + param.sSpatialLayers[0].bVideoSignalTypePresent = true; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) + param.sSpatialLayers[0].bFullRange = (avctx->color_range == AVCOL_RANGE_JPEG); + + param.sSpatialLayers[0].bColorDescriptionPresent = true; + if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED) + param.sSpatialLayers[0].uiColorMatrix = avctx->colorspace; + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) + param.sSpatialLayers[0].uiColorPrimaries = avctx->color_primaries; + if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED) + param.sSpatialLayers[0].uiTransferCharacteristics = avctx->color_trc; +#endif + if ((*s->encoder)->InitializeExt(s->encoder, ¶m) != cmResultSuccess) { av_log(avctx, AV_LOG_ERROR, "Initialize failed\n"); return AVERROR_UNKNOWN; From patchwork Thu Jan 13 10:45:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33552 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp335249iog; Thu, 13 Jan 2022 02:45:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvmYMVJLoJMXdcOeWPr+b2+/VWHPUSo2eELuAEz5cyPP7/PTKeZjdUpsIf2STF5TsjDj9J X-Received: by 2002:a05:6402:2696:: with SMTP id w22mr3706361edd.296.1642070744224; Thu, 13 Jan 2022 02:45:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642070744; cv=none; d=google.com; s=arc-20160816; b=Fb8VhR2WSoPBOyTfM97bLngybkAya3eEcA0tLCSSnEd1YGNdLwnpzOv1MZe7dupKNo WL3Pb7VeXu0InNTsuo22NY/Skw3R7blFh59syFT+dAvj0eHcJWTZ94OgVrb+vNO+mI94 SbDJXCk2nnux0v6QANGn7ETfuCEZGmFkQ1Mz3+tTpoyMAOFwk6eO5bPorxI9ocUQTIrL Y1GSA2KddxzwsMJEJyTYQoZd3AUK8nSnJCGNbf37qmPEiFc0/lGRV5cCDHe9vot6Wtro JYePoMKYOqPsFpu4z3hWMZbJbtBXJsyfr9Zhbx29+Jy/BkbRh//C3lRy2skCTgLuwC5t 5+RQ== 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=HXqQu0MM3gHXra5TWO7Iki27uyfS5UB4z1Ed1VW3OIo=; b=goQREEaUTqSSddSGBLreCknI0G/CA83GDcYbw7fDV130GsPbgB45tSVlCE+bRnDKs4 DYXu8D8ATUI5wMcOWlCCYHGdZnjtCM1Vii/aWzHVUt47CAA0UOZ0EcoHvNORUTacPN68 W4NiGkpJ5AG56YfLqwKa16tEc5bNn7joPnIjeVFay7qHosJSr4YPGHf8yKhvWeKKESZh cOYvIymPn1odCghCm1d5yRSwVvTkH9Z8al8hpbIke0g6w1vFCPzJLE9BL7FCJANUyQAj OI9YAfLKYZQRMcgTFvDqybrHYsrBiNY7vwaE9CvE52ztBMA1G/I28RIsg0zC59z0eWoX v6Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QExYki2+; 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 sc22si1406125ejc.615.2022.01.13.02.45.43; Thu, 13 Jan 2022 02:45:44 -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=QExYki2+; 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 AB34468B76F; Thu, 13 Jan 2022 12:45:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B30C568B700 for ; Thu, 13 Jan 2022 12:45:20 +0200 (EET) Received: by mail-pj1-f51.google.com with SMTP id l10-20020a17090a384a00b001b22190e075so18256450pjf.3 for ; Thu, 13 Jan 2022 02:45:20 -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=C+RJAOGyXHUXxlQQSrtIIke+Xk1Tb8EEaElybhtFsNs=; b=QExYki2+OKQ/sHdfh8uBRyeNHTMI629dZMr8pTGH0u3zTcdRWyLBO8HPUIrgsDdXeH bzyavrXy5OOrVufWNheF+D16VK3dGhKfBVkm0gsYzBuT6qEdXH25zq6nKLvn0UUBYymg +py593tpoQ0er2VyBW4PvjA9D0rEfecyIyiro/RbuqmSMJMf5sheQgH03R7O7h3rQP66 iVxA/AVKm+9fF81tiBEaJ3WvJqyl7dqWYZyvWVBL0SSFdWnB7KWMkFb7X3RGid24Jgtl 6SVoBOLrpNk19G4s3GwcY8tuIq2/c2RleGo3cm57HsPIB8h+7Ra+N0y3UA+ORHCYn1St tsLA== 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=C+RJAOGyXHUXxlQQSrtIIke+Xk1Tb8EEaElybhtFsNs=; b=1CDCb2RELQ5lnrBSSmlDGBpLMWTp7sQLtNavN8+pSl+cfSEPSVa85+b/nbrrAMmKbf EI6AeymbwT+JztDZA1xhzpQQ1pMqqH/mznZf2+g9syKlvBXP+G9JuRFiQHMN+1G8VerO jga3p21L9wcAZ7jFUKHHhIUfdWZlgBoNvEn9xaWNU4eYaE4CMPQBm0hmoaWvgziWWm7u s+bX+V7E7wlTkrCbgxbBAYQwvBj4zuCqr8wrXlZ4FHEG4kfbMIoUiOIQZZXa2O3ERQCm yxsuUoESDwv+NYeUL3CwC0li+UFrBsJt5GXt2CGYQMzHG7ZySLUSHiUOhD5TSnF0MW5S zhWw== X-Gm-Message-State: AOAM530zdLJPu/u8ZKdnizRUt76muSpH4Nfh/VjMH0DqEhIZyoCTL0KC fHXdKmod0Kb6wyxoUsVEaMxtizyOSl7XSg== X-Received: by 2002:a17:902:b484:b0:14a:4743:41ce with SMTP id y4-20020a170902b48400b0014a474341cemr4064001plr.52.1642070718525; Thu, 13 Jan 2022 02:45:18 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q9sm9091451pjg.1.2022.01.13.02.45.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jan 2022 02:45:18 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 18:45:08 +0800 Message-Id: <1642070709-3104-2-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 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qcOzoYs1C0la 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; 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; #if OPENH264_VER_AT_LEAST(1, 7) if (avctx->sample_aspect_ratio.num && avctx->sample_aspect_ratio.den) { 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: