From patchwork Sat Dec 4 01:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 31953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1427267iog; Fri, 3 Dec 2021 17:10:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKHTJD1USTnecKrrXBzHuTEqPMPDXqTRT2YN0aZbTXn+/78yWLkkOpqgrcY7f9hu4hYZSi X-Received: by 2002:a17:906:a10c:: with SMTP id t12mr27862058ejy.429.1638580213742; Fri, 03 Dec 2021 17:10:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638580213; cv=none; d=google.com; s=arc-20160816; b=YrLfK2KvIf2ri5zujC++h92XRAAtrqggxOm/fP8qqp/OagOKBzBdTYiib6t9v0gIkI W/KlI2rWhNR0qoOG3MI9F9nOuEuF2r2ifp+PGyQqZnOsnYYSX2qX3/7XrKsbbTrnZRhT 1M/QM2l2UEdQpCLVAjbqPI7hTTe8nqYSKb3D3lRK0ho6jVF49aOTMJcYL/mvLrTgdCRK BY9YqPCQma2c382XJpGqejdRoM2SCVvSnuY1JB7++KmIurJbnrGn9KCnbgR0k6Em85qp n76Drvjl8SoGUY+VS9FqSfI27P2jg4C1CNfW0inpCuhaOWN06DQOC+pfwhMGzNck7YAb ss3Q== 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=4wdfjeS+QpL+Jb2N8t5tBHEVHLZuIcbp0Yd0aGSbyCQ=; b=wuyYLaocx0dgPHHJLf3KsWmT3+529uLXUN2LK0HsOu2FVqE9gGOp6+zVoKrKAgWjhC bS4PE4UcMQm8n0f4D+wTunexVt9pVAdR9B8t+Ic7ki65LPagOF18+30OJGgFHzA2MygE OTvujycOuOXcpqzYdG32V68K94iuE9DnQs85ZSCZecFmHfQug8FU6bUdK4H426vdJua2 3at/Q/gg68Gof+MKV8nFJvER5J0GRkIgSaz28+AWrdGWXhLx/7pkWlQg1JWIdZTVQvyS +6WUgB8rCeCD8svyy3o5jNT/Bc8r1jao9yIbhJSZIIPGnmK9tBL38rTu43Rs4+Q3UR7G WQ3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cb4tQTPz; 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 qw34si7843341ejc.778.2021.12.03.17.10.11; Fri, 03 Dec 2021 17:10:13 -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=cb4tQTPz; 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 4B7FD68AE13; Sat, 4 Dec 2021 03:09:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7210968ADCE for ; Sat, 4 Dec 2021 03:09:21 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id l16so9242845wrp.11 for ; Fri, 03 Dec 2021 17:09:21 -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=9inQPiCg/TIaEpe1ZFXqNJRyqgnV6bpeFJoHMXJkq8A=; b=cb4tQTPzhxJF9MbZmQf/MtztVuu3HU8ULkGWYeOd8KUaXW8IA6zMF7hU/TCL65aoyk ZPRZ7NKBOEEIOYaSWxL2UjNuGt+/gaQt5MnwHEcHMfRqclNnqAJbcYCWXgGONHLxAMm4 BCrDWaSksbQEmgLuoZTGsjbYb5k1ashONsVUNjTbTQQ7Q5O21MANcGwMhGWGgmj1GtVV j+QazP6RWuMPUUMYvDt0oJxmpK5O+q0w9r6+VPVA4bcyoKRGnDOy3WLN1XhNtOiq3DYL FEYScw/UDo9Gyou/TNn88b4B+ZEQ5M4OHnZRSlGLACQ7yI9EwUhvNH7yxVLnD3rAHxLI EFBg== 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=9inQPiCg/TIaEpe1ZFXqNJRyqgnV6bpeFJoHMXJkq8A=; b=sQQ28KNhjNWEsw4NmeDHFnF2DlPVCWmGaktlhEtle8BQu/YvniRD/iikNuZwJniIcp hKksmXMuTHT7DTWhwEvpFuqFbkAorBlPHGAN49g5IaiQqN3ACkkg/G4VL7JfZXjB5CWW sf7VwfimeUUJQWEc6Xm/XJ03r/TkzWpXlEr2yzPBFHUCCWe9MGEuCQWJ2+JsaeCCbyDn H5YTbX758W2m8W8khLOcRojRlIuqEvs9le23SnlaSQWaIJYiUbkI8KFtwppbHrb/8Cgv 06IrZf6S6pld+dW0ETkZ/kIhFtPOWU/dZPfeihSA8xjW+T+vIqr6r3QuSZyqEBZ+lqHt kOZA== X-Gm-Message-State: AOAM531jgykCXZAH0QxO+YkNKAgPo+0FXUj/kxpFnoz+dfqq+VzN+3St qV3kiT9XXd7sy7ht4YlTvPN4fetgMZEgJA== X-Received: by 2002:a5d:674f:: with SMTP id l15mr24792594wrw.624.1638580160764; Fri, 03 Dec 2021 17:09:20 -0800 (PST) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id d8sm3873739wrm.76.2021.12.03.17.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 17:09:20 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Dec 2021 02:09:04 +0100 Message-Id: <20211204010905.2258652-5-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211204010905.2258652-1-tcChlisop0@gmail.com> References: <20211204010905.2258652-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: c/yDPb4k+DSu From: quietvoid Improves code legibility by not using bit shifts. Also avoids duplicating the dvcC/dvvC ISOM box writing code. Signed-off-by: quietvoid --- libavformat/movenc.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 38ff90833a..79f7d70747 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,9 @@ 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]; + int size; + avio_wb32(pb, 32); /* size = 8 + 24 */ if (dovi->dv_profile > 10) ffio_wfourcc(pb, "dvwC"); @@ -1918,23 +1922,11 @@ 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); + + size = ff_isom_put_dvcc_dvvc(s, buf, sizeof(buf), dovi); + + avio_write(pb, buf, size); + return 32; /* 8 + 24 */ }