From patchwork Sat Dec 4 01:09:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 31955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1427071iog; Fri, 3 Dec 2021 17:10:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWD9aqlqxeckPEu2PnuS8wx0pq/vXDmlef+8lJhfQQTaF4clR/qr9ZpYTUI88ouPF2TDeA X-Received: by 2002:a17:906:b854:: with SMTP id ga20mr27103770ejb.308.1638580200872; Fri, 03 Dec 2021 17:10:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638580200; cv=none; d=google.com; s=arc-20160816; b=UKeDS3/E0CqnYHSjjJi0FI+F2dHLiJaDQfuKDL1QMmammBOFKfk4U++NWQwdzwv8cB Wa7F+S1nM0EG5hZ6CFrHPlFDTMdh3dYsX4nHm/Xa/IcmcSgLojwVMarkpeD/UDEXIkrT SgcSh6mmg4m8lbU74n6/rCbcm5KEd0yZ022alk3g6vmEAmLlTvXThZliAQrV36QfbwYF yl0yZ2E0knwD4qLsuISG6viDc4hfsb/R74BdO5CS82Q3aQh9RW5ONIIK6ofjXOL8sDMe QIeHCWrsTgzQRX0eoRKRd4EknwGZnhRWlzJO39cM4vAx7f63oOz82EVuQj9s9JdnOCBY t2ag== 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=FiPLwaV9dnWWdUaJUv0s0S0aWM4cRK8VLa3RzoewlUw=; b=lmG3eq2/dZ8QVdC3PLsWHHWwJF0l0ezIKco9P/I0MQlmH6LzldJ4oqlylC+QErSwhe CcHFDVFEy0Qr6KnpuBwV3+rAtoRfg4Lx6o2CfqSB6XX8yBogMMdqI5/aHFi4RsVQiera saODLtKliQsDKWkAB0SKhFUvi3nropfSgwXu95S0iEE989HwGPmf6X40MJeCwBRlvwAY jA1CcYzPAV00UV9VyKJ8iW7xB8Syz/OJM4zfK/GGRQEynqlrtdSFaczgLGbaIy694ZBX BJ2woyWoGWtuukvllLAhd+RxDrowHh746yKxXgxoFJ3D5R/3WA7MbBLaAOE5OidlLS+2 th2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=S1ytU8cs; 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 r10si6559705edc.370.2021.12.03.17.10.00; Fri, 03 Dec 2021 17:10:00 -0800 (PST) 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=S1ytU8cs; 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 4057D68AE4A; Sat, 4 Dec 2021 03:09:31 +0200 (EET) 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 D05B468AB2E for ; Sat, 4 Dec 2021 03:09:20 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id v11so9222931wrw.10 for ; Fri, 03 Dec 2021 17:09:20 -0800 (PST) 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=Q8vEEuG9eWrDDpw+X/X13u0QfEsOcm/LKZIyuGqmPBY=; b=S1ytU8cstozfn6YskjPNirGaRfTYVAVh/6RaOkKuwz+H21mPkUbTTu0NX1GX/tZUFX cJAsWyud3l/uROambll5tS2Up1cvqUj7zqN7cVOGv14lHL8nxl29rYIrhoY10ZBQhKEL sx0VJXvNs7BqYMFssYXqJT4vBBkvHTN8e92uKQmKa+gS1Et4o/nuc07OL5FgVbxNpeQY bZyeTqhgwmWE16XDf/FP+LWwPlFFYBWlINSqQ3WK0HaG+Fwr+st2u70KTl0pZsXhhx6R 2IfnUD+FEY98defcQiUvAjv67fb12OKLChcz6C6ABAMpFjxGooKYek8BfVnOs19p5Vqm 9VIw== 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=Q8vEEuG9eWrDDpw+X/X13u0QfEsOcm/LKZIyuGqmPBY=; b=riEQgb3Exqk9M+u8ErXP4WCEvGd45MubToWD4UWTEdFd2HIPuhj9F3hygYf7LG8KUg J/FSpQKdV0UmqsTYeHSlpbbkPMq2QSdSlmw6WKfw9e/uXCpQcf4FdDwymCkhyFxdVvF1 5GwDYxZHNmSe7GP9cjaWfKx//fr3w+htmYmMJqgJQJLaCq324TALrpJscCm4tAcnRsQH 19YU0ay56vHhoZH1i9IPTJJiuqkDtAr3jK/gpoEk6NoQXS3tkqLt4jtuz1Ux8PbQn3LL KPbZF/3UuGMVmuZh7wxDtzJUjRXbSuLk/g60BocP4dAcNCR1oJ7Q4/bEW/hO1QsF9Hfn Q+9Q== X-Gm-Message-State: AOAM531wTo+aJXtivOX4itcO09VdbEcF2GSqTD4Mu/lfN2ZMeTFIjDgO b7i2tX2oVYt1NEwULPZWCaRdiNmo43v/rg== X-Received: by 2002:a5d:6211:: with SMTP id y17mr25782027wru.97.1638580160128; Fri, 03 Dec 2021 17:09:20 -0800 (PST) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id d8sm3873739wrm.76.2021.12.03.17.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 17:09:19 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Dec 2021 02:09:03 +0100 Message-Id: <20211204010905.2258652-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211204010905.2258652-1-tcChlisop0@gmail.com> References: <20211204010905.2258652-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 3/5] 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: Tp6/3nEBsxDw From: quietvoid 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 5c74d099da..b5f974fe05 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" @@ -7051,58 +7052,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)