From patchwork Thu Sep 23 05:01:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp110750iob; Wed, 22 Sep 2021 22:02:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBpqpazwMJR2SGkiv/7Uq+Dma+qpUpfE58H4mddh6MfYNFwDWDLfSlFCDxlC0momX4Hj1X X-Received: by 2002:a17:906:40c3:: with SMTP id a3mr3096485ejk.38.1632373338837; Wed, 22 Sep 2021 22:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632373338; cv=none; d=google.com; s=arc-20160816; b=MXXqT1CCAFtf6bLCDDjQMN7U/JG1SoyAWQ+WnYg4IgvmrdpngHqe9lEjDJfvjc/SkX gQzWyHYq6/0TO/yabZOTy4eHZnkLX9IbhOQgEsSSQKP/M2fYsA+rTUN1IHEl7XHs4MnD 0x5PVA7ceb9bZedNXy94RSQJGCwXH+AutLidPQVLKa9a9GXIQyXPbzh8KqNdCCYKFr+u H2lNpKd7oYOOI1QPERGYRLnO4t1tPHfDbIEtCPQsvtjtaQPkSBLcFVwfxpS3MuRMNlGr +1Ko9KJcbTMOwZLd3v8mL8oAjJ7Ta7wVLiwn4LfVlVqZ1xAdMo1Ji0l0jyfpDBmFmpm8 lX1A== 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=EEDYTJ/YpoP3gFt5/UWrYty623jvn1aMAQXIbVSiOb0=; b=V28Xywn3VLBM0reks+uWSlPcq3p6/snt9sYvY9xgt5Olyaqyt3wkxO/9CQqRzYIPUV iVgj5ApE7TZW0h6eCudqWds5n23CTe9Wl6TY8E3P9cTaxKiHwmWhOtjq8h+rFyhTydN2 eX2DgJsnANbs5/06HHsVMf4CDodM2ljHLt3QmN8YHM6ublrmv5/ga4NM8Rr6D8OGLJjb E9xJAEMXIIzpVzYD46jzf2zwCW46ER7Cdn2+NhdsbJqJTEkbrfRZxLHAgCrDXQil1r8U 1rFNYkH3KQvfn9rEkK1u/9gjxnppJ5+sCk1IuvXecNs8z0/DwHD5Or9K5u3wkzpdOFiH JMuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iFKMwzP3; 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 f16si6176985edf.169.2021.09.22.22.02.12; Wed, 22 Sep 2021 22:02:18 -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=iFKMwzP3; 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 2D33F68A4E5; Thu, 23 Sep 2021 08:01:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 445F468A4E5 for ; Thu, 23 Sep 2021 08:01:24 +0300 (EEST) Received: by mail-qv1-f45.google.com with SMTP id f2so3485865qvx.2 for ; Wed, 22 Sep 2021 22:01:24 -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=rjZG78zWeMWkGZfH8GFXMeNkxyAXP4Tk1eV+KnoBAmI=; b=iFKMwzP3/A4a9yX2UcxEpN3cLqPdO+kiK30G6AEaam9yDDSfcMY5qFSpm4wXK/w5hd NcJFcr9MTGm2jq+zsGEKGuDtwU5ya+zAXb1DP9OlO24azQh6YpOhy2pvMlMclRmT/T++ VVf31Razw42CoVoEEQJCbwweXDFkQtOD9CMSgxRCgLNr+ZFfMvjnBy4y1L28HWO9RBUF YFBKJlcKuJs4qyOplr4qGQ4xU+nc9+olPUjNIv1qD4v144jjG7kAYv1X0EECRQwFElqP JooPdYMSeWyc1BSMpWrM9fTebOu0DC66GKXc9hS0yc76ZA87XkXQdhoIOaVIkmrt0EA4 chhg== 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=rjZG78zWeMWkGZfH8GFXMeNkxyAXP4Tk1eV+KnoBAmI=; b=tOXWTTX1ljOb7d23dqLN3LiYx2VRDYZ11WgreFHjcpJ88kupmTPyG3ZdWGb1TG7eIJ 4osxwRA0QBkwz5DPeIXVpMCi7V2kAYFdvuVF7S9fRFVMuKOfa4Z2laePbV2kkQ5yAFoB BZn40sVYTNS1sulu9542m4v3KMOsRdM7CNOkmv72qqq/Ycq+vYD6ULJeeRrNgq3zLrNq Az1KDdaF9uDovJB1t5fgI+Qf9c8lOeOEg6Hdx3vYqGe8Trr5UowLqUZJirOluR5RY7Nc ZFTDobbNRnIrlEiytNBHVjpyDpIe3mfQuCPlSsewSS2hR804VlBcolpBTt0FzFU79xtW /niA== X-Gm-Message-State: AOAM531ccZe+LcQvU+//LosjuSxPGtJYabblX2cVA2xzPeoZVgHdXpPz flpbRpvitUIS3aIFjKZCOPxMfJnsOCFH9g== X-Received: by 2002:ad4:54ce:: with SMTP id j14mr2688094qvx.32.1632373282961; Wed, 22 Sep 2021 22:01:22 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id q84sm3427097qke.3.2021.09.22.22.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 22:01:22 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 01:01:08 -0400 Message-Id: <20210923050109.692356-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923050109.692356-1-tcChlisop0@gmail.com> References: <20210923050109.692356-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: fjmyjjXA9MR1 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 ca14646a38..07595ef769 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 @@ -6797,58 +6799,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[] = {