From patchwork Sat Jan 1 04:16:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14458045iog; Fri, 31 Dec 2021 20:17:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxn9xY/8y1bDxxGiXt0KmVsUnIDxDH71gqHezb5bImCJmianAlc2IkEbgmEtAdRUTKD70Zz X-Received: by 2002:a05:6402:2707:: with SMTP id y7mr23364564edd.256.1641010624521; Fri, 31 Dec 2021 20:17:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641010624; cv=none; d=google.com; s=arc-20160816; b=QlqpsOPHaH8nlT6VTq9shmVstnGwPx3HRxpDwSAoJyqqkl3wFU8wxJ633azpV3jTyh jNpw1V/pYl/683uAnn0ofo0AC5MYadS9ipaHU8VRGDMAN3Sv8negnlXpAkC8LVGBtgaQ HnkHPaLqT0pyl4L/DMxOg82kdufjV9k/+GD22qfVc6MCB8AQ91yyrMWeHnUDbaQVb9Kj 7MDlOtQ1widv/ND0K9wnASDEpjiOZ11G4TrwhG6fG5Km8VZQR7wedgDlTpK23IVKZaAQ Kt13QXvg5txkKwxkM7BPBJMsOT7GIl93dJ8Jyp4E3vMkBO9OAum/mDuVkEYSZuzoJl0z hijw== 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=wiPbus9rfqgyBxEh/L9ZEwUqCOtWDmSLNZhsLPhBOqA=; b=cLi0CYd2rTXAhWuLpi95optr3GfcobQiDiFHcdkFcmx7Uv3bQcZqfXwyjrguqr5YDx fOshnute0SOsV46a5GPiar7nud3PAoImJEwrH3hYl8yjO+cu2x9O2QkpO3zbQcJlDFKZ fpkqTkBAxfdwL8kWqO5hnixB10tFMyELE4o0zVwwQESsQoBSQ5nwYVP31vKJMhsM0JAq FzceweEuvW/bmLtgoTlzC6VnWb5ixHwr9AWPTajFguKwBY0GTH06h8QI0b6aTp604r4P aTGVkBgehD+iCq+M0XDdznmToSNukceo75SG+XizSZSYVfUvnEHq2u0iZvzz36Go+mUq J2dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=k17Z0lca; 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 f5si15063233edr.342.2021.12.31.20.17.04; Fri, 31 Dec 2021 20:17:04 -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=k17Z0lca; 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 DE1F368B0D6; Sat, 1 Jan 2022 06:16:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 457EE68B0B3 for ; Sat, 1 Jan 2022 06:16:26 +0200 (EET) Received: by mail-ed1-f50.google.com with SMTP id j21so114423628edt.9 for ; Fri, 31 Dec 2021 20:16:26 -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=J2TonDZc0uDuastphZzxhV7Hlaph4ViYDEJN0qMZoN8=; b=k17Z0lcaaPpfS0dc1+YhM3Getw4fVBW+Bttryf4304sgI3xUJ7SrNlYJTo/QuQwh1D S2y+3FRlgEdSIHh2g01JdXnQk4nuBUXJI7iKXs0fv5M7j7fb8CyweGg4wrqTdbun8Oi+ 66Z8nuJcUB3oADmyqrQcSQMvBrLpvh7ZBEd2vgoaqlwL+EtX6CQxzDHk8Qv72SdJiHvb r9KPQtWkbd3ATSGdaDMuCvTbDvwUHBCnD9v6bapmG0ezFkKy+SoWDE7SDYXXw4SeASe3 xWtAPuEqNsKjJAeYsoQLNZZbrWze34SVa948EMqQW11EdttVPYNWzbWswBFvGMV68Qc3 8w+w== 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=J2TonDZc0uDuastphZzxhV7Hlaph4ViYDEJN0qMZoN8=; b=Hjugr4j6Lyc9Dz7PUTUM3QchZhiPnvJi891iKACM62y96ZCpp1d4e2sjaaU9lJq2Na ZG49OGmwqO1qboXmccbTbwCVWpdZmMohSrbFA4F0NenTxdla9WSK7HDXN2Tv4AqT5ADc hajrZI80ZiHT+xDYE29vI35TUyVJq4/6mWP73Fc7PXOJJgC7Co0MmN218pcPRAXDmkHM vpOqJKe0AYuZwJPN2l2vbGUau13JwqVe7lspR1HNaliFzswd0aDJZu6OHmRCBNytGzRZ 5x39Qq4Ks8HXPtrFWvRji7my3OaWeoOpzmcW3PUwnq7ICzB+ZFh/4vDdJUj5EODjqUDc ukqQ== X-Gm-Message-State: AOAM533ObWoLxETdSzlfDPU/qgFoA1tpPNeUyLssDkIVsk/8VdjzDq+U Plfjf3lxmk9w0NOeqbyVT4RxOgUK/AnxiA== X-Received: by 2002:a17:907:8a04:: with SMTP id sc4mr30281434ejc.508.1641010585573; Fri, 31 Dec 2021 20:16:25 -0800 (PST) Received: from nark.. ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id z18sm11272075edc.76.2021.12.31.20.16.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 20:16:25 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 05:16:19 +0100 Message-Id: <20220101041621.427012-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101041621.427012-1-tcChlisop0@gmail.com> References: <20220101041621.427012-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 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: /Y7svO8fbu6m To avoid duplicating code. The implementation in dovi_isom is identical. Signed-off-by: quietvoid --- libavformat/mov.c | 50 +++++++---------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 351ecde770..ad5ab6b491 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" @@ -7062,58 +7063,21 @@ 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]; 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 + read_size = FFMIN(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 = ffio_read_size(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 - ); - - 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)