From patchwork Tue Sep 28 21:20:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5615909iob; Tue, 28 Sep 2021 14:22:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2xm/7jxvWqpa/KnwC6jOH4OULKYoYfvckkNYWSt+ufJiTsMqzWU9KhjXjeKkO8d0CcuwZ X-Received: by 2002:a17:906:401:: with SMTP id d1mr9633885eja.242.1632864128087; Tue, 28 Sep 2021 14:22:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632864128; cv=none; d=google.com; s=arc-20160816; b=SdHOmqA+vsCPlN/f3MkWn+KQoWp+ub+HU6xLxtrCetaKSA6/zYpXolXeYwk41h3vYX oukmFPhMFp+CPZe9QMYDU/cflDmG3TZnssdW57itxmI2dOkJqrIvijshSpENrlqe7GqW IfTntj7bvk8EqitjhxZ6X0z28DL0T9gsX1lVt4CyehGxRHkWl21duoZgbwHkDRzNI+kR I9x2apiEyOHSaQWQA5d0r9ePmNVA8RzdVTkWk7drQfmY6RWiUJ7GhPDX5ljBy2O6nqMH AI2T2xTytjAun2J1tpgNW6U9fBXcIrydvWCFwUbyvCTE1p4X9nJNm4/B4h7YMqTV8WLU YL/w== 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=1Do5uQpRKW99dvfI7+x9+XekIqB8HNN0Bt7bGt7r2Xw=; b=GnBs9J8YthCF++x4tN1IV3p7YN+MhML/zPlx9IJM90ks1/bCt1DVMvl9bCApMrZBC3 2FtolwEhyZ8rR57ibIH/B/3xz3aXrRog1u1CeiT2UunhFtBUym+eg0Ad58AsuqbhZiTW wWeXCNKOvI/8GZ041cqgWBD+0g9sqnWgfFy4HS+6WPRUmfJOfKVttMNyqtKIhZSjKh0H NZB+TdIEQj0lhXrCDMLPGUpXmhw+2mUHIvRLvMWWeFjFgHnoICY23TM097B6zkbbHM+V DIhsVEPjcj3pn1xImE/Ao2d0F/psrR+1eS9BDhIF4ePxK+JmnCuoiIwoIfC1ftj7naf3 OLlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="exgOEkY/"; 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 q11si213856edj.483.2021.09.28.14.21.45; Tue, 28 Sep 2021 14:22:08 -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="exgOEkY/"; 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 38AC868A6EE; Wed, 29 Sep 2021 00:21:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46D9868A69A for ; Wed, 29 Sep 2021 00:21:16 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id w29so651751wra.8 for ; Tue, 28 Sep 2021 14:21:16 -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=GxQ+gVjVoulo9VbK5nDWYdgZxZTQgQqK3GrUlFbAWps=; b=exgOEkY/X/00hGVvt+H0U1XMGcHzDV/7M7mG2l4ZwTecwmSpU6Fe3izMBQRCF9AGTm oWs1rMgIbw2lA5i4KIGahPo8bSUp6FPyLpLUm3UF0zI1x/kEhm17hZlwkc6yS+ufydPM IstWWk2ZAXIMyeIc6RiSZQDJdV5vWL2heuR/3SpVH2Qx4sj3JiHYMVcoiqOe/mVr3EaS 0K7NjLC+4Ldi4bbDO1OYzARH95zJFw87/pgsqTtpJGlItbOzya66d4YkYhUdINpDV4/N 3G9UKX4oFz3Q/xZSzCPYohR+6Og0Ng7b470EUlMHlF64ukfgaO7NXNa8qwK8/XDnNRJI meHQ== 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=GxQ+gVjVoulo9VbK5nDWYdgZxZTQgQqK3GrUlFbAWps=; b=H5xWyf+ThRaxTo/dhwQEDnp1d2Lj+YgGwuegP6MoftgERTOhEiOC5hp4nhtDfzF8IH QlyTSdltUnyz+x8j73+YaicJEwosWOknlRGCKt2DPiBq+bmn9Qhar7rfEnLU/nAlCzmn bZxffusIO2rkTZa0wF8Z9ZTz3vDUUOJIV4pNbAlmmnkbPyIVmMp0vXkPEMrOiKsYH1aH xb0bZZF9U15PIdTH+ulQOKIBie/scRIG1RCHUOefq3UikD/v2tJoGP2DbpZgfmWqxcQ7 4WEH+tfIaottZCvhSg8kZOa0iLxesSYp3N8jXoTUVB7cq5fO+ZnbgIlcKoPGVpHdxow+ hQRg== X-Gm-Message-State: AOAM530p+8V1Gn7TGN2jf9EKOzrrVnjwfg3KH0+dskhk23zcLkfprkvi GGACRlbS+3YZlrQiUDmc4g8Cp4hS5Ux8wQ== X-Received: by 2002:a5d:69cb:: with SMTP id s11mr2730069wrw.228.1632864075561; Tue, 28 Sep 2021 14:21:15 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id d24sm148419wmb.35.2021.09.28.14.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Sep 2021 14:21:15 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Sep 2021 23:20:55 +0200 Message-Id: <20210928212056.328511-3-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928212056.328511-1-tcChlisop0@gmail.com> References: <20210928212056.328511-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: b9EW9WL2FQ24 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..71294b5e19 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, 0); } static const MOVParseTableEntry mov_default_parse_table[] = {