From patchwork Tue Dec 14 15:30:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: quietvoid X-Patchwork-Id: 32499 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7121660iog; Tue, 14 Dec 2021 07:30:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNpwXPyR6GIVUZ/qJMLrKbQCD/KLiBkH0iOySvgQZ84XKJ4GnlMjnheV/b0nAoFFh5MmzV X-Received: by 2002:a17:906:7688:: with SMTP id o8mr6634507ejm.291.1639495858784; Tue, 14 Dec 2021 07:30:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639495858; cv=none; d=google.com; s=arc-20160816; b=YKW+uFM6EqjqsU6iF7ldGDK0Rk2AWpT191qW8teZxazF9K0t6M2wZpHPV3aNdyrahn xfV4FqGMGh6MLmkeZ+Y2SNQiFZY8S4vbmufRzq11b9j+JezTh/bvMy7xERiaMol5qGL+ oZinxGSKizFVnYvhnkW5845rBzTz5v4U8KX7Z7k/xeis3aW6paLQhxSbDfqdPbFGKQme iZHkIj2DrYHWrxHqVA+0NQudF88FObK1Fne5lbSIH2rx19JnK+R3IIFD/kMoFqDmhqJQ pwNvLQFUah75b/rrVaBznalL/Cr1q7CQZa2afiUTuGCEVvIk+9y8jtaY44sHKEVCkuwo twsQ== 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=RBeakLvmP/jA4/L0l94u19OMipzocuVWNwn0/XY6/t0=; b=jNIqAbk3vrGwW2347JBTeKIfVWcJpy2h7aRq/Yv2woAY1vLMeJVEkNXyxok2vV57pC J4r34PiywX4XhapE83vMaISalu0cJNEi21xW3cLbfCjgm117q4CeeoCFTFrzDOpfcNsV F2zD2LISuJFmPXtmhP1Z1Wdhj/M2mDzfp9UDhJFXbkUbTGFDDMKpQvw0UoQLbLYZu/Rq idv01BOjIE8irs4xVjvvXJ+66HqZcAVrty1BUBR498eojHTDyCL4RoW2fX6QH/BFAG+h 57QnJKRgnF1mQq7SCjqM7zmLCdMJ9ysKK3bUIKOZoXhV/VHXjdGXf7GLOLWU2Ev3FNXx zYBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=D1zA36tP; 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 js1si253091ejc.427.2021.12.14.07.30.57; Tue, 14 Dec 2021 07:30:58 -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=D1zA36tP; 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 E2FE468AFCC; Tue, 14 Dec 2021 17:30:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F024568AFD1 for ; Tue, 14 Dec 2021 17:30:22 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id x15so65280899edv.1 for ; Tue, 14 Dec 2021 07:30:22 -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=t18oN08m/ZUIztIXRhz+vMmx7LZSaDSOY8dAKJ1AW3Q=; b=D1zA36tPnTg8zW+x4AM2oMVL0QJng30tUv2PHJ5bdXrztf5IIIJrwzze4iBKodO1iX jdmF8/icYeG5UmNdReeAO0nTVirTEEqOEaKEj29sww6H/wnmjKQzPMSbLxubozABmuyM zRGiTdss3oznKM+PRmYSxmW6GNHGdtTgByAPFrma05I6Zz4bJSBk2sm8DSN9r/BMOwK+ OMZaLbRc1Doy2xOJFyETyIJFKNhHgsWQQMi1XxakioSCTG2piAJwkQGOvspjPCQ9+kfX vI9bLddPxV+muFhjpuXhwTZC2A+vIPvEnxkDX/3MW9dxuuQJZW87APH8EuCXm575/MbK XE3w== 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=t18oN08m/ZUIztIXRhz+vMmx7LZSaDSOY8dAKJ1AW3Q=; b=RZrUy+Nu2G0xKJoRIOVQ9WH/KyFf91vApbR4/AcIHMh7c1byZ11ey55D/QsygixmD+ 8ySXNwT+nUy6OtSiQ6jXC+kK0CfldkxRNQUo21JfxM+qFAora64LJPpQqa9KxmTzZzLw HT3gO3xZdwDfKiUx4KUIT2bsmLy5qbUFLXQO9Fmw9h5oTtk5z8L3b/Mvn7KTs/6A4Cou tJSZQoL6sR4jUATCp+Y/ibrH4HWEmtR2EZNJEN0EVvDBz5xvtNJj656SLIc3ii1S40Z4 dvUIyLARRvLC4a2+fyBZG8QuLRq2uNVOlm4wEPowo5ObZmHRngkwg7vWun7fQ/Kmr0CP zDjg== X-Gm-Message-State: AOAM532bRr5Ov7J6Ua9K4HmzjtqUluJ6UblGviV8eE1s7jHPdC16SnQ2 sGl7mSkydpqRYpthqFSua4F1kWTukcHCcA== X-Received: by 2002:a17:906:4dd0:: with SMTP id f16mr6360805ejw.454.1639495822240; Tue, 14 Dec 2021 07:30:22 -0800 (PST) Received: from localhost.localdomain ([2a01:4f8:162:73cc::2]) by smtp.gmail.com with ESMTPSA id p19sm22062ejn.97.2021.12.14.07.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 07:30:21 -0800 (PST) From: quietvoid X-Google-Original-From: quietvoid To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Dec 2021 16:30:00 +0100 Message-Id: <20211214153001.2610297-5-tcChlisop0@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211214153001.2610297-1-tcChlisop0@gmail.com> References: <20211214153001.2610297-1-tcChlisop0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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: 3A8VkuG101oU 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 | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) 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 */ }