From patchwork Thu Oct 28 22:33:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 31247 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1025517ioi; Thu, 28 Oct 2021 15:36:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwOwDoSLpOtEC2dUWojUKIzLduCKq/60VsrBNXUA+jsAQUHAYOSnpvPwwUzWqgNd/5dpAd X-Received: by 2002:a05:6402:40c2:: with SMTP id z2mr9946535edb.41.1635460561915; Thu, 28 Oct 2021 15:36:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635460561; cv=none; d=google.com; s=arc-20160816; b=J0L6RShsVH1+EtXgg4pPx3XZ+csGhU5Rd7Vy5kr4LfCoIthoGbtQ4FdFz0j0xzLzul uOUUUfk3umPyF+suTVDH0OlGg2cVKQ1f75i4K3eVWb3c/GfHDPhlBJPUeEPGNqx9Sleb 0739V0ouuGYttjOTeEoZB97jvwt3nrrkRqFW82KOzk4sNBFDRwzOBwwh1OBe4GDH11gd JqSxc0HDMJ/hR36CzIOyQ8zr34WJY6dD1cetOzTBS984BsJEdNbKARQFXSbTIr9p10+i sw67FFK4ED10lY4PC7U7GtIsw/koubnup1RMK2Da7ybqgejxt7Szmqh+YMlbjDeE6fvM YqOg== 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=wiAekYHtsCCqXEaNDXtj177jZ8n89cDHVLeg3PGzSKg=; b=n5vwznUb0vZRpH25xan3N73oryL3rZhYONaebwi3iSLJxomBnuefLMWmiZc5pud5DX CObIziuf6uGDIbzhNJz0feANRY0q97GruLLoib2sOj3+6+/WWvtu3xa97bxGoMhBHstR br/+oj4EypfDm14lwrZF0l5HO9LYUnLDh1gk0te1FDaddUbSsEQEiEXBfSFvmS9DWqDw S/CgxKQINjOZCeGjZ660eW4zajwp6+6Lua1D3hLH1GaCugfG4FaFoLDRin4S/h37xjM9 0+tUOKaIvZ6H1CZykl2W+i5B7diXUp0hnI8bLMP3XT6ljNF13iUuOUqoVzL10qG4fbb0 vvVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cQS6hvwm; 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 hq13si7919353ejc.182.2021.10.28.15.36.01; Thu, 28 Oct 2021 15:36:01 -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=cQS6hvwm; 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 E172168AB0D; Fri, 29 Oct 2021 01:35:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CB8268AA7B for ; Fri, 29 Oct 2021 01:35:23 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id u18so12812584wrg.5 for ; Thu, 28 Oct 2021 15:35:23 -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=iT6ICqZAD+/Bg8KWrmwSbIhVj+NeAAqys7O969lajfM=; b=cQS6hvwmkq3ZzJPVUN0jVK8gamFIX3hJrgKBxFDa4LOTCLd/3BmcUYuCRtz3O/9djk FlwDoHPr/DHA7B39JvjwOIxgfM2JudskR9dJYjKpJD/NHZ9rbCDu0lNEKuENbuQtGS4p Nto4x0uQOkGzQh/4vEAZd5t580CbJLwYC9/6Z+fSVY2bUmH2iEn3STsHTL+IHSfuKaVM r7rSAihDt7YIZidyp0ptRMNhyZBM5R/tBz5DV60erk3SnrunJSWwl+Stk2bsoNKFF+g6 reWBUL5ZuMzHtFjtBEp4pY00Xfcc3YF8mwnrtwCN5+8DaOaxreAhdzT6T23NQy/7EzY3 S2+Q== 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=iT6ICqZAD+/Bg8KWrmwSbIhVj+NeAAqys7O969lajfM=; b=NRFP4cknavK51zttNI7np1z+/yJCHePJOvAVOSL+T/hSbDAHPqj5xmckpn0qnhXvAn YK/Ji7QtI9Hicc7Fw6SP6HFB7/kF8TCl9wt2+LTjog2kOyhLXme1LgF+DJpwcO58m3qg CaGNJCU4N4WMVZWqWCpOWx9Pk4zcHwb/EeNeZtTuc5BNeOpp+YHnL3ALM5lE1esdK48F 4aN9Ot76NOdJyxTQRrSC12SY2M2HJQc8wWGpeMmEDEEJlt+L7UL0fBRGok8/Oj/IFOeA gOYypT/BbDFs1lSlnBT6evfvAgxZutxt59/93Wk8JbBTkqlOXTZyHfnUrVlUmQxErq83 3/bA== X-Gm-Message-State: AOAM5301M14q7sMTuoVgauWtMbXEsLNHsLbjoOXiWQIegY/XtsXiilAT J5oXQh1qmXoFAv/DL5yQF0C2Ou+IaPhCQw== X-Received: by 2002:a5d:4b8e:: with SMTP id b14mr9027830wrt.259.1635460522942; Thu, 28 Oct 2021 15:35:22 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id x7sm6798265wmi.43.2021.10.28.15.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 15:35:22 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Oct 2021 00:33:41 +0200 Message-Id: <20211028223342.1169258-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211028223342.1169258-1-tcChlisop0@gmail.com> References: <20211028223342.1169258-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 3/4] avformat/mov: Refactor mov_read_dvcc_dvvc 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: JKKgXBd3I7VF To avoid duplicating code. The implementation in dovi_isom is identical. Signed-off-by: quietvoid --- libavformat/mov.c | 50 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3fcb1dc908..5c393e45ad 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -55,6 +55,7 @@ #include "avformat.h" #include "internal.h" #include "avio_internal.h" +#include "dovi_isom.h" #include "riff.h" #include "isom.h" #include "libavcodec/get_bits.h" @@ -7033,58 +7034,25 @@ static int mov_read_dmlp(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; - uint32_t buf; - AVDOVIDecoderConfigurationRecord *dovi; - size_t dovi_size; + uint8_t buf[ISOM_DVCC_DVVC_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; int ret; + int64_t read_size = atom.size; if (c->fc->nb_streams < 1) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - if ((uint64_t)atom.size > (1<<30) || atom.size < 4) - return AVERROR_INVALIDDATA; - - dovi = av_dovi_alloc(&dovi_size); - if (!dovi) - return AVERROR(ENOMEM); - - dovi->dv_version_major = avio_r8(pb); - dovi->dv_version_minor = avio_r8(pb); - - buf = avio_rb16(pb); - 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 (atom.size >= 24) { // 4 + 4 + 4 * 4 - buf = avio_r8(pb); - 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; + // At most 24 bytes + if (read_size > ISOM_DVCC_DVVC_SIZE) { + read_size = ISOM_DVCC_DVVC_SIZE; } - 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 = avio_read(pb, buf, read_size)) < 0) return ret; - } - av_log(c, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, 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 - ); + read_size = ret; - return 0; + return ff_isom_parse_dvcc_dvvc(c->fc, st, buf, read_size); } static int mov_read_kind(MOVContext *c, AVIOContext *pb, MOVAtom atom)