From patchwork Mon Sep 27 02:57:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30601 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3745798iob; Sun, 26 Sep 2021 19:58:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaXulXcA8FEyTa85TFa4AATuOpcW7PqFeK74+y6tXU09oj4bRNUQXJ5w/Bc0sX2HuRyFGz X-Received: by 2002:a17:906:7145:: with SMTP id z5mr24356173ejj.363.1632711501345; Sun, 26 Sep 2021 19:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632711501; cv=none; d=google.com; s=arc-20160816; b=Wp7oavjws87x+tM/2A/6yXnog8TW4pY/q41mQFUFWxrQF7xvnxI955yGZeZdl1phkE q9p7Eo7eVk/wiLzvHRgJTb3jH674SEsXB0665g8HhBDWLCvd6hZgyvdoaen9Fk7auQ1O 7kwUl5nR3XVqAW9O9pI1g9TwTJGtLc5RI2nIdrLNJQxYGrQM2YGNIOKo/BeIgE3Bu4Fk BTEg1KAu9Pv4Qt+/sPh0mYm4bwPdIihmTy01/nJS5A3kVZfrQpUXeV41x/k1J0FdPKWs DcAfwKDfUGw6QCwiC1NHAw65UyB665Jo7Q+320s4aLfS2HcjnBoelQxrP0lXNXpMszlt j8yw== 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=vdeb3e0vQx3YU71NMwZROiriUOnED6FC1AYzqH+1B6w=; b=GRPZEQjKtS1ifWbyXqbxgZPVmIDnx5Q6e9BGtRIDwwA4KRCWiVP29D0WzxM9zlD11W xBbQhopqdJHpi3QRZnJ+vkuWMQaxGXR7qGf+Rmn8mi/vZjOqUnzU93EH8cd75ixCxfqr cJMTEDatnPaz+izNO5BNtho62dFdBz7fagLBMKUF06MfIRf+GYfEp9o3ByFsco+tf/E5 1zRr5VJ1Da4ZPC+Lveqlp3drDm6CjgWNtZ8iBjxgBWe4cF6893YAI46H+OIP18F6/5Jk i/iVVzU9bpyhqGZlodsnYoLMcWJWpqvPEFwH7dvi5VnnMVoWGdE77lFetH6BSUUqoTqA nuUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RQlZjqC1; 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 13si17730237ejg.193.2021.09.26.19.58.21; Sun, 26 Sep 2021 19:58:21 -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=RQlZjqC1; 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 A7F3D689AA6; Mon, 27 Sep 2021 05:57:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FCD2689A1E for ; Mon, 27 Sep 2021 05:57:40 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id w29so47785329wra.8 for ; Sun, 26 Sep 2021 19:57:40 -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=bSLyEtHhUtEH4dy/1v77qsUJtBR8gAC4AMnAgMHSjuw=; b=RQlZjqC1oZ9VDc7iM2yuSvbTp1gvEe72B79bRgSe9aYHIlvKw/o6Q+bnywTSv4JqEt KVjw1pWUh94iy44xM/4gOT/L4J2Bcw76Ph/0lrQTeKwWPiuVgkRGZCnmFTVwuR7oRD0z p86KWNjn2sJCl5dtwVW1ylNP/TRWP9F8gVtMk28Ra9KrA56fEPr9OLjNnNB5SmY8MUoi mxY1ybnCC+PEdV6hcx172NyGRzUfGkMNYfKs5UJj0I7ETZZWC1Sp98Zp1kFiCNiQXEox 4JFrPq7B9KHAeKMe5RLsDUnmOBnsfq/UCqKvoklj18j1iA65FjT8PCXjKd0ixhqXg7fP x00g== 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=bSLyEtHhUtEH4dy/1v77qsUJtBR8gAC4AMnAgMHSjuw=; b=vxCLlwCR5ErK4kd4WXafB2Q9h1apv0eWeba+ffgNKpgv3rnjkswRP3U+s0Pdv6cKFg htIMU+OhatLjXthzXVYmRbHJbtXDWf8UflUnfhJc+JX0jHWvAbfgELg9++Fd0COSpaBR WNTVUQkMSrTqLhr/frlkqYwNvomReSlObvPq8AcsERgP1XDdfE53wjbj9Pf79uctTAKD Vy8fi1bxYRtmVcTIBwX0h9zRRGs2IK33TlzA02LBDR10QXZ8qoDQ9JPyQXTg9Zfdxnkd mmymueRpC/YZdCvEsX5nHA/4uVYWnwS7QfVtL9jBaqSZyjM8iv6UEedDdOlbWksE+Tvr Uiog== X-Gm-Message-State: AOAM530mVJmCS1gNZzlPD29Zuskru+rqaIuNh9xC24j6LJ8Un3hGZntQ vE1UcU5lPMiYqTQfku0VL7zB1nppUS0= X-Received: by 2002:a05:600c:a45:: with SMTP id c5mr13550271wmq.79.1632711459328; Sun, 26 Sep 2021 19:57:39 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id v17sm5438398wro.34.2021.09.26.19.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 19:57:39 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Sep 2021 04:57:28 +0200 Message-Id: <20210927025728.285093-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927025728.285093-1-tcChlisop0@gmail.com> References: <20210927025728.285093-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/4] 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: /UE/wFNO+OYS Also fixes incorrect parsing of dv_bl_signal_compatibility_id, which was often set to zero instead of the actual value, for mpegts only. 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: