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;