From patchwork Sun Dec 5 17:35:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3509643iog; Sun, 5 Dec 2021 09:36:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvePqhtofmzgsvLU0yxZ8QqsXqfR+FgPb7KGJvhDkIcjeqS6JesBKks2ChPVdqkMIwnI3s X-Received: by 2002:a17:906:9153:: with SMTP id y19mr39591768ejw.516.1638725798035; Sun, 05 Dec 2021 09:36:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638725798; cv=none; d=google.com; s=arc-20160816; b=RiAdXCfQv/1RLn3dtjcZRck9x9JoWz+sc95H0+EtJqruH2vr0ABDq9HAeJiqDUITVV Cm8z8JhvicEKXPO3G5TFQ9Jlfi8vEVOe4IkeWWH1JpVvyEEu1pIjRAG4AXvnNwh4t1DH 0SM2ZFaNh2r/0z+6daPFKZ+x7A4uOBgvmbu7PFMiAzPj6+ZxF3NrAQBPSBRMwRia78vi 0e6wFh3U5E/pafxWQriN/ViPtWGv0xS42LLG7GQkX0Qph27w5+PNjE1+YBWW+OpX5xfw 6l9/XM+HA8rBi9crKy9ECe8doD2zhza4YSkTmqnsKgPC2wANBoZe34Qh55pTtquCdHMO +16w== 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=DoVpXbWqD+IHYtUo6djTUAs1OG4KBy2Mbt7+7GQwo+I=; b=EN5Q7ntNv1OkqBvnqOsknHBfAPo49gn7UpQrOtho7YBWygGpx7cn6B4y7LHFKNd65F N9qFqRGMfY+U2aU1vx+L+gJppUxpNA44Y6az7KsSgWKVx7C9KkBxgK8Ya9ohH+HqlxgM 1lGJUkoz7siUPZY7MbmCeZRvtCDkN9qDXloYKWJrvQ0hDkD/tweSa17DrSgsfWRXcg3A h/LFMwfhyJeiMT3J5nj6Bc/DbM+NzqzVEfo3sGhBHuIW+nSe2L+Y7qI5xL7wx4t9gQ4W 09tzvNr/LApttsQxwC+0Eh4yfzbyWrWH45VcfVF77M8D+za8A7gaHJKrx2NF81bWfyZG iShQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ebX4nX2g; 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 s23si11698942ejv.608.2021.12.05.09.36.37; Sun, 05 Dec 2021 09:36:38 -0800 (PST) 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=ebX4nX2g; 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 4DB4A68AF76; Sun, 5 Dec 2021 19:36:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 949B568AED3 for ; Sun, 5 Dec 2021 19:35:56 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id x6so33423780edr.5 for ; Sun, 05 Dec 2021 09:35:56 -0800 (PST) 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=BZ5l9eae+xPRqdvwwddn5T5nmbjKEZrIiSxWPlo1naI=; b=ebX4nX2g4pcBBRLlwpdyvr/BGUPwk7eXCnom/OBw0Y3vk232L4tDizCMma4MU79JA1 ypjanhS0atCM5rbDAw+rAzaVvAMO8NTxcnrCZbW1G/EaHu8tMKhzSLpt4w84gInNwOXN 2I2ua5qzPb1F8xWMMwYoAyHvdgBeTW6YVqAG6h4lNtSQOyvLC6Xf9JiY3linl7Yu5CLA bBvWa4gHGHsNcSRpE0qb13LTVhXpOyHX21YS3vkufIu8hmUqC97c9qhEh7uLM2PvyybH ppqV8py01S49r4XskY3LHVnBAS0IYaAsZx5UyDVvAenF6nvtFRw/c8SYpyTl6Cb7bcI7 JuYg== 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=BZ5l9eae+xPRqdvwwddn5T5nmbjKEZrIiSxWPlo1naI=; b=aN69YioizveU7UBSS+zsEj0bgnP61/R+LPvvd8wpCShYU7mFPSAmaPcJOvnwYhs5Y2 xtfu/1sIUfqnuB+W0XemSSPY2KmBBQ6LoAkcMwycJ1DzkRL/UnzARXyb5CXlo5znL4uR nxYOdoQgCBgbY6A2VeK4e0T+FyqyKEU8Sx/D0vr9XeJ7JfvKm2/uOnMjTIGQY7dfC1ob tXrQ1teeY/vXYeMwblofeiyq0BQ3/n3fU+7Sdt+1yR/An10oo6DobBq/DVpulH2X+tJt E6PPnzcg5IR9IOfluOHWdw7MNsD5Co7QMPr2HmjQvej1JH0o7PP+JQJ8B21NInCOpwSn KGkA== X-Gm-Message-State: AOAM532ENf8nz6SyhiTbuJwKL8DrnlG9g1mKKuYpQd8K9gZpwNswBspC vOpNDKuAq1XTW/fV0dIPAOGVFkweoxePAg== X-Received: by 2002:a05:6402:8:: with SMTP id d8mr46612595edu.61.1638725755875; Sun, 05 Dec 2021 09:35:55 -0800 (PST) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id h7sm6312352edb.89.2021.12.05.09.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Dec 2021 09:35:55 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 18:35:33 +0100 Message-Id: <20211205173535.2306292-4-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211205173535.2306292-1-tcChlisop0@gmail.com> References: <20211205173535.2306292-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 3/5] avformat/mov: Refactor mov_read_dvcc_dvvc 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: 8VCqr9PPEf4y To avoid duplicating code. The implementation in dovi_isom is identical. 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 5c74d099da..b5f974fe05 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -55,6 +55,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" @@ -7051,58 +7052,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/dvwC 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 int mov_read_kind(MOVContext *c, AVIOContext *pb, MOVAtom atom)