From patchwork Thu Sep 23 00:46:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 30461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1087948iob; Wed, 22 Sep 2021 17:47:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1FJrMxQSHgdBN/kCYKdcWRYuogAGW8WC7QeqPGO375T/NRJ1mg2wKMcHbxUNUWdRgdCru X-Received: by 2002:a17:907:2064:: with SMTP id qp4mr2260084ejb.317.1632358032416; Wed, 22 Sep 2021 17:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632358032; cv=none; d=google.com; s=arc-20160816; b=bZca0tRKvhqOXgceUj8rrf6CLgsrN43nAAQtuYXvzUyhgAU+INXyXca5cxKmlksgLp 7K0sGtZCimFIj3wZiNmRKTRKfEpyOMeMJuiFknosKpsFFsHsLVa81BAsw/xM9WFAC/6p gowoioYFvKt7nlqgzvw+Nx1pVSFZTUaORBDFlVOnd7kakAxPZnIYORfxdhnS+Ri95fa2 xMlwWT1Hrc4YzUQFu3+7WCeRRYuMMqaYiSd5UTgOMSX9WFqy+Ac3ZqZPQmv8jLo5DNIV IrIVnWxK1remhRNFQiYtlcPpJHF3JG63ei+Y0+iGWbnMSF520ObB7CSR96e9GRfLOXMf DtwA== 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=3h4Ijr586E+P32hjIxJeiHVMLd4vRHk0A86OhHtmhkk=; b=A3OLDos29YGebtH4V8EbpSya71T6fhQtYBw3yf5I80ysjQZUiddZxr+kpZtg5ds+Hz fRi0OMiuLfeCxG0FVjt/faXIY1kag7jS6nCC74x/QehiURzzKpSsr4BB/lm4IWwiAzaW yenpLCWNl7xnyN57m8LwUD93oZmP7Lno8yQJLitqWtgdF/b/Z3GFY5Dakn0CXyXXoeyd vGBwEbmZi7xq3h5RkUXfjqbF507reAcs2GximJLuCMoe5t2cmvUo6oqs86AP+nqu6hn/ gSnLfHdNnJCHOWr9H7qVAPYpKZBXKhDbuaMMjJhGzQEmPji1Uz5YLeh68I77YbGeBmfj OvBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KexSXA+f; 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 ka17si4463152ejc.609.2021.09.22.17.47.12; Wed, 22 Sep 2021 17:47:12 -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=KexSXA+f; 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 EE79268AB27; Thu, 23 Sep 2021 03:46:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C3C168AA84 for ; Thu, 23 Sep 2021 03:46:30 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id 73so16385301qki.4 for ; Wed, 22 Sep 2021 17:46:30 -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=CTaW5nj5F034RFL/u3CYNxalzF6Xsz42hPPOjPJQ/0M=; b=KexSXA+ffk5dWHWv/F5v6qLsuS1l0Cbx3bngME7/s9dZ5IgQim/ONY6G96F771wE4z KqDdEcukTQr6QEODf/LrdvyCcXuAuoRUeXxE4r6ProPIb7Z+PWo7mO2sPLPzhgOT1EYd Nro4Jh8ThxyyqkvfwJ5ojpT+6luFrRzWlnXiGMHQvuaNaeOL/LHImoT6nVht1ubr/i8z J61LL3Ds1sRoqQdaZoDjyhBXM2ninzc7yVp8A0mKguOsO7Nq5sRoaIBJ2oJRq/92Wurl We1rKBPS/KZ1THfimnHXYjbEEpAWUjBZCnd2R/2Ay4xQza/Kw0kwgaEAxQ4m8C4PNJtv tPlA== 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=CTaW5nj5F034RFL/u3CYNxalzF6Xsz42hPPOjPJQ/0M=; b=q9kxejstzVrr+YjQyHwNJU8bc2QTMvvqoAvst6qKgIX9Z2nibCZUmiWntYsvUTwWSn XsQgKM1f3KpkS0HkRBDe39gJlZNgQhczQm5uvILQUExls2cz4pNC24jEBvkEdJGXqyQG n6YNGVHYdnWtpAGQJDxsBHL82HQJibehaqcK+ycWq+3FPwkBc8Iov38+rvLt/3qEejgg ngsdeIpdgaw0lOsoouIVur+odVe/QNxMU4t0CmJg2XpSRyI8eLWhlfsePtNh3vkSu7A2 Gdn67ngrj8LW3GrZUTD72Xnn/wHBATBNO5I7G+XUavkpPElKUoLS6cmdlD3OouXwKIH1 j83g== X-Gm-Message-State: AOAM530ATNK8gztXSGk4BbRmxa/acvsZUzHkGB9fUdZYSOp4w2iZmYZF i/4mdBX4vQS7EXYZDatTLLv/4uc455cUUw== X-Received: by 2002:a37:9d16:: with SMTP id g22mr2337998qke.158.1632357988632; Wed, 22 Sep 2021 17:46:28 -0700 (PDT) Received: from nark.. (modemcable017.92-130-66.mc.videotron.ca. [66.130.92.17]) by smtp.gmail.com with ESMTPSA id j26sm2511618qtr.53.2021.09.22.17.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 17:46:28 -0700 (PDT) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 20:46:23 -0400 Message-Id: <20210923004624.476145-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210923004624.476145-1-tcChlisop0@gmail.com> References: <20210923004624.476145-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/mov: Refactor DOVI box parsing to use ff_mov_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: ArTrqh7VqT4P 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 | 48 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ca14646a38..d3c483a2f1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6797,10 +6797,10 @@ 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[MOV_DVCC_DVVC_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; + GetBitContext gb; int ret; + int64_t read_size = atom.size; if (c->fc->nb_streams < 1) return 0; @@ -6809,46 +6809,16 @@ static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) 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 > MOV_DVCC_DVVC_SIZE) { + read_size = MOV_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 - ); - - return 0; + init_get_bits8(&gb, buf, read_size); + return ff_mov_parse_dvcc_dvvc(c->fc, st, &gb); } static const MOVParseTableEntry mov_default_parse_table[] = {