From patchwork Thu Sep 23 00:46:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1088051iob; Wed, 22 Sep 2021 17:47:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx03JYunKl7nfjhIj11YFyCmh37FI5PGbJ1f1OjktOMcBMOx3E6rQg5RsPPuvZdL4/Fpe3X X-Received: by 2002:a17:906:c005:: with SMTP id e5mr2228777ejz.480.1632358043440; Wed, 22 Sep 2021 17:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632358043; cv=none; d=google.com; s=arc-20160816; b=bkwKBF3HIKnDV3TBt94l6GXohuBTj1rcaqASZIJA9R7PD7lAgpYOH28MJXg8MxqBTo kzPhh7gtaVcQNslCX7Rm5ZVLg29YbOjtrSu5JYHdFANSIbVykVBv52sdHKakyYfRGFy9 n3DqHJCvFW9HgEaaNOk2xZ5sul4FFlw1XdE9Wgm5lP7jTCAItpwXHX2qLuKIqrn8XcVg OYBXdCg1K9jlMGGaH0PD8QfTHDfJYj/EzAjLmOXIOVlgpwYA469kHs3NsiA2zxYUmvZ8 bu+TTBDMlhmqQoSh7wQEHU38gWSJnQpKso2nm+jHuj0fohVAuq0T24lUvybGhtFf7fcd nu2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=BfCXdr3U2WkC+LwEX5efq5jAxRJeF337xbUyKPFMhz0=; b=xCyLkF1hbt76U0Xw3VHGa/KBaq3ekCyrTXj+LgYzt/A0la0MNtk3Mnoq8WKVK9wd25 YXuDwoFq8oo90mCEs07izqmAVWDlkUKfQdKQHJb/WOtJTGHXONeyYptSKdpF2FtqKz/p /WUvCtcFiCZ9SgWjyiRZ+YJ9a94pTBsTbltGeWP5xEoq82I+ZHWn/d/8FJ/16/WcwhEO CYCjst48HSvLkGYZqRpJqxY4Gd8MSBYcDrYUi+yVK4AjyuabJLnH9HrFBLxEdj0mNShI xgIn/iFEYjYa7R08w8jTDF3rAjYCamTLF8t2ozH9toq6C5xVMXwzYoo/tP+3TnB8emXR 4w4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="VC5Sj3/f"; 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 z5si4243833edr.302.2021.09.22.17.47.23; Wed, 22 Sep 2021 17:47: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="VC5Sj3/f"; 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 0549968ABA7; Thu, 23 Sep 2021 03:46:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76EC568AA90 for ; Thu, 23 Sep 2021 03:46:30 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id q125so1695042qkd.12 for ; Wed, 22 Sep 2021 17:46:30 -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 :mime-version:content-transfer-encoding; bh=Euq4+44rGSLVFC+XbvG5/bqVdQlA4GYArxvUvDxFtWc=; b=VC5Sj3/fMEbwPaM2txdai2kSvvMMmO8Egc6Eoo7CH1+tbx2rVV32y4bPzHtGFmCO6u r17VVIUras8B2tOCeqLxZ7Y+Vn/PU+tlG96/CdbQ5H4fIJWWRckEbyy94JWQ9Do1zULB 3uy0qKsZvXN8cpYSbuT+l6p1jOPZBY3aq7Tz7ZsynFxAHn8UJfAbVKsPH1m7iRrOikAq 7w0w1LJILX8kNQXqvC6QjgMaZpab728aLZoa03K8KGmF2LPtcjvib4AU9BEQnx/b1glV 2fwJb29WrCxKRg7kylaLXCKqQd6bUkhWCMhi7P0x37EACEuCzL0YNzs/H971cTnigfKJ wNiA== 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:mime-version:content-transfer-encoding; bh=Euq4+44rGSLVFC+XbvG5/bqVdQlA4GYArxvUvDxFtWc=; b=MNOQFwZ1yZ9EwNwswgRjIGICYVj5d/Vl1sNxZ+oTlJ3siji7veQAD3R6Uf+9iep4yv 4D01RTcJEBWRt+shwHod/5Fi9UOwvoGUuGAiq4HkPXCBBytSh9Z6ip2IIAeXlAhdcroj 5FXoY0A3E9IptFJUudsSrf/Gt31CWpyqR/GmS6ls+pQ67RtoyUp9OpXjfj7MT3z7EywS 6NqZwLhaEowPLGEDbEmp2/f0Cui+fFXh84eA/8VNDM8b/oklwC/zvXDxCt+ar2MHndF8 EzH/ThcIac0xUOfh+tBTY1Lw7bLLbriDCDgwfjWK5x8naIgtcjjhBOPiCPObMxt0CPwd vGNw== X-Gm-Message-State: AOAM532q7GxKScwghB5F4G/MQEouKOlxs5ia0HWNlyeVS2PPGeMo+dn9 XwMzMUzPDMK5Tt+n5Tm1zGmVID0epOhV6w== X-Received: by 2002:a05:620a:4da:: with SMTP id 26mr2267827qks.178.1632357989229; Wed, 22 Sep 2021 17:46:29 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id j26sm2511618qtr.53.2021.09.22.17.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 17:46:28 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 20:46:24 -0400 Message-Id: <20210923004624.476145-5-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923004624.476145-1-tcChlisop0@gmail.com> References: <20210923004624.476145-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/mpegts: Refactor DOVI descriptor parsing to use ff_mov_parse_dvcc_dvvc 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: quietvoid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Kdo1A6JHqhRk Signed-off-by: quietvoid --- libavformat/mpegts.c | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da8eee2414..19d26ef375 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2162,49 +2162,14 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type break; case 0xb0: /* DOVI video stream descriptor */ { - uint32_t buf; - AVDOVIDecoderConfigurationRecord *dovi; - size_t dovi_size; + GetBitContext gb; int ret; - if (desc_end - *pp < 4) // (8 + 8 + 7 + 6 + 1 + 1 + 1) / 8 - return AVERROR_INVALIDDATA; - - dovi = av_dovi_alloc(&dovi_size); - if (!dovi) - return AVERROR(ENOMEM); - dovi->dv_version_major = get8(pp, desc_end); - dovi->dv_version_minor = get8(pp, desc_end); - buf = get16(pp, desc_end); - dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits - dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits - dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit - dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit - dovi->bl_present_flag = buf & 0x01; // 1 bit - if (desc_end - *pp >= 20) { // 4 + 4 * 4 - buf = get8(pp, desc_end); - dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits - } else { - // 0 stands for None - // Dolby Vision V1.2.93 profiles and levels - dovi->dv_bl_signal_compatibility_id = 0; - } + init_get_bits8(&gb, *pp, desc_len); - ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, - (uint8_t *)dovi, dovi_size); - if (ret < 0) { - av_free(dovi); + if ((ret = ff_mov_parse_dvcc_dvvc(fc, st, &gb)) < 0) { return ret; } - - av_log(fc, AV_LOG_TRACE, "DOVI, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", - dovi->dv_version_major, dovi->dv_version_minor, - dovi->dv_profile, dovi->dv_level, - dovi->rpu_present_flag, - dovi->el_present_flag, - dovi->bl_present_flag, - dovi->dv_bl_signal_compatibility_id); } break; default: