From patchwork Wed Oct 6 10:14:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp219653iob; Wed, 6 Oct 2021 03:15:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGMH7tt8BZnlNgDs8faM8tWgW3SYuxOMFNu7TECGJcqc/MdbwK3lHVigi9OPM2SEXK+Fsg X-Received: by 2002:a50:cf87:: with SMTP id h7mr33147277edk.330.1633515332794; Wed, 06 Oct 2021 03:15:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515332; cv=none; d=google.com; s=arc-20160816; b=E2P6wbS26ASQw/dhvhfQCxY/2rnn6apl6NR8jgU1TgBtgxbqfL5XO7Y1u1hZsHbywg vR5qjdbQ777UmAlJK+3MbIubUc4IN/zbPrGWRsKfoBxeE8yy0ZxUwrQalhBs6KwX3AMn zLjFExcZPmtQEHz3DnSs5uKrTVOpD6kl7+11PECLABFM/xGTKwl8Ti094abCsdydghj7 ADX0fOaNvK5aiJY4a5OEU9Cz09prWKAu+0CJ04hH5UraOy48Xmk21ixCJmnSzsMYeHoC 2VZn1+ZR/Osfn//jU8JPjUj6s98E99OWD0bg3T6k8KE3X/pgxGfuGAH0V5jkEN42Cz7j DH+A== 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=WXbkwoJVbFpxcaFRv/UED692JeDFXsffiKO2PELtSW4=; b=csX9aEy9zuU10H0H7XyI+sO590RjriyinVIR+ToATM1pA3MTwA3PMfsWQT9SLdwPzy mBYNtCoOdSN8TTJJwAHEQv8MJIDomLASvnUqoXsF6EfQn0wZmT8DmByRdUIsY+6CrVKb erJtNnzKQYxcXNlorlVrjCFukLIMlUw3PwwcqPIVARLkprThXpimKeKrPqNTnniAKYPN 99bdaWp0eWJEWOGyGhvUtK1xL+VrgBOrAy5/5TlAc+RE2sPU3NUPpfhKPZS9LDKSIup1 D/WiQr3E7VX4wavC7k3OYB3oZWXpzNAVeu2+4PpI3NOQrbfYwwKIPP+2xPHQk3q6NFHs ihcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kV8UVUhF; 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 e27si2664551edj.266.2021.10.06.03.15.32; Wed, 06 Oct 2021 03:15:32 -0700 (PDT) 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=kV8UVUhF; 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 4575668AD92; Wed, 6 Oct 2021 13:14:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F062168ACAE for ; Wed, 6 Oct 2021 13:14:23 +0300 (EEST) Received: by mail-pj1-f53.google.com with SMTP id pi19-20020a17090b1e5300b0019fdd3557d3so1896577pjb.5 for ; Wed, 06 Oct 2021 03:14:23 -0700 (PDT) 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=YcnhgerCZqVbDL53GBLMiIgPxIkZQcYfp3uE44RlDM8=; b=kV8UVUhFQZpRe8vgJyoxlbAmR3KRNBiz9h3hkuT0jNPP4ZbCZHdzDRd4f56UjbN4Ns k2VQ3nugaKFynXVdIUQGsKX9/jmSfRe5qotkNioTD5amUwfvWgsBJTNTQK3/4Zw/Xlb6 kmbEbC6EX//ZRFOShyCFFQtfvyGjKWEtawRL5cZUVuZFA5ZWMSPr1wPzvb/0jReyOt8X gsHcLPrbAIINq8lVAxwyRAHQ4cpxXCZuRqqN6aWdcva4sr8+gqmCvRA7CP0X/8qT0FW5 oZuwVISRIsI9Nxdm8MCmzQvIFhzMX90IL4dRdsjct2wdUaC8eo+u4Au4+xEnSiGWO/Y7 FC4A== 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=YcnhgerCZqVbDL53GBLMiIgPxIkZQcYfp3uE44RlDM8=; b=3yDdJ3yNK87p2c/tNgX8vVMxHyIRy42K4PZo0ucLhRufKgFHbZUn8M4XvBorqSI8s0 EoItC7mKoco2Du4VbKIlAOUDNWar+02o6swoKWnnIpeBcqK/hXP1rZENlrEgGvQZOeEy kV2+57/P/FhbbAx9eD5j7uJlyZl97bTiAK4M3ldajYl5x10JuVgoMayCLxpAdnkdKYuK X1rCt7EpbHSACzfRCR5I5K2jFiJ/pcl/VHUPkq5UDL59FNCLhl5mSvtmz/T1GYsYEG0U me/dAcDtfSzvGYUjlVQQwMFEDSRCVuH5swNPoYYtFf8TuRA9iA4n6ddzGgjRGoWQu6ng 5ajg== X-Gm-Message-State: AOAM532jL34Gb1Kdb/CPeb6BM44zTr+yp6ZCcm+epU93kmSQ/8yIKD1u 0eUPMoswaJsD9j00kWihLAPwT6jorpc= X-Received: by 2002:a17:90b:17cc:: with SMTP id me12mr10011402pjb.147.1633515262130; Wed, 06 Oct 2021 03:14:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:10 +0800 Message-Id: <1633515251-5156-7-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1633515251-5156-1-git-send-email-lance.lmwang@gmail.com> References: <1633515251-5156-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 7/8] avformat/rtpdec_rfc4175: add support for colorimetry 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: YgpI9Xl51tA7 From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index db6b9b8..23a3f4f 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -31,6 +31,7 @@ struct PayloadContext { char *sampling; char *framerate; char *TCS; + char *colorimetry; int depth; int width; int height; @@ -82,6 +83,20 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) else if (!strncmp(data->TCS, "UNSPECIFIED", 11)) stream->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; + if (!data->colorimetry) { + stream->codecpar->color_primaries = AVCOL_PRI_UNSPECIFIED; + stream->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; + } else if (!strncmp(data->colorimetry, "BT601", 5)) { + stream->codecpar->color_primaries = AVCOL_PRI_BT470BG; + stream->codecpar->color_space = AVCOL_SPC_BT470BG; + } else if (!strncmp(data->colorimetry, "BT709", 5)) { + stream->codecpar->color_primaries = AVCOL_PRI_BT709; + stream->codecpar->color_space = AVCOL_SPC_BT709; + } else if (!strncmp(data->colorimetry, "BT2020", 6)) { + stream->codecpar->color_primaries = AVCOL_PRI_BT2020; + stream->codecpar->color_space = AVCOL_SPC_BT2020_NCL; + } + desc = av_pix_fmt_desc_get(pixfmt); stream->codecpar->format = pixfmt; stream->codecpar->codec_tag = tag; @@ -115,6 +130,8 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->framerate = av_strdup(value); else if (!strncmp(attr, "TCS", 3)) data->TCS = av_strdup(value); + else if (!strncmp(attr, "colorimetry", 11)) + data->colorimetry = av_strdup(value); return 0; } @@ -145,6 +162,7 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, av_freep(&data->sampling); av_freep(&data->framerate); av_freep(&data->TCS); + av_freep(&data->colorimetry); return ret; }