From patchwork Sat Jan 1 16:51:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14863068iog; Sat, 1 Jan 2022 08:52:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzYFd+nFhOmCh15zi6oJzQtzLS05LzE/kU9Py1bwiG01z82gAxFCFChCBoJGFjb+Fu3Msf X-Received: by 2002:a17:907:6d22:: with SMTP id sa34mr31249955ejc.533.1641055964901; Sat, 01 Jan 2022 08:52:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055964; cv=none; d=google.com; s=arc-20160816; b=0hhUcsz+Pnh5uPOCFDMSbCxRXYc/OZNIsQ+LlLb2bYUBwIGG15uFFdcXvG1xZPG6bn sVYUxsD5V+3RZOBuwsU6EloDBDD1f99lnLNGQhtFJ08gOGF+/2ZLmUF8CXTa4a/xzvKw Hba00o8Bxt25sPDwNnhK309byUzv0RcnwkZprgJ7S+IWwZer1q506Ut/C/dQhZ9suk+k GXkYhKhusetwa945blNoJdT9zAXYqiIzM/PgoTB/Ivw5C6Lc5mZ6XFQkYyhWPXakQEJp AbjuEVcTxr6E2wwKFZv5W8IplGFpExugns6YfKAOWzdOQuY9eM/2moALzs7GT4qioGHk FDSg== 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=MhgXVkn27HaoP52mIk8Pm36z4t7ZlZtZQTO1Y03OQ6w=; b=xFOu2yYlfFgG7BvsIUIjb4MVjHzEsDN7MaGQPfOWWwDC5E8tmGtVpj4q3IY6Men1fj sKRxYCW1FKtK8H+qXpCHo7LUv6HX/pDxOduZx/lm6Zg34EICnzQiyT1pYMmm1QJfhyVX dC/KEqPHaJhmWw6GuIkpj39yZA89FDNb7tUJwA8NJ3FpOft8O92hvW7Wjn0CakFOheUu Q6Vho6RIG9vJxk8O8HMuIFlHo/QGwRoB4J2Sc6qmd9x/e/fMxEhWPxdAI8l5tjOuEHXp I11iKMoFDFTQCh1W8WqLGw4jG4+vMZwsyBDTEZc4lsOIE+kimVLuON8HtqLDLYqPxUvn 4GpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=COnHDBws; 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 u21si15059637edy.502.2022.01.01.08.52.44; Sat, 01 Jan 2022 08:52:44 -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=COnHDBws; 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 70FE268B149; Sat, 1 Jan 2022 18:52:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CF0068B122 for ; Sat, 1 Jan 2022 18:52:00 +0200 (EET) Received: by mail-ed1-f44.google.com with SMTP id q14so111421354edi.3 for ; Sat, 01 Jan 2022 08:52:00 -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=nbBaxP0LM+G5/L9aN8Inih1LrU5lEBslCSq2v5UiNcg=; b=COnHDBwsVVIodtMpma1ccRbVYQi+pfvbV8cc8Wh4OZ360TVHavsvKh0SrDuf7QUxVl P4XkH807j4EA5zmd9udnBn0t7jWA7QxjEDqEnmuCwKXr2y8xGt1xJ/pAqawStsUTrA8G 85Ydia9N3JtGI+T/mJ7mB51a0+eexicqawHUWhLL8ieJD0aOoiNQWGZ7qyNPvkLeUtqv BOlpJeItJ9nR1z/5/w61chbbp8lSOfHQUj4CGhmoKRkeEt1NLgffrdi5KXzTonB/1JtK 0kHBceJ8y879FBLfBnqTh4ndOdVVhy7Z329fooe6ZueR20mWL7z8Qu191Xt9i59A266E MkUQ== 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=nbBaxP0LM+G5/L9aN8Inih1LrU5lEBslCSq2v5UiNcg=; b=5lSWtg+ThF9DTR7cI7CtQ+jPd1NaBoaXodcl/nxtX8QBIuYmp88YixMJj2MsR7tjhO XJiCfyrRY44RNrLC+pUVRUxwjhySseIMyye7MYaJbSpQfEZyyEuK5ljhVUdy8R1S2HwX 6/GiqT4beZOfZiwCO66fNAI1wJPJIxzeVQmbQ7eV/38Buzyy5a9GJp/ORxsyAckeWOeo FEVAmQTSTwdk9wXtlQflv66PgxTeKx0FrcRqUAi1uy+k4HwaJlkInDXo484/DhhdyBBj GBIJ8yN/NGP5Mtytg6RcYdqphZrzNu0TCKhwA+TL7pvlc2xMRJncM0mgy72fP07eDKyf prlw== X-Gm-Message-State: AOAM532VLbfy32pdh8JSIMRdqDHJIm3xlAN0ppzzGCUST309plv26vZR R0Wyt5bVL9s+daYbbTPvMgxcyX3dwQB0jQ== X-Received: by 2002:a05:6402:292e:: with SMTP id ee46mr37900291edb.222.1641055919826; Sat, 01 Jan 2022 08:51:59 -0800 (PST) Received: from nark.. ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id gn8sm9280298ejc.23.2022.01.01.08.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:51:59 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:51:52 +0100 Message-Id: <20220101165153.440729-5-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101165153.440729-1-tcChlisop0@gmail.com> References: <20220101165153.440729-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 4/5] avformat/movenc: Refactor mov_write_dvcc_dvvc_tag to use ff_isom_put_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: 0Rar8zIda80F Improves code legibility by not using bit shifts. Also avoids duplicating the dvcC/dvvC ISOM box writing code. Signed-off-by: quietvoid --- libavformat/Makefile | 3 ++- libavformat/movenc.c | 24 +++++++----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index cd9810ba01..a9afb9c042 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -342,7 +342,8 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ qtpalette.o replaygain.o dovi_isom.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o av1.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ - movenccenc.o movenc_ttml.o rawutils.o + movenccenc.o movenc_ttml.o rawutils.o \ + dovi_isom.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0f912dd012..f1fe43a79f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -27,6 +27,7 @@ #include "movenc.h" #include "avformat.h" #include "avio_internal.h" +#include "dovi_isom.h" #include "riff.h" #include "avio.h" #include "isom.h" @@ -1911,6 +1912,8 @@ static int mov_write_sv3d_tag(AVFormatContext *s, AVIOContext *pb, AVSphericalMa static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDecoderConfigurationRecord *dovi) { + uint8_t buf[ISOM_DVCC_DVVC_SIZE]; + avio_wb32(pb, 32); /* size = 8 + 24 */ if (dovi->dv_profile > 10) ffio_wfourcc(pb, "dvwC"); @@ -1918,23 +1921,10 @@ static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDe ffio_wfourcc(pb, "dvvC"); else ffio_wfourcc(pb, "dvcC"); - avio_w8(pb, dovi->dv_version_major); - avio_w8(pb, dovi->dv_version_minor); - avio_wb16(pb, (dovi->dv_profile << 9) | (dovi->dv_level << 3) | - (dovi->rpu_present_flag << 2) | (dovi->el_present_flag << 1) | - dovi->bl_present_flag); - avio_wb32(pb, (dovi->dv_bl_signal_compatibility_id << 28) | 0); - - ffio_fill(pb, 0, 4 * 4); /* reserved */ - av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", - dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"), - 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); + + ff_isom_put_dvcc_dvvc(s, buf, dovi); + avio_write(pb, buf, sizeof(buf)); + return 32; /* 8 + 24 */ }