From patchwork Fri Jan 14 09:00:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp142637iog; Fri, 14 Jan 2022 01:01:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5rwRb9LxKAlYYlrmBE3yJvhignLxsIWzbodw2FfHVLFveUV64CcEQvTBkUu2FbBnx8ovO X-Received: by 2002:aa7:d785:: with SMTP id s5mr7756700edq.215.1642150880132; Fri, 14 Jan 2022 01:01:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642150880; cv=none; d=google.com; s=arc-20160816; b=qogkG86U1N6CQchXLdCb+R2eyB1m3HgYWt9pjWvBJ14rkMfw/M4biDhBYUj7s5DwrM HiQXSxJozwp8hSxflY19VjyyH6wjcMExSEyXksLQRyZVcmlkU8TM4echwNtQZI82uv9F CEOc6dm4l2qyC18WXGX6xXXEKolEyXeccoaK4RBbmp3Dm4xRvBUn4HcxkaHX1GjYs07M w8j4eaPikWQ5F6huIq0IHUc5IlwOGmfvAkZi63wKTy47dcwTkVkxtn7AnmBZIYnCvi/k huBgb0rZcB6E52ZnnHXEDij5kV/5iBVWD+4fq/zwmvqzIrbp62T2AmhYdeP91AF9Gfx0 gDeg== 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=1fy6Xy/z3JNCj4KjBfd1q1vHWZROFV/WjFyvV0H3+Ng=; b=eFFuXtV5Vd5Q8xuQrkBfmjEHPeem27mljSe/fEKydMZxIB2vVdsUz6T8LL6dmxKYrl N9wA4CNgCGJ2Xq9bpT19FKlR81F+K9/pw4WiOPwZXJ1pLuOYItf5EPmO0RtJkC6YSTIb sVYjxNft/b66aYFgBulOLiTV1szObujB9aeWwciHavaCbZcOPViBPW2a2iaPVWKmtTKu yZG5kJX1yHZjzS+Jl4xRHc9TitAQyofR5Ba0OSzSfsWn74Ro9JQsCiYawKp5kDcV2wSP 8YiZV7YOB+g6ThM3o0Xfem1dsbr5pn1EHTygH6jsT8RMbxvSHVRX09U04HDXnXiuifIK +N6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IBRJsd44; 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 p15si2047307eds.352.2022.01.14.01.00.59; Fri, 14 Jan 2022 01:01:20 -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=IBRJsd44; 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 AE42D68B47B; Fri, 14 Jan 2022 11:00:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 423A568B15E for ; Fri, 14 Jan 2022 11:00:47 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id h1so12713599pls.11 for ; Fri, 14 Jan 2022 01:00:47 -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=wcAGN4jdWlDIRNuZnndPqdxXwQW3oD0z7Ipdfd295Yc=; b=IBRJsd44Tv2TLF1iNyj/iugKsRu3BOPIkGbf/zIZSR9o514C9XUCZQJMHSsnAxDQaV dRyrDjHOJeP+ntT6ZvIU+6GHAkLHZJnUzEor7Uxzhxk6Zx9noi/rBGdIbzgMM5YoiYxz bkkvNS1bx3+2yK8wAM5ym8PWkKgqcUJPWRwMmaRqIZLV8zwmD7pICudfq/IWEg9e/cxc 1FhcEeKDuqbbcRWN7KqEVeJcVvMA/X1Ru3GWuIiAwSSJbnLeXJzBUl8ohmc/okc2SOeC jH9aua36eRFJnFSEBzbuca/BaiN2ZVRRPkm2BgElE181aiWJyl/4YIELp3MbFgWN6Vkl JdGA== 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=wcAGN4jdWlDIRNuZnndPqdxXwQW3oD0z7Ipdfd295Yc=; b=AubTV6d5oG8JGz9x3YgbgdqP3NIkB2/SEgSdLbPyWPxDRO82kf/jq5Wn1bYicOu8+a hBmjooewrEbuU4o22ePF6a+ms0gSoIxiNkZDpj6b4+9ixuvFhFGPb3Cte3NtNE9ZDVOt xv4WAmKInetjH3p2XbR7DIYKL7LPmr8pfDv/CmnIog6jMLG78InW6xPgz0zWhjA2GB7v n+vEDGZrUPwAmqHJ1kbGCQQpcH9fOlPY4z75zCNrExHpiySYPqgPI1Ikg+B/+KZss3y5 Krnq44g44cjMgnEBDQYza7HaW5Lmv0rLtslBOsHPIqyVvuZrlP9GV28v1mCqElQVCIzY BH8A== X-Gm-Message-State: AOAM533MkgvYHWwRwNEyKWsedvxiAvJ4LLaPJ1P+DYt14P8hqIqhPgxG e1LkN7GK+YxwbxSCHtFPH3h++kJG+7A= X-Received: by 2002:a17:902:ab8e:b0:14a:2fef:2cf3 with SMTP id f14-20020a170902ab8e00b0014a2fef2cf3mr8802313plr.52.1642150845359; Fri, 14 Jan 2022 01:00:45 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n15sm10555434pjj.12.2022.01.14.01.00.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 01:00:44 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 17:00:35 +0800 Message-Id: <1642150837-22960-1-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 v2 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: 5A/Rg7/NNS16 From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index de4b85c..5b5914c 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -330,6 +330,28 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) } } +#if OPENH264_VER_AT_LEAST(1, 6) + param.sSpatialLayers[0].uiVideoFormat = VF_UNDEF; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) { + param.sSpatialLayers[0].bVideoSignalTypePresent = true; + param.sSpatialLayers[0].bFullRange = (avctx->color_range == AVCOL_RANGE_JPEG); + } + + if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED || + avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || + avctx->color_trc != AVCOL_TRC_UNSPECIFIED) { + param.sSpatialLayers[0].bVideoSignalTypePresent = true; + 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;