From patchwork Mon Sep 27 23:16:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp4626831iob; Mon, 27 Sep 2021 16:17:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzT/JeGJUi8bxGuyQmTXK7pCmj+JcS+SQxue+xyKzThYCAEkZoREPLFudnVLeDNK9An/hBz X-Received: by 2002:a50:8226:: with SMTP id 35mr3567059edf.54.1632784644694; Mon, 27 Sep 2021 16:17:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632784644; cv=none; d=google.com; s=arc-20160816; b=ox45qzrFsvHDqjC4tAuwBQlxVg/mGCm8lqTRlwYv7IA1Rwdtc1quYe5N106pqyijce uDAY7pe0Ut5jTHUcVldmDUtELHgQKIBoq6YN1vn7q30GdwBGOQvp5A4SpjWHL71Tyb6m uXG+DFk9Pu7lqZjb2eVGuCyxhcrQp7lPTaJlrHwwGEQn/7vDsZxru03kTmWMEkZfN+wh 1PzNh6Z3OXK/KdPYPMX0pL6aXW4xHIDYgCRxytlyCoHAjBSsIqCYeXV11OXJaRr50RKd pqFavu0ZHXVhtBm09VhK595kLtjdq46ckZlDamlkZRkiJaP40VdoArD/8hEZijc+Jmce 9OjQ== 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=gsdkUrHrhTnVuSxNq7Riv+aW/EkZbclWFy3IjGEM71o=; b=im7+/PcpYPOssIOI8FXSLnRXW7bTjvoJiPd3N8ElzUxyEku+XJCgak0heOv/GMsCU1 f/cLZwS5B6htwL2qZx2OIFzex2XLaYkM04va7a2kBhmYq+W3tHk7AIMlFgIIQQAUy0E5 LH/gTq5mnX2TVOdXcEQI5s6wUQPI5+tKYAnlnTNh06/cT6SA869aqIo3zva+Ne7U9pdu QLBcVvqHt8rarkzRKe95OuRhMdXQdIjuq5LxUrEreqBkGhpoUMgDklmlmLNThMLN4pDB BOzTY3QoV6MjLDlo3x7fu1ViFPAQZHhVBnXNQ28DTyUuxj3cl0NKZqLDSFSDOPwrBn5n sdyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="jE/cSgdC"; 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 ay15si19245786edb.592.2021.09.27.16.17.24; Mon, 27 Sep 2021 16:17:24 -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="jE/cSgdC"; 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 510CE68091D; Tue, 28 Sep 2021 02:16:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A82A6899EB for ; Tue, 28 Sep 2021 02:16:46 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id c73-20020a1c9a4c000000b0030d040bb895so1222649wme.2 for ; Mon, 27 Sep 2021 16:16:46 -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=lmmWs8OwsXJrrU22+bwVbnof0ZU8PtMbqB+r4D9RxyE=; b=jE/cSgdC7flChrtWgGartFRvNTzOptU0stAfLsJZkQPgz3DSRnKcU8QE0J9Iw966Wf pt5Zu4PW+2Sfq4AyavkDFsjGu+CTFw6GaRAz6X6MhViF8XZbEku4V/2x/sYV4Zz1d7lq lIQXy5dgC5Rox+xpfGxJ6yvgtSAYypwSglmgqtadz6C5o2/GTy2Mw8N//xSBHxLqY0Ua DkNJsHzwbpcRG6f5Wv8aHJ1+6VisK1TmWLjwp5WHyvIKBwCuDWQaqepz40eEu00t4uQh seGPxM3r6PHjcMoK+8zOEq7TX4/AQTm2X8k0BhuxPHe7cEqCyEK1ML3QDdMo4uBTpbDI SaAg== 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=lmmWs8OwsXJrrU22+bwVbnof0ZU8PtMbqB+r4D9RxyE=; b=5h8PtPoM6Re6viXWjNXAxsWrU0VCY4Gag+gEp98S0OCA8s6TYUTM2ayXbBPluBkwQA 7WmGWGR+ElkxPfbvs3+aHDoxyeh5+tOQ4+qKfrk4OhAuqAIAXZqS7mSXtW6IDZZyjJu7 3/2eAJi9D2Dxu8Xyv884o2PHlOS8UjbMC/vK0kZiaOytmYxK6XsVakpa6D+M5zF2ir8X 0cehNAZ5n96nb83M3+NfQ1e6wT4Ls4PugTPBafhQRILqzcu7vbRzHIWhUaSgNUhyufoN 9CKeLQQHxMmK3DlIA42s4cVPqH4fkQvhMinBtCQBaWdxW97W/FprSxIb/iWQtvumublA XbEw== X-Gm-Message-State: AOAM530CVrH/gtjjsRH3jg/dfK1erypUNZQnyuaKJKagNKkATgnTP/+d HuN3pOoLojtCjc6OpnP3m+1Ph0XXKo8HCw== X-Received: by 2002:a05:600c:22c6:: with SMTP id 6mr1619908wmg.96.1632784604762; Mon, 27 Sep 2021 16:16:44 -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:31 +0200 Message-Id: <20210927231632.306250-3-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 3/4] avformat/mov: Refactor DOVI box 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: utOH0PM+eSg8 Read at most 24 bytes, but in reality only 5 bytes are used for parsing. The rest of the bytes are reserved in the specification. 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 d0b8b2595b..f30a7145e6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -54,6 +54,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" @@ -6799,58 +6800,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 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 const MOVParseTableEntry mov_default_parse_table[] = {