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;