From patchwork Mon Sep 27 23:16:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30610 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp4626744iob; Mon, 27 Sep 2021 16:17:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNmvELVOw9JrrIC5g62jH23Vw/nB60qG1RXxQNFlFTuJ4XJTA0l7xVXWDWVnR4HpkqlPte X-Received: by 2002:a17:906:ae83:: with SMTP id md3mr3319404ejb.84.1632784635071; Mon, 27 Sep 2021 16:17:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632784635; cv=none; d=google.com; s=arc-20160816; b=fjPOuHEXrEjq25RSIJ4aMHnZ0CzdW8ZV47U8eKdmw5hdjVRNN605xXRCYlLPOVrf4F fwxBA+pzlZYw7ZD020ZlpkF/rGwGbhYbLG9VaKz8smDFAvdboqzfGXQSyI3viuBDpqcZ +GMVu5j+/105HoNTqRpVE3CYlmN/at/0wK38z1i6+83aNSbuv+JpA/uHkSf34+dvQTNM 0td+Xjt+9QCJWkKsN+hz+51Ggsn+s33P6zw48JruzuTcWZIom/iGOc6yauDp6ouveeYm kcKobAKyQmQwZEwQ3Yjso9hmf08DI0VGjBmpCd8E9kWNCGLpY1WyTDkYpnmqsE1apsaY 1MPQ== 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=4XyJHz+TSG/evfpTXityXSH16+AcQSBVKBndr4vyaCw=; b=SzTlaLga1cExPYVI5rDocS/9LqUsFYbekfUFAgnQ3WdpbbLDvNf6QYeSHkOWt5nDNX MirpSeCg4Jc9PGPBwu57HUAST8TD8UHdctVa/fwfehqG6v3IiYzHSERqP16NXvg8XgxZ sjN7bWbiOfdptGmxoXgpCdiZ3Fsj0OAvMwdkeKA6pCVzqb377VQBw0iyiQFU/hTnQSiG 7TjySSMhnG7yfQjM0ltbVAEUucl3uRRNWPnqM8JETkX4Nx7pbC3zjVrHxNDM3mbPEIH0 oGMG8tU1Mpd8aiVZPRBRtU2ctqlXAn760suYMd9QOuvVJLPjzxGpYqiKddRzYCgNREmy KTFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EaS0zSKT; 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 y8si2174361ejk.35.2021.09.27.16.17.14; Mon, 27 Sep 2021 16:17:15 -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=EaS0zSKT; 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 7D88668A196; Tue, 28 Sep 2021 02:16:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDA956808E6 for ; Tue, 28 Sep 2021 02:16:45 +0300 (EEST) Received: by mail-wr1-f45.google.com with SMTP id u18so54702898wrg.5 for ; Mon, 27 Sep 2021 16:16:45 -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=Ne0eZPGwk4gftoAaSU9/RX1GnJWTCw4nsHxhVitdsPA=; b=EaS0zSKTr0x+z2WmNwMG9cwwzGHswAJExC0Tv0Mqsm6xDbdvllgarPdx9eXX5i050P XzGETk+fNVgQhtq5WuFWZypt8DbAtvZc8cAp3cC+NOeo9mBrcOAGna9xoz8R+hX5SPaL 0Je+Lfaweb3CHTcIMA4nos8GlgZUA/t3wp4myNFQWf4+s0RXJ1KFEmiBXiWdmLm4xZou KpFR0DEYrwQkrzN//5NfJMFeuN9NSXVziFXljXAUp7brUWlMKaaTHsDCnTaTTTbAYf6M ke+WeSIbERCO0pktxydxRpLoSt8hgNpnf20UEuOEIcnhSY89wg6L2T4zsaLLbG+Tb+jc b8TQ== 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=Ne0eZPGwk4gftoAaSU9/RX1GnJWTCw4nsHxhVitdsPA=; b=XUK9AKOXcTtD31fXfCHJtfhViuq1DdrTwIfWPq1SKx00SaYhz8qVPAxqi5VBai521m nQZ/I399BHvpS9OrMQ9+aLUziJJZqsrFAEwjg+di1/5c4et3+EXTVUTz+Ph0G/9CaLB0 O548gJqcauZvnCf5IWeOQr52JA3bDZ6hmlEsl3OUBBPF+L/TFFLafBy94WinCxB3vcgW fZtKxrtFHF1zVa0+lWkx95gUQ269yxkfVTC+mFLQ8u951OSuA6JBe4jjpgeZuJnbZffN QZV2lliz3iXXnCzAIEFm0nPSJBBZ8iZJW4wEjAYujoK3hMfsPwQRsvF3lQXU+1pKW6Y2 djow== X-Gm-Message-State: AOAM5331RII+pls0igrz5pdiPxIIC+zLc/je9b5SLFlOMdMwjAApxsea 99UHzPoTcLE06dKfO2nlHoq/jkB0t+Ir+g== X-Received: by 2002:a5d:6d07:: with SMTP id e7mr2822981wrq.378.1632784605240; Mon, 27 Sep 2021 16:16:45 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id l6sm948730wrm.64.2021.09.27.16.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 16:16:44 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Sep 2021 01:16:32 +0200 Message-Id: <20210927231632.306250-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927231632.306250-1-tcChlisop0@gmail.com> References: <20210927231632.306250-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: I6BEpThLPFWq 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 | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da8eee2414..276864be93 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -37,8 +37,10 @@ #include "mpegts.h" #include "internal.h" #include "avio_internal.h" +#include "dovi_isom.h" #include "mpeg.h" #include "isom.h" + #if CONFIG_ICONV #include #endif @@ -2162,49 +2164,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: