From patchwork Wed Oct 6 10:14:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp218872iob; Wed, 6 Oct 2021 03:14:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfYZDL1av9aFqbpw6WOebOXUofconuL1CaY1Li2QtfyUqcLg8gmnewdlkjfc4tx6p+GTFK X-Received: by 2002:a05:6402:4304:: with SMTP id m4mr559577edc.326.1633515276459; Wed, 06 Oct 2021 03:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515276; cv=none; d=google.com; s=arc-20160816; b=U5araduY/4cpYJZHmYKWzmTO9+gaLOPhLKYjUIoc50aBBxnc08iYxjh6qR8sDZSxxJ 92lFCPq9xi9v/D6nGASiHv3b2L0a48XaJ37FNcgz6RWKIfOmhvKAAIdf876UxM5esMdX EJnUjCLobJKrSK0qCfUcdp9TbdIH0D7/53V2vUnmArZ7SK66ThDe1mFz5QwsmCXdAG/a 3Dr7PjKoJKDnYs1J8v70RF31+V1GuEXGReNszShNIC/CCp0/WSl478o6dnCJxRBQDvTT BgnKmJ8CjjjX9uRw9pht4BilwkqIcfYX7VnAc4VYRCeJQc6wHFYxhZA3z9p5DIpImIDc IeGg== 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=EDzCgKYIufrJ2E7K0aX2tE10XTL0dAGz3QYczVouw64=; b=HHPGj+2hgkYguw8ohmJDrRRHtfkv2DtuVBS1FW2I8Smgg+f2QLUwNmLhyry7WR4t7n ZNlVk4GUE3Ypxm7p+JUYR2kQAQV42o1nD+N5IMrURFTMVlMiJT4hVo5MNJpzE6vYnCWW ZWSDTOo1Bp6/IcZPVTCx5Yl5En05bRXGDsvWK+fA7nEF9Lh/kdmV0m/5gNs3dDYR+kL/ v8Lms9CdE96agYLbkFRIP7MFZOx3RnaEpQv4gXavKL3gIiPiiNq0cHyjZdXUqRjScILx a9SHAfv1gBm2wnPSLLw/ZnrZ3psTHoyuIkaNOrGTJndXcBb1U2/CAc19ogi8rLcMnSBT Q0WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CowearmP; 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 6si24189614ejk.125.2021.10.06.03.14.28; Wed, 06 Oct 2021 03:14:36 -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=CowearmP; 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 1C6EE68AA84; Wed, 6 Oct 2021 13:14:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 349EA68AA84 for ; Wed, 6 Oct 2021 13:14:17 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id 187so1915744pfc.10 for ; Wed, 06 Oct 2021 03:14:17 -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; bh=0oECgei4NlgbpT69yrK3ZkEZA3j9weJMP3F4o27rrA8=; b=CowearmPL5r1CP7fLmet4JqHtS0Cjs9kwmQflLhrH3Nv0RI9f83muOEXTGWWQZETAg xNBbRr/sd9eDUa66w1CM5eOBAYYzVKB67Ej6CNJbmqCoof3GYgy3NdQcgdvM7pPnUhkE 5qJOlmVXvPu/J3DZ8Rc6zVrXc513/rWcZLWfVC6pGt6/Bg7EET0sZ6lPqNcC1KG6Cmpu M2DtBxEqBRSA6+05/CArrzWReIjvChwTpQ067ktA5KZtBBrLX7+EhuA1IdFAnV+k+nAp TnlQMsQmIuh3kOr5qdKmgsAuaPt76XdYhpsLMMEoj2JDa729d6nZK+0oZ88k2/RuQw2S RExw== 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=0oECgei4NlgbpT69yrK3ZkEZA3j9weJMP3F4o27rrA8=; b=XYB8kfd4MHOyyKlJVaGI6YN+pznc/+j8ZDLpRmzTJWY9RrdR2TI8y42pyrc+csyBot i4iLR8NOyKSmIonALfPAEDYWavkZlXKwWD11A/3kToRyYZ6cObMgJbYvFdirmrl1ruS8 E8o/W66jJuw3tBkJ8Zwm8NIY7E2+qkbVuHlyivora0z8R8uz1QM4Ti6Cxo2Ptc4XePnK k+azGQ5t8A3XyLIo47DRavZOPMDQzYvej/t8X3hS+7tupNoET1eiwJ3bG5iygUNtIl/m 21Uf6J9H4+sCnGVv0pLb6rEH3GUeArve71mUKJ5QQDDKWtv3iOi75JGjrRRovmnfOh87 mkJQ== X-Gm-Message-State: AOAM530IqtboePGLQ4crN59RVhK06ACmt5MNu93Ymb7Weh5mmubERy6M IESA+Uik/Uq3vQDKIZDz2nkW5MSRIFw= X-Received: by 2002:a63:470b:: with SMTP id u11mr7481896pga.441.1633515254895; Wed, 06 Oct 2021 03:14:14 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:14 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:04 +0800 Message-Id: <1633515251-5156-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/8] avcodec/bitpacked: check av_buffer_ref result 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: CeqQLS5F0cnq From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/bitpacked.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/bitpacked.c b/libavcodec/bitpacked.c index 8143151..0440df9 100644 --- a/libavcodec/bitpacked.c +++ b/libavcodec/bitpacked.c @@ -45,6 +45,10 @@ static int bitpacked_decode_uyvy422(AVCodecContext *avctx, AVFrame *frame, /* there is no need to copy as the data already match * a known pixel format */ frame->buf[0] = av_buffer_ref(avpkt->buf); + if (!frame->buf[0]) { + return AVERROR(ENOMEM); + } + ret = av_image_fill_arrays(frame->data, frame->linesize, avpkt->data, avctx->pix_fmt, avctx->width, avctx->height, 1); if (ret < 0) { From patchwork Wed Oct 6 10:14:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp218910iob; Wed, 6 Oct 2021 03:14:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNRwUHnnobfquki9iIE1zZHp89Rrk+RGQ0zDLLUU1Z37zq9M0j/1jO0H8+t7EvFrPw7K0B X-Received: by 2002:a50:dacf:: with SMTP id s15mr33455243edj.385.1633515280400; Wed, 06 Oct 2021 03:14:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515280; cv=none; d=google.com; s=arc-20160816; b=QLVhFmUShvBCMoFXsk/Xf7DiY/q5ds0rc3PfOoA3ga62PqEoC3L+eRCRaRJEfNg4aD Za7YFCQlFKiy7Xz2jRq87BtQGqoVxyahm6h4fcbu7KKKIWAl4gB0tMDai5GJva39BFzD UABh8G3yWLhLyA57MGBLq6/NFUXa8lL2/oeNWn972yGX23lxG4GITBgdBSk8l+yI2kMp Pb/kqjej/HCR1uMB1vSUFyp5LPFQQhuLVa5Ao6D9XpZrcFJz70vXDZKkse7CfjXdw8Qp lx82OVFzPBzaI3UQkD0BAcEdVvXXt2mCVmWKc+Nhuw9BBK8yf8ci3uf/ZBFya/dO5zD3 LRLw== 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=3bbe8tmpM0GfZ1t7j5U9BpntysaRmFaBphhpeK1QeuY=; b=aYHqZFLxYMeQtGmSGp+UGUIUEQOwuYkQ0ws3ctl/P2/yLSGCcp2LeP/uaiXwLfoOxh acjXsa6b4MXIZ338G3M6cyC8hD6D+BmC10ZuRI4wH7Q+YHRev67W9fAOzp7egHRv6q5s C1wWY4CdeLOVXwYxwJLFAtSHiRBq/tcNOpIvAv/qPLDWSkqME1im1hzmh9KZ3yjUSQ10 EbPYhaHQSgrSRP5pjMrt7HDX8qrIOb1iyB4smiYH9lbSQNQnOdWfwsaNbPD5kNGKNYCK 7tFlwBAxNvBNakQIP06jRuR+vU6KjPBpKtw48ygcOL0vwoNIfKhg30IUoaz2r5KnfcZk r0Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bNGw0wKF; 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 gn42si2910090ejc.545.2021.10.06.03.14.39; Wed, 06 Oct 2021 03:14:40 -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=bNGw0wKF; 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 A475168AAA6; Wed, 6 Oct 2021 13:14:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A99968AA54 for ; Wed, 6 Oct 2021 13:14:18 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id x8so1320452plv.8 for ; Wed, 06 Oct 2021 03:14:18 -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=03QtPjpL3Eso+xyY3KmF5iLX4CMlpi0nRFIByIv1FHg=; b=bNGw0wKFIbFLEcR8NYllmrBNjNwsYzkQ9OPjjLlCxnhWpqnii0NSrjTm7RUYT2JQyN 6MgcXgko1BOVQzngA2KrBo6e1mRZmlLUrgVcLZoNXxE1bv5VrYS5z3o+LDbhlcSkONFy 4O8dHJYISeOLS5ldJjBNqiXw0jNchmNtWx1TDImbg+pfW6feSoRPp3pDRusm29XXwUHc o5cYJVRfaOhj8eJKY7cQLHTHCwXiVvTsc0iq9rLl9NUFtaTOIYEhg1WY5f6mzCxkr240 M9o+HcwsD7xpwtF5n6kehv+L5ml1q45sxSgF/2T8tdkpuX4jL2kg6kwA5wIa7FSL0Pnv FNyA== 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=03QtPjpL3Eso+xyY3KmF5iLX4CMlpi0nRFIByIv1FHg=; b=xUzIq5JJap35fWEya3iWksCXT9k0MfU38YSx770ZNkxSWltZi4ft4O1j7XGTEY/3O9 lA2HZpRpednuJNeybUSLFtvCSlQLd7RpNTIMd6CzLklx5wUL2csfqxaXOZedZDoxc2iu nfcvwTyEvOpqEZC5M6cBqihTp7KOpMMGJL4e8dX0TX1QWP0rmPZmmpisUgvGJohK8U3r 7NiArdnYhMlL0cmXDaIL/AGzfrc9n1gyZxhH7AJAWbZ83mtelQ4GYnuG+5ypcBP6Rm0R 7sojTCMdoDzf3uxX+po4vknUq76FxQKOczoxc88mItE41p79LmQw11NLZaNa7fUoTOIK BnDQ== X-Gm-Message-State: AOAM533syDHosCrWZddyC6UsrFBrdA9t/Kc4VRvpOi30LPyl4qWbhVsn LrHwxCT71c/beMvPKBG45LyYn9WI5Zo= X-Received: by 2002:a17:90a:3483:: with SMTP id p3mr10144554pjb.80.1633515256100; Wed, 06 Oct 2021 03:14:16 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:15 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:05 +0800 Message-Id: <1633515251-5156-2-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 2/8] avformat/rtpdec_rfc4175: use av_get_bits_per_pixel() 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: U2cVqcc6QwKy From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 4daff4d..e1e1452 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -43,8 +43,8 @@ struct PayloadContext { static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) { enum AVPixelFormat pixfmt = AV_PIX_FMT_NONE; - int bits_per_sample = 0; int tag = 0; + const AVPixFmtDescriptor *desc; if (!strncmp(data->sampling, "YCbCr-4:2:2", 11)) { tag = MKTAG('U', 'Y', 'V', 'Y'); @@ -52,11 +52,9 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) if (data->depth == 8) { data->pgroup = 4; - bits_per_sample = 16; pixfmt = AV_PIX_FMT_UYVY422; } else if (data->depth == 10) { data->pgroup = 5; - bits_per_sample = 20; pixfmt = AV_PIX_FMT_YUV422P10; } else { return AVERROR_INVALIDDATA; @@ -65,9 +63,10 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) return AVERROR_INVALIDDATA; } + desc = av_pix_fmt_desc_get(pixfmt); stream->codecpar->format = pixfmt; stream->codecpar->codec_tag = tag; - stream->codecpar->bits_per_coded_sample = bits_per_sample; + stream->codecpar->bits_per_coded_sample = av_get_bits_per_pixel(desc); data->frame_size = data->width * data->height * data->pgroup / data->xinc; return 0; From patchwork Wed Oct 6 10:14:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp219073iob; Wed, 6 Oct 2021 03:14:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC9iFZe0tQFWbKIZlab9CX3Zqo6mXLLcNReQJ32u0Gy8giAmzUb+lNCTBm+KDWT25PwmVX X-Received: by 2002:a17:906:704e:: with SMTP id r14mr31210565ejj.293.1633515291084; Wed, 06 Oct 2021 03:14:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515291; cv=none; d=google.com; s=arc-20160816; b=A68N0YMGsQuGmpsPK8cQttd+xyjsWXdFBEzXL1EdLGFp89XULldDj4ot3WsTMQfVXQ nWjWobOGGvQI86lh9ibVep0mf6j69C7DxShDWr0nl3OgmSb2DEmUgllGZSN1LySkBJ+B iqhOme853SUJO+4GTzHXDq+6jDmpQeuFthn3QkNsGuHKmIUuA9imuAZrnosG1Gj44HzL bhDZIrpYpTShgrd1/sbWsdGVnz0xG1DHN0YrR2TKPKESw9pBT0A0g08SDdWZuXGWjFhT ACcVUBskn7FjXR00BB05UPjwaw3MoubGY7OpDv4vc8LNeSW1J6q0ZzG2veSlyzx578Au +LDg== 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=YemRJgva3/BqPJ/52cWen4UgfNiNq6YWIx/QZ6m9dV4=; b=YoGtBwZvqwCtSZEuXTve1EUuAP3efiTLsR4t3AQCYJJTbG8j/QsXX8/Z07252cnxaT aS/DC4ieyuZefAPSuPieG720ax5L4e83D69bS5f0EVK0r2dQzMY84+o6voU+lxT+7SNr GNzbACSPaReC5pvW0k/wzpW+UBrbi8C/x9acji2Nfaf1CvnevMJ2Czhvkjps2Z1/cRKi d8id2LtHcYC/UYgK65RELOC0HssDqP4/Z78xBGEqNRddhkCivMSrmcUROom9EWio1Y+S eqWvuDygcS103LrQ3oCvATHK6kEkUwRJqdNH+YEfR9rFUKYfJvztVNnSTx45cd2j4B/G 403w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bilhcn+h; 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 y4si15336059eda.364.2021.10.06.03.14.50; Wed, 06 Oct 2021 03:14:51 -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=bilhcn+h; 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 DB36368AC6D; Wed, 6 Oct 2021 13:14:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B63268AAE8 for ; Wed, 6 Oct 2021 13:14:19 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id s11so2021821pgr.11 for ; Wed, 06 Oct 2021 03:14:19 -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=dsz9kBJlTV4Im+DnRvFZF8cR+Skekl5R+QLegh280ps=; b=bilhcn+htDWh54Ujf4vBQ8mNALLB2HQPMxhc/ID8jgi/JC2AYoMwaOgxSgtxz5fN0b J25FPdd3G/z7trZcDmd2Nu/Y+bNsizd5+/apkvm1LiHP6eovS+zpxngAKMXztEuAj8je +qUy4FoK1kCX+xNYyEhMetwf+jrPfPWSJLijuUaUFS45dzobom7L/ysowzd8JSLKvEuF YdLFZp0FhRKbq5CWoZHACTgl/afGOc3LxrZ8kcq/laJtiDZwvYHO4UhuUUDZ5youcyH3 /gJ9LSk8ZBjE03NGfGi4mtbTgrfmQ13MDhALxsSMy7zNwgUsMrXzqkFWYcSrW+Mp6fyC QWPg== 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=dsz9kBJlTV4Im+DnRvFZF8cR+Skekl5R+QLegh280ps=; b=NPgNhOz9+eGfqRdrz0rVKXhX7Ub5nxmZsc4p+hDATjw3X6jYIsoSFfopS962HtUqBD IxU1fePXBFoiyN8KMBdTkXi0mANOTUKzmTIrdEH/rwT3wwe8DpQKggKD1BGGVol19r/x 7/wOXYuWPRVsN2zQAAkddP4AuykbGAtxSDOOxqbboyBCoe4rktfg9LkNSU9grYROW1ov +UjARoXkAn3dL6l7FYeD4Y2SIMFJkG2eu3bTnix0GGgbnWYVbV7ZBuRrb2QTuilQM4ye eTXLrS8OTaRnoQz+LqhFf2z55yqibDAdmYnG84cUN+ZMmkDib3EdPzRI1EE1+1cqK8Ob G+hw== X-Gm-Message-State: AOAM532+SKxaOE3d5/GdGp6FLrXobWfyg/jnN4yBYbj6E4N2QgQtCkxh Frw5dbk6hBF8YNBDGe+F+kzAPF33cyc= X-Received: by 2002:a63:c045:: with SMTP id z5mr19858516pgi.374.1633515257261; Wed, 06 Oct 2021 03:14:17 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:06 +0800 Message-Id: <1633515251-5156-3-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 3/8] avformat/rtpdec_rfc4175: Remove redundant initialization 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: FakgbE/+WRoy From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index e1e1452..97939b0 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -42,8 +42,8 @@ struct PayloadContext { static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) { - enum AVPixelFormat pixfmt = AV_PIX_FMT_NONE; - int tag = 0; + enum AVPixelFormat pixfmt; + int tag; const AVPixFmtDescriptor *desc; if (!strncmp(data->sampling, "YCbCr-4:2:2", 11)) { From patchwork Wed Oct 6 10:14:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp219224iob; Wed, 6 Oct 2021 03:15:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjD3WzB1rnmtQotWwQrbQs7femoa1l834waVNZT7kneyqvimd8ls7NCuYTAoIfuyef2Dos X-Received: by 2002:a17:906:29d0:: with SMTP id y16mr33218313eje.477.1633515302253; Wed, 06 Oct 2021 03:15:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515302; cv=none; d=google.com; s=arc-20160816; b=si23XIwmuC5o4BlAMKdhVpant33jBAdczNTd7ANEn/08B04iwYklmIWPsBzKAnoXIi V/cW9mJuKB39tMkNPRW377VUIS3VlEU3vO/IaVTwscfOe2D+sjnJrbBVXH54R7TZ+PzY 21XH1qX/Ozw1xhCc403slP9ZQZ51cCbIXMviiP6xL8Lxu0NrSAMInSJTQ/nXaIUnTTBq pTlYqViyW99XkLkPBATsLGJyV84EzyfraMJm8BYfk/b9OVBBjfr5lBjsAgF4pNTmebXw joijaILvi8ncBwlRZA74DW9wapQLDwF77RyjYY6tCU2wIjaNdCGFavwx9E0QSMvMn8JD jpvg== 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=VK0qOChEcFxAHI4K0zB0YiCKUtUIv8vrgGVbPVx9LNs=; b=GVoz4YJDI2VO2K/F7KVKHdndmQZvNmNGlzrGsEhvu7cJENdZPXwgAAyCURTxMdJIh5 hn+W7qynCMStcEtCMlBO8KCvULwi8Fwr4AHOFrC5edFHjw4V27tbPykP4LEGyL33JGEE BAr5rtZaV9oHOdi5vQrc0xmBzrZqPGPm7ivGjdz2hwV+q2idagBHFm4v8gRrcfpOiU8V m3i8l1aMwBjMfHHT4dznL4AWYDd2v5X3oJd6e0qeh40AQg4AJD96OPAkAvyfF9+3Mjq/ xaZQLHBKnezIeDkJZy7vxB6tHnpBAL1xgeqlI4d3n02TlOQ9v6UWtZBln/sTEBNbcYSX 5mkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cLlYrnYH; 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 v5si15153987edj.122.2021.10.06.03.15.01; Wed, 06 Oct 2021 03:15:02 -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=cLlYrnYH; 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 DCF3968AC75; Wed, 6 Oct 2021 13:14:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F20B68AC0C for ; Wed, 6 Oct 2021 13:14:20 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id 145so1917549pfz.11 for ; Wed, 06 Oct 2021 03:14:20 -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=WR9v05pq63ztdvj/msD7hTaKYUGV4YkccpxewFYdods=; b=cLlYrnYHlzHnLDD40dnSnGSGayEmDYTmdUJD7UWTTz00mNCrDYudoC9dJWJfgzFmA6 0ziyPDiOagEDQGfErTmHnMzlSl1rXuA6Iiu4TdCO8qLj6AY7pqTRsXW746NCsrx+qcnl f2MD3KGGIbRo5R/TT4MEJR8LKVnslerx1xu5JjvH91wzqDHFtLtnDHQmTw6ggPfkGi5p 3koCAm41MTX8zPRBHK+/8pIIH/l2q0zMsXa8ohdsXA+qbOa8k93wLORY7NFBwrxZ8eo4 bkXNg0zKWZO8kqXAtDC9W5gR5NdlQ3FAIds7cs0n0l2YDzYnBb1YSwBMunEnvkwSTjYB m2Jw== 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=WR9v05pq63ztdvj/msD7hTaKYUGV4YkccpxewFYdods=; b=n3tUDDOmHX/Zte2y4zuV1CB1y2/RXJyYmoi4361Nl0p+pULlBdl3/KfDrUuYavoP66 hbRVRK7B34tkvdbu/Ko2JyjNWPhOUskBO889+lKpo4DIlp/ztOAho5UYEk6KFDpvxl4s YALyspbBRwu955QRlSqmVXUTORrKrMuwpTUKYp6wDdjU8FXLsObQ4ek0kcDZhO+0NNzX VeY/q65bB+H0Qz7IbjM2FCFPiojfN+qmpS/rDhzCysbz0hBKIkCwUuJJGLlPsPBQ/6ll WunkjuBI/6Gqe8AnQkOBgEOZbme4Hoep/jeAxK9cSena5vDC2gMe56Mg3GHfaeD0iyHc f1XA== X-Gm-Message-State: AOAM532vWs39OqtIx8r6DcA+KepD47OWLBPHC/AOyuPi8LLirlb4lcLw HD7uBYXHXBxEQ9AglnRNeHZVoQclRGk= X-Received: by 2002:a62:dd15:0:b0:44c:61de:537 with SMTP id w21-20020a62dd15000000b0044c61de0537mr15685712pff.57.1633515258598; Wed, 06 Oct 2021 03:14:18 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:18 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:07 +0800 Message-Id: <1633515251-5156-4-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 4/8] avformat/rtpdec_rfc4175: return the proper value 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: K5q0AfdYc9PV From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 97939b0..46d30ed 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -105,7 +105,7 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, if (!data->sampling || !data->depth || !data->width || !data->height) - return -1; + return AVERROR(EINVAL); stream->codecpar->width = data->width; stream->codecpar->height = data->height; From patchwork Wed Oct 6 10:14:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp219389iob; Wed, 6 Oct 2021 03:15:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjzVVIfTFj6d0B9HtjCZvYTlNGwkV0ztOrLZCDhrWfsz3Q1brxT61IuVA637nfe8B/vlgO X-Received: by 2002:a17:906:3805:: with SMTP id v5mr30554229ejc.440.1633515314410; Wed, 06 Oct 2021 03:15:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515314; cv=none; d=google.com; s=arc-20160816; b=FFD6TuGqSfwg3hOYXxiQGW7nE2V7pI1FXbFiPSWgYWE2pRpNRcTgZDoPEyy5fQJQT1 0qj+Pc/Wp4ISVBurdhXHkCfxpf1KqPMqIB6iTRlJ6uHC340wju/rEyo1beSY0XZcpoSl qM1rLE7/YMFWnOS1gFQczUJ6DlflE78Y9nQk+O5rp3Ip1T0UANUCkz0CJEclB9MNjYA1 Jd8RSyGSTsf4hA/aCxOBjYQL78hPVTHA9e2qf0x6cKze2DyddT5UNNsVji7OENfJxSOv gd3il1bg5AzjdVOwIgaaNdx/SPDMXnA/R2SKN6p5ZAroF7fMlQ4bVy5/Fkj/LSirnKfk BrMA== 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=TuXSpxJzvnsK7JmpnLdTKzGw1f5oXhEVyqT5tjBCsSI=; b=DCqXL7oqxD3Z/OErNwC0dimpdJqVc0y/M8dsfBVIHCVfl7RZlISb7h3U/c5Khj2NfR SRMNhxWgH040RO8un6oqTUlksGbrFv1+janfqMlTPWjnSSywsIm94eue4Jbew3a4blZe sPtnnPhGGjmOE4SXDkiQ4zQSqpIdEVg9Uztrj3TH1GiHgMn3GlyrzmPWu8Tm/qUVnyNj eebZYbJiqf+yamLfxGEXbE5/n+MVhRmb/XEdWeBW8/fx7rO5lCvzCuqbImcw3Ws/hsiY ek+PCoXNb+OpZMzxwEXGixw42MrjC2L0fUOHoBn2Bwlbh7Ztb6DUETBfnGSNCaV6CRzs xT2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eWEsylJB; 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 dd3si24787976edb.123.2021.10.06.03.15.13; Wed, 06 Oct 2021 03:15:14 -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=eWEsylJB; 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 0121168AD08; Wed, 6 Oct 2021 13:14:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87EF268AB51 for ; Wed, 6 Oct 2021 13:14:21 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id q7-20020a17090a2e0700b001a01027dd88so2078883pjd.1 for ; Wed, 06 Oct 2021 03:14:21 -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=stvOrMhh8/2wUPJxqlNzcOVrmmkGoecaCOdwMB9moB0=; b=eWEsylJBn5eAKgd2HF7lVRFMCwJr73cpx3nSpBBBVBXLEZZzqtI+7XvyDgc/ynU1oy GrZ33vxx6QzlWt2gpA7A+WHRTGTRmkXpZgYtna7UsXzA8r32nlEE8wu0u3izi41nCcxe TSNrMhrsbIdZv2S7oNSOMFQrgmpEgqDRDMjJJWG3VKVGLXoC9CEbK1+jeLUuYUEo3guk LthOccrMBAGAUlqRvDCj5K7FoBprdLlFc19892R4m+LRCVJD5V85CGI3foAt0dVJtV85 US22cbEL05mAvXbZhoq+uwnLj+4PvdMA3+/IrGOEFV/p6hAfycvh62fvOv3m9jWhF3vt 5WZw== 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=stvOrMhh8/2wUPJxqlNzcOVrmmkGoecaCOdwMB9moB0=; b=vyY+2LRvETTLEUKc72lgnUYogIxfkJQo67htGdZc9O8voJAdiekvgyyqpTccCl7CiO UE7a1QGIvXkhfYk57008XC63egks7D3UtRjb/5V//9LagjNX5QQgRX1o8VggCH0WQTSr jmFo8pPw7NtdIBmVO3kiFsEM3R9ns/r1BMCpU+ndBl7eeyqYmiDN1v5NbggxdWjOpyPG hTFfA7NVdf/6+F5CEACF4NmASC7NCcTElpMEZujsaBaMEbmLtKbMgs5jpp12yXUvJiFa 0q133vFudzcGbZwtghhtaryNztekcG5jcx0WbotyOn01O+IEZaWesk3yfeVZ8GCfcci3 ZZyA== X-Gm-Message-State: AOAM531cSgGWYaRHtwzrhiY07/t5pdSnvxM7WQbR+FQL8NCHSYEb9sZN wIVKNggjMPE5U0ZQKMr6bkF2FDEFyo4= X-Received: by 2002:a17:90b:28d:: with SMTP id az13mr9853416pjb.30.1633515259765; Wed, 06 Oct 2021 03:14:19 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:08 +0800 Message-Id: <1633515251-5156-5-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 5/8] avformat/rtpdec_rfc4175: add support for exactframerate 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: FZbb/b1nc/aK From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 46d30ed..367567d 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -25,9 +25,11 @@ #include "rtpdec_formats.h" #include "libavutil/avstring.h" #include "libavutil/pixdesc.h" +#include "libavutil/parseutils.h" struct PayloadContext { char *sampling; + char *framerate; int depth; int width; int height; @@ -45,6 +47,7 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) enum AVPixelFormat pixfmt; int tag; const AVPixFmtDescriptor *desc; + AVRational framerate; if (!strncmp(data->sampling, "YCbCr-4:2:2", 11)) { tag = MKTAG('U', 'Y', 'V', 'Y'); @@ -69,6 +72,14 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) stream->codecpar->bits_per_coded_sample = av_get_bits_per_pixel(desc); data->frame_size = data->width * data->height * data->pgroup / data->xinc; + if (data->framerate) { + if (av_parse_video_rate(&framerate, data->framerate) < 0) + return AVERROR(EINVAL); + stream->avg_frame_rate = framerate; + if (framerate.den) + stream->codecpar->bit_rate = data->frame_size * av_q2d(framerate) * 8; + } + return 0; } @@ -84,6 +95,8 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->sampling = av_strdup(value); else if (!strncmp(attr, "depth", 5)) data->depth = atoi(value); + else if (!strncmp(attr, "exactframerate", 14)) + data->framerate = av_strdup(value); return 0; } @@ -112,6 +125,7 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, ret = rfc4175_parse_format(stream, data); av_freep(&data->sampling); + av_freep(&data->framerate); return ret; } From patchwork Wed Oct 6 10:14:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30950 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp219525iob; Wed, 6 Oct 2021 03:15:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCUTWz66pCLA2H1q/xNE9vy168tZy4897IK9to3YGFcugxsnOeZs5v10sluWW70gF5kIFa X-Received: by 2002:a17:906:1bb1:: with SMTP id r17mr31017807ejg.533.1633515323272; Wed, 06 Oct 2021 03:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515323; cv=none; d=google.com; s=arc-20160816; b=iXcqWormqQT77CDrKv/pyAhoz4nlFzzCSSFMzlabJDV+3mNzPYzrOgqdyVOyMHbYoC KsmYnXnCVADobIhz3bc+D3ii60wIkC/68bfjQ9BrSlZmw/24hkqOT0mordjEB9WvOWqU WlJJi7eUlbpecSPwejz1N51o+ACdTLR+ef5ydV1JyeCi3IJOmabflAUQn29sPV8AqANy r4aPXk5wVbvt6mK6uLRXmlhzPKlHsC/igoyy21Ch7cE5fRLRONxiEnBcA7S+0k49X6HM yevrCnrg4Mw/8cz4Vq6Cpbx70CcxreYMA9VmqqtE0q6ZSHR9ZaxIhoJVN3e6m8ZQoFNt Jt+g== 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=HMBJ7x4O4oREtad9+4nG8PeqKaYMVmTBZW00dkSMepY=; b=BpUS2+g/eEqAnJMuBGy+ysSY3XPkKC8y7hVhcdkE1ff6EFm8No7PfMVVrlpJ3EmP8V 36oeAUFRaF3DEALN6NKTuibkKtVnjEO9dE2r5gqq47PaMWClxAlJHt78DA6zboZdT4ne 2JXa/8Tcz7/PbCINNbZXxa3CXmK8cs3coELSSBvxgBShUwGDz3VanpM/R1CA1fgkBexq FHlSC/tN3wWmTsWK/jn3dwPs50hTVhAB6MMxUYRmZW6rhzH/5lONNuQ35ZvbDZKrM/3Z bq084torI7WehKaThdL4N66saWG8fcMXX/YuKp/BlIeSgStvH/aS0prC18HXDIdevdPX 9CWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VgRRg+rr; 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 m9si16840406edf.531.2021.10.06.03.15.22; Wed, 06 Oct 2021 03:15:23 -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=VgRRg+rr; 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 08F4268AC65; Wed, 6 Oct 2021 13:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD58568AC87 for ; Wed, 6 Oct 2021 13:14:22 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id s75so2048645pgs.5 for ; Wed, 06 Oct 2021 03:14:22 -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=GEkGW5ggWr2Njc4vCyDp5c1uV6/esEbt77Jd6F+ukWE=; b=VgRRg+rr1sy7iRK0HSVUACWstbGLSoU45XT+EQg3WqE0FFVwJ1YY5wxrO6+5wvvdqq 4usS7FgHydCEjEHFM/h7+RPlnMTr3YyUpdo1JFZVfz3wF7/JRuqXF6J+CRQ9iULViZE9 zlMGY2IUmkgPjzDGCPqR5kUR39i6DXaKFdOSAdH2heOaQlSD7+Ej5uzVOnQXbRCLEbUO s0OJINydUPjqfROlppvb2vKbyb4YxaA4vfAushNKlRlfYF/uPJucZMa5UlnLhIfTtEew oIRYtQuRCC0mGVoxrTssAkYnJfvLESCAOxGKR0YIaN2F/orIoSK6eUZk8wzwgEU+8wtw XDSg== 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=GEkGW5ggWr2Njc4vCyDp5c1uV6/esEbt77Jd6F+ukWE=; b=oytTSvXyxjuQVn8ytv4FcVqhCFvdbUlHh4R4jacCF3v4i9DVzCdIfg7tns00Y4/6v3 +WZET+0LzdMwuri6ObGUyjbbugFr2psF4aQ2HgUvxs1JkCpQGyJh5at9dr3pUHh/oXMW I9w/KDU3NlaJVFgxmnQn5vRN60507PD/jgoxLj9Xd06VnRY3WHhEPpLAKZW8UePNEESY aDsHS73G29Ivb59rPeGgg3uTfySYZVjNktIiU//C7Uu393GjPvHM8Fib6zwX3BX+8qQo PaQZDSheKA6QnVPingzkG/ItygJsWVyW4ik28gDyNqZzKQhSRYVb3XWcKsXAYmvfP5MN HuJA== X-Gm-Message-State: AOAM531nmDfQrWkA6jXuj+VYqUoX1ke47sx9zHpLnpAndPE0yMfdTQpD gPZBh100dcRcILx5Zi5oZbP82fLf7IQ= X-Received: by 2002:a62:dd84:0:b0:44b:b54a:c2a5 with SMTP id w126-20020a62dd84000000b0044bb54ac2a5mr36926128pff.11.1633515260943; Wed, 06 Oct 2021 03:14:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:20 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:09 +0800 Message-Id: <1633515251-5156-6-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 6/8] avformat/rtpdec_rfc4175: add support for TCS 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: 0IAUKBQRL66x From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 367567d..db6b9b8 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -30,6 +30,7 @@ struct PayloadContext { char *sampling; char *framerate; + char *TCS; int depth; int width; int height; @@ -66,6 +67,21 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) return AVERROR_INVALIDDATA; } + if (!data->TCS) + stream->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; + else if (!strncmp(data->TCS, "SDR", 3)) + stream->codecpar->color_trc = AVCOL_TRC_BT709; + else if (!strncmp(data->TCS, "PQ", 2)) + stream->codecpar->color_trc = AVCOL_TRC_SMPTE2084; + else if (!strncmp(data->TCS, "HLG", 3)) + stream->codecpar->color_trc = AVCOL_TRC_ARIB_STD_B67; + else if (!strncmp(data->TCS, "LINEAR", 6)) + stream->codecpar->color_trc = AVCOL_TRC_LINEAR; + else if (!strncmp(data->TCS, "ST428-1", 7)) + stream->codecpar->color_trc = AVCOL_TRC_SMPTEST428_1; + else if (!strncmp(data->TCS, "UNSPECIFIED", 11)) + stream->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; + desc = av_pix_fmt_desc_get(pixfmt); stream->codecpar->format = pixfmt; stream->codecpar->codec_tag = tag; @@ -97,6 +113,8 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->depth = atoi(value); else if (!strncmp(attr, "exactframerate", 14)) data->framerate = av_strdup(value); + else if (!strncmp(attr, "TCS", 3)) + data->TCS = av_strdup(value); return 0; } @@ -126,6 +144,7 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, ret = rfc4175_parse_format(stream, data); av_freep(&data->sampling); av_freep(&data->framerate); + av_freep(&data->TCS); return ret; } 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; } From patchwork Wed Oct 6 10:14:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp219841iob; Wed, 6 Oct 2021 03:15:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPOvP9g/JEadnqRiWcOqS3NU67gdQBb933KB+/eXlXZu7iZzCDeyOSpjPShDOJgEJfI3T5 X-Received: by 2002:a05:6402:4d1:: with SMTP id n17mr34021873edw.337.1633515345885; Wed, 06 Oct 2021 03:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633515345; cv=none; d=google.com; s=arc-20160816; b=evpZOQXaixm70GeBpaP3uiKifZSocsyBzKIB7RQ1HCpQ8Upv9alM08U/RAmAyQoI+O tWXl/z50mzpqC2vxJidunEauM2O95+TYC00YO2pH4uURHuI6blWm7Fv8w4zBCFk2Q1NL QVU8EN4U6XgCRNQbpRxpeqnPI6nbFdQMOrV4PS/B8bBWc8+cR8rwutyifbn6N0Mee/C9 bgPkYyXA+6aBIbWhuqwj6V6RMjPFFzxSTCQuO9mNA6NxE2pg/6lAm/1mcXyAEGnGOq31 gRDoOH1qN6JORiyYhM3plBwOtjFf3FVI8Fq0K2nGDND8fRuW5sBbMUySfcmjO2YRUG0/ cfKQ== 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=Z9R/DYtuH6SSkkQxp4Z/j4gvwEddO0CvlDYVlB1N7Pg=; b=WGg/jo/ffRIGNfrNLdbTBs3Ts/qcftsiyfn2R8rinVHyrPZPB655qVA8v95DOTNOIa 9Lxcnkmmv2Z14jmhWolwll7Q+Qeh2rrypyJY2qIcqjRfXvp+qbyc04qx5IMfNCPhaaZN 2HHRYvD3BPfLdUdSkXNTz/uK7QVDNWUjJvePQDjBSxjYUOCSsxPrjxHj+3pLG7VpDl0E 1FZC/DFPBf1ZU6lg86I+XMwNVjq47eZzqggp6peg+Qbg+fiFMyoiCRSHP5JMqxe62wMx 6N1v2JPG3flCQjpyjhaAieyVpO+WYRO0JpcWs3KfwhB5IAsFryVcWcUY8m0ksJn+Sk7j A4uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ONgUd7d1; 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 o13si5445428ejc.468.2021.10.06.03.15.42; Wed, 06 Oct 2021 03:15:45 -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=ONgUd7d1; 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 58F6768AD9E; Wed, 6 Oct 2021 13:14:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11FA368AD0C for ; Wed, 6 Oct 2021 13:14:25 +0300 (EEST) Received: by mail-pl1-f179.google.com with SMTP id w14so1380365pll.2 for ; Wed, 06 Oct 2021 03:14:24 -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=+t06Qf33rOdmiHiDGZRtI0RzW22KjPY6fWzD1xCY0MA=; b=ONgUd7d1qcRJxsH7UbdTEJfWB6zZBXeJKpbIBCSUAR3Lzr2g2jZQL28jPD41JaFfPn pd/XX5egwG5DHkH5cUqOV4LyH0OCFJYvyfM1fjMjoOA6kZcqFNenjlV6Mi2E09BkHmUd J9/y1UOsaxhHMmBSZc5r1lNL1z42esweN5RRcft48jjLuR/Dp0MLTLJgkgdtidPhv5f+ vSvdNiNX903Gjv8jBl9M4bSB0YDwdTTvmexJKxVXDDi185tboXW+B64XCYw7TvK7JrGx /nXHULOz91swyKB8S7yg+iOFBMqAz1lGH+aBzsmN8BOuO9CQ5NGqBgSG9CK1nIhXEQqD qhPQ== 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=+t06Qf33rOdmiHiDGZRtI0RzW22KjPY6fWzD1xCY0MA=; b=FEKFPUh49BBBMN82BWp3RofFbYsB8qzV14rDpeBg4QBpWI3aGHWF+LCA+v6DYYv1zt /0D2jqcs+qXY2118BV9TCZViO7YeYn6kH5ZzzQQpBAj2T6YHZV2M2Lm3M0VGMgUCapne txu2JpyIGOoH3scO3DQo4JuncU3tbcNBUeOqRHrhYnp7fEKQh3+ah6K4G4SaPOTZYG3W fOICDeiubIDS3r3P/73wyqdm2EHvKG1jNK0KKDKDzXI8hm3G5aLxaR1xC4yP4lIur6MQ Yq0VWJCIUWRfxyO4AHJ8Fy5gIwmGPtgvA32B4KJIAR3C3+1GnKE2lhIx3D9KOPjraZuf SmGg== X-Gm-Message-State: AOAM531TlxSh722M8N4qW0ZMkNI/09WuT8yGb4E0rFlmBu6tXLs8+g+/ 9Dd59rH81gtqd/3QuB23p4U8ssp2lPw= X-Received: by 2002:a17:90a:e508:: with SMTP id t8mr7236419pjy.82.1633515263269; Wed, 06 Oct 2021 03:14:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i125sm20338309pfc.36.2021.10.06.03.14.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 03:14:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 18:14:11 +0800 Message-Id: <1633515251-5156-8-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 8/8] avformat/rtpdec_rfc4175: add support for RANGE 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: P4EMJa3DfFA9 From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec_rfc4175.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index 23a3f4f..86ffb38 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -32,6 +32,7 @@ struct PayloadContext { char *framerate; char *TCS; char *colorimetry; + char *range; int depth; int width; int height; @@ -97,6 +98,13 @@ static int rfc4175_parse_format(AVStream *stream, PayloadContext *data) stream->codecpar->color_space = AVCOL_SPC_BT2020_NCL; } + if (!data->range) + stream->codecpar->color_range = AVCOL_RANGE_MPEG; + else if (!strncmp(data->range, "NARROW", 6)) + stream->codecpar->color_range = AVCOL_RANGE_MPEG; + else if (!strncmp(data->range, "FULL", 4)) + stream->codecpar->color_range = AVCOL_RANGE_JPEG; + desc = av_pix_fmt_desc_get(pixfmt); stream->codecpar->format = pixfmt; stream->codecpar->codec_tag = tag; @@ -132,6 +140,8 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->TCS = av_strdup(value); else if (!strncmp(attr, "colorimetry", 11)) data->colorimetry = av_strdup(value); + else if (!strncmp(attr, "RANGE", 5)) + data->range = av_strdup(value); return 0; } @@ -163,6 +173,7 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, av_freep(&data->framerate); av_freep(&data->TCS); av_freep(&data->colorimetry); + av_freep(&data->range); return ret; }