From patchwork Sat Sep 25 15:57:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30568 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2571696iob; Sat, 25 Sep 2021 08:58:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGhSjoq2eDFbzqdcPmPepjbLSuEZsV7qM4ZQD/IaImBwM2taJv5KHLSqQ7Sz1lQlxCbsJv X-Received: by 2002:a17:906:1b15:: with SMTP id o21mr17965442ejg.473.1632585537016; Sat, 25 Sep 2021 08:58:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632585537; cv=none; d=google.com; s=arc-20160816; b=OJ+c6LkBjr8RR3yjGutw5+Lwf5rlzK0JWL9gsX4R0gTHCa0NHSdtDgluk9/BYOz8Ad RXprNys+y8z51Rk1JlI3vUj72lAfTpKvAdHsoo7hjiWfhu95Hd8Xzmfqn8So8fjNbQNP 4m6Vo6+9Zlly+HJvyCkkGdF7lfcvXXqNBTlyJu9NCkDIasgUkqpJncOm5lYNoC8rBnQC i1RmIc0vbLbfq7gnzFejdt+1hIVkixAnHrCqTu9Y94OlxJg/uMPJPglw96wK75q8hYvA DWTdXkmqYWSkfJS/CvEu0kmkEDFQwTII9cyzpRx9Kx+rixi7eIdUhdmnttdpQ6WHYwkO M4Pg== 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=xwAeYI9q8+tmaf51fDiioP7wyy6DMO4Hekh8tGSbMA0=; b=h5h2Jy5+0T3GoK4YLJ2XbsRjVlHwiP7fO3wXEVuzix+HZVyPNcEjCDeZ+AKj84mJgo oTCLtoreSZGQkpqGLZzY4Z7AEDz6PjBmVfp4J33Ilk582ZvJp75lfelhc+eNvNXGI0cz MAxEvHlwDFvjlw05bxsCnWpI/wrq/vD4pnLHwI6OxyQ6HdTllIlcdbxqGu0Xapd5za3Z HLbk3SyhYyC1QzJ5tfbu+rbiZxlcKAjkwqqy7WcFctF+9gZClf48ys2Y/eCLQySf2WhX MnQFDg2PqRXPCOO2W8Oku7vPj4iJj5NGm5DjTkhlgZcr0VW2w5uU6yD6GHjtMUErjpIF 8yuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=auqUfp0A; 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 jg19si3108648ejc.468.2021.09.25.08.58.56; Sat, 25 Sep 2021 08:58:57 -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=auqUfp0A; 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 CA57C68A92E; Sat, 25 Sep 2021 18:58:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E944968A8F3 for ; Sat, 25 Sep 2021 18:58:20 +0300 (EEST) Received: by mail-qk1-f179.google.com with SMTP id c7so31991507qka.2 for ; Sat, 25 Sep 2021 08:58:20 -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=xy8QSvr9v5cYnXjWm3foGwsJ/vLYKvNThQ+TkMrOWLk=; b=auqUfp0AokF0Lc/rF6wV2zP74SqTgqJ5QralT9HHLK0EnBIBz6JleuqB5ttgtvnpzf Mzd8emAYH0P0rTHktW3jj/8xKIPsRyvraEvIirLwh8anhBX1LniiJw15SEUjafkvqvkD AKKMIJDpJTe4/KeLWFvQHT6kiV0JcXIMkJ8kiKQuT7CiBWKwTCz5/5/mM+73PFu+REPu EarU5mFkX6vP6JFQgvybXOVBR+iq28ilYD/7Wmrek1vIl0fiwYfhwdwg57KAf2q7Bc8X pSHPBSNQAdSclK9stNw3d51qs9MNgrQrjzIyBdbOIUPrtA6ZUFhCgBo4KPNOe/H9azpJ b89w== 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=xy8QSvr9v5cYnXjWm3foGwsJ/vLYKvNThQ+TkMrOWLk=; b=1vgD9XBQtxWRdkqbz7Z7stz/OQ5TF5FL3dnODN+QwxIHDQXoyX16FZFQWiknyV051/ wsjSmQMyFr3CL1oTBy86QGB63BRtrxJmfo+3dmYPcd8WEhh12HHL1G9I6pURpx0e+Z4c cybaAcA977J5bWKwfNczwXoXHYFLZ5tAaHY12hxSsQR3aH0CpIXAPJGB/GFJEoLO5+Fd Nt5hOvQ1cGEGSspWlyl7fi1F9L2QHW5JdH9yCvEUV0ZMOi9n7PDgTUK1Y6Gk5Ky45iKt 1lMv+v6s3lp5NEh8NImlxWDO0UDmzIixcZSYE0MyDjlRvJaCx/Jtxk2gGj9xoTs1Pr/g 8bXQ== X-Gm-Message-State: AOAM531VEwhZJO1CKRLJxKGipfhnEYCGlkoTwd6RrLj0FyscWz/VUsES 0IVO7QRrmJUfs8B5+zYJICDK9ZBcY9Ia5A== X-Received: by 2002:a37:40e:: with SMTP id 14mr16861786qke.197.1632585499700; Sat, 25 Sep 2021 08:58:19 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id x3sm8572372qkl.107.2021.09.25.08.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 08:58:19 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Sep 2021 11:57:01 -0400 Message-Id: <20210925155702.319164-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210925155702.319164-1-tcChlisop0@gmail.com> References: <20210925155702.319164-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/5] 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: vL5m2q7+W97e 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 | 51 ++++++++++------------------------------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index bbb45864df..6667d551b8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -61,6 +61,8 @@ #include "mov_chan.h" #include "replaygain.h" +#include "libavformat/dovi_isom.h" + #if CONFIG_ZLIB #include #endif @@ -6799,58 +6801,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 = ffio_read_size(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[] = {