From patchwork Sat Jan 1 16:51:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14862971iog; Sat, 1 Jan 2022 08:52:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5JiyY3wXhl7mGRPw6xYRDxw014sRKIHk4Ny++J30qS36gs+QRPtVrmqvRNALo8RyDQGCJ X-Received: by 2002:a05:6402:5107:: with SMTP id m7mr38281762edd.108.1641055955408; Sat, 01 Jan 2022 08:52:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055955; cv=none; d=google.com; s=arc-20160816; b=vT2KBnDK48DZbvf2S3pKPUtGzPVDF1gKAIVW/gpnzr60kCl9c1sxJwXNQqwDD90C1v GMn8wiS3aydncSlMvXjxxF9YfeoNs7YBNn4/Wp7ixhgyApMMkMIQ00z+JDh+e54aZWzv F4jCjzzdChHuaNzuRPezktew69Na3Dn317oSUURmfT/2h3DrHxqCt7iCptvE2cfCJxdZ 0qlXAKXRzcsrJpJd6+d8YAqn/4inXr52MI/5vEy3rL/yuPdnOVgnJoermrHC2SjpH2Dh hy6y1HXO9NlTjT8lmaEbcmGPxB+dncP3MjwFQ8m5fYGkB7A1lopq+OhIjgj+cJD0r+Z3 gTlg== 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=p9gN6HijoApCJcg7vNd5l+P5KFeHG7op6V1WxYUikyg=; b=ix77E9t3eJe4fG0f0BrCOmZ6xDMAKOYqigrQBK5JpNHYYyWDyEWbZECHObV1FEme0F PXXxZSeKvCuC+ykvOMZfMRXHL0AVBYqbqWqRvy3JSjmLmKwCaL/Yvc5DfH260A2yiADm ybpivCPgvg/NxtV643Q7r1kWH4F7G0Cipqu2Oq37lqIyzfyXBIgL0d47iLzTR9aemSpd WSw46NdRzkBOCqb064fqQFsRZLT0QCJ/A3QUK/CGxlCJxuyluuCuTcy+He0bQ2Naq5Wg gfoqonJVswc9wa+lHKBIZgemF7/JQsVOJkK5uXuyCF404v2t8ZYEz6/SMxxMzcXoRosq gYLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=T2oJwXTn; 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 l12si1094591edb.624.2022.01.01.08.52.35; Sat, 01 Jan 2022 08:52:35 -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=T2oJwXTn; 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 4C81368B13F; Sat, 1 Jan 2022 18:52:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E556B68B0DC for ; Sat, 1 Jan 2022 18:51:59 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id j6so119044952edw.12 for ; Sat, 01 Jan 2022 08:51:59 -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=ntxECzFH3m91P9NVx3rbjAu47yDQlrNi0xK2yi3IsoE=; b=T2oJwXTnvql5DlKAvJIdlKj3u8oTNHXCiR9+R3O9WYuA9uTlkslp1wSp+PAtzS1WKW vE1p9EDQBYwcJHmIZRgQvp+eot6shgDWvlfIpV9eEFzYq/Yb79RbxsED5wNPoyOZ1z8Z 09bCu/8oxYZMn22vctzLvY2F/5J/t6wA28H7fK2EoXmg4Fp0Bc4VTuex+/26WDBZB8n+ FiUGC36qm0zsT+JnZmx3Re3VBgxrFB0E0rDl0ReKw1dm9lrxGEgjC3OM3RpfM853HaVv qyb8U9lL6J5erWcavJlZfD/vMrFnQ7V0vuKC0Ms29XV2wVQ29n3M2RAqJRjS973AFqSx Kp9w== 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=ntxECzFH3m91P9NVx3rbjAu47yDQlrNi0xK2yi3IsoE=; b=iXaKbZuo2VivqHPcSBbamPZIAG8L2/DWkkrFOUntdEq/OWwkWBfqyiWqGTJMrHvXX8 hNnDVEL7wAIeuHS/raSfEkc7oTRacLGDieS/mq79p6Mp+wLXpKCN6dU+OQzHOHvCvjKk gyG6VN/DH4Al3oaPW+WyQ3Uwe7BOuuKuJxJvUl4PdolCzDdoJb4KldLIWPeibghp1uTx g09hoql5bHmOZ3TNkmqs42lG/H1OitIxeHvF3Stghxu2eXkVU2CWXBg33/ELyThy7khw nbc++UbWKKfAc9Z0xRJqu1/l4Y/hAYtyDZVeUwFbpI2/PSuQOjnib4FkUk3zAaDKg31q SlJw== X-Gm-Message-State: AOAM532kad52IMYueruGwjxpDXPKbWGzCd2iW0zOaaMC5NE++mWC6fFY Q5HYccYK5oz2lr5tfDowzQroVFOdLnLNjA== X-Received: by 2002:a17:907:1c8c:: with SMTP id nb12mr32234357ejc.9.1641055919281; Sat, 01 Jan 2022 08:51:59 -0800 (PST) Received: from nark.. ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id gn8sm9280298ejc.23.2022.01.01.08.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:51:59 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:51:51 +0100 Message-Id: <20220101165153.440729-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101165153.440729-1-tcChlisop0@gmail.com> References: <20220101165153.440729-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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: 55EaQ28V5xJJ To avoid duplicating code. The implementation in dovi_isom is identical. Signed-off-by: quietvoid --- libavformat/Makefile | 2 +- libavformat/mov.c | 50 +++++++------------------------------------- 2 files changed, 8 insertions(+), 44 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 4464c2b049..cd9810ba01 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -339,7 +339,7 @@ OBJS-$(CONFIG_MMF_MUXER) += mmf.o rawenc.o OBJS-$(CONFIG_MODS_DEMUXER) += mods.o OBJS-$(CONFIG_MOFLEX_DEMUXER) += moflex.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ - qtpalette.o replaygain.o + qtpalette.o replaygain.o dovi_isom.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o av1.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o movenc_ttml.o rawutils.o 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)