From patchwork Thu Sep 23 05:01:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110901iob; Wed, 22 Sep 2021 22:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTve69Tb48K+7v/+qVE6Xy4Y2L0yMn4lslspd3nDN6cEmLxyiVKVzT2rD2WBeHKmdXM5lI X-Received: by 2002:a05:6402:1352:: with SMTP id y18mr3335708edw.122.1632373351165; Wed, 22 Sep 2021 22:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373351; cv=none; d=google.com; s=arc-20160816; b=hqAadmCrav3PRg9+ZQ4A7rERpxtIXowgHAd59QeCkZojeTw1YP9kCyEZDU/OZp1nuf rvNsfGfGpZt+LnIwGcnMFVKC6axrtzrayDX0ePYwswJ2qTeuvakMmv5I8BAcOYHRQHIn dhhvXfKRqeO6eY5Y+72ORwg8HzyUq9GNG3yWQ98bng5gd60qaEjdwTIwvnmyyXfEBFM5 sBEBemp/u8BBh6eTGpz03pQgO9NYb1HkUx2b34g4Sb+e1VYtQoBsKdxD9aLFqDqXa7Ll cp04iKyiIsm0ahn+RzJiHkkcZ/J+TefgbwcEWte/o+Se2gkE8GjDvHEufuWlkxcSjtf1 /Ojg== 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=0mfn8bcvePGsA/a144xqiQRL20zeTaL8vzQJgKSKLbc=; b=Hwlvhr84cdFLiNmlVr2W73pEJp/4GlzbGDiSjWRRi4YTjylH7ws/TK6ucIsFIZse8C Mju1gn3qExUaD+5TBIiHnZsk/hoc2vyx7h/RTUtxHA7uZZ56jjM3WOh1PzqZUbEItmOO 5XbMKOkwa2eWsw6+BTT44vmrrR4k6SF9P8jZlfWbQz2+PahH5hpuotblmS0eVe2FTu0B gzKw2UxkSuv+of6mkRdPwbGMNpg+y/3iRVEE8S4DZ6ZPf0pNRB0ejKXQ1x0xDeLQ/y7S EM8u0ObI1RNxlp+lbum113pQV9XMRD65j/tsp4/4+tw8A4GiOSwHN32TK908WmMkPBtJ dxvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UJ2bpglr; 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 j22si4676905ejo.706.2021.09.22.22.02.24; Wed, 22 Sep 2021 22:02:31 -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=UJ2bpglr; 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 71DE168A6CD; Thu, 23 Sep 2021 08:01:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB94568A4C5 for ; Thu, 23 Sep 2021 08:01:24 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id e16so4989041qte.13 for ; Wed, 22 Sep 2021 22:01: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 :mime-version:content-transfer-encoding; bh=ZKdqrn78xX4MQ1KB5xCUqaPqXmMaMFjvTAsUyoWfmeM=; b=UJ2bpglrDYB3Ii5VZL9xc/8xfvyaofm7Ze3kyvZpE3bGH3zLxGhZN1/krS/x57AwXg tuDC7miFeHBpmEVn19k/KitfzQYFJ2cXCEidL9Oj86PNECdJUnkq6Pbn6OUEpntZEvDm puL0PTDaROPh3DsithwQ07Egb7D7pkjYfA0g4JmJyq1fbfq4LHebE5ivGqZmqaVEz494 5sI+gtM0nQpyKBW2p5wLVGE2ZjE86ISPiV5YR1PyCzusTEjJ5rA8F9PAFanE/tae1nSM Bu+QayVom9eAFuJM4xELmnummtzz68jtBZsFDKEAXcg3ZJKUuf5iTNkq4aWXWTl/86yC pPvQ== 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=ZKdqrn78xX4MQ1KB5xCUqaPqXmMaMFjvTAsUyoWfmeM=; b=0P8Ra/cvfVUVppsIdHMKEgdHlXZAQ4SgUWvJnfjPpgdNpGYniHhOwx9e/+fu6yfeKu /DhilisfUv8GnbfWlQ4A7nIIYRFTCXgno3+4d4VSWRJELnBJeM7Kgld1LZ6JGB05qyo+ QBNyWbJvBAGczkMWSDddpg+NCnVdnhOOAqbT6x77UNr8KA+ug+OjbtztEwAIByEAB3lU eIXSO8rqXBkFRPrtiO5Qum04pQAyw82T/R1M7S4zGpA6a9HJRwnFaYyoM6NQ9FcaSRyR 4vcB/hNhPInxt+KpwOmsPMKonGbbRnn9u9M/yHoL98sUPSk0H1IG5wm8oYGlayIW96Zm M6aA== X-Gm-Message-State: AOAM531rbA+aG3eQ1VySnXrIW8tmbTf/9+yRN3z9ONUtPAmlDiHK7DTQ P2R4uthcWVxpwSF5CrlZNFATbm1WyjAvEg== X-Received: by 2002:ac8:5492:: with SMTP id h18mr3092874qtq.152.1632373283417; Wed, 22 Sep 2021 22:01:23 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id q84sm3427097qke.3.2021.09.22.22.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 22:01:23 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 01:01:09 -0400 Message-Id: <20210923050109.692356-5-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923050109.692356-1-tcChlisop0@gmail.com> References: <20210923050109.692356-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] avformat/mpegts: Refactor DOVI descriptor parsing to use ff_isom_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: QPa3lAWmSLTi Signed-off-by: quietvoid --- libavformat/mpegts.c | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da8eee2414..75ef59d186 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -39,6 +39,9 @@ #include "avio_internal.h" #include "mpeg.h" #include "isom.h" + +#include "libavformat/dovi_isom.h" + #if CONFIG_ICONV #include #endif @@ -2162,49 +2165,10 @@ 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; 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; - } - - 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_isom_parse_dvcc_dvvc(fc, st, *pp, desc_len)) < 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: