From patchwork Wed Apr 3 15:43:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp485695pzb; Wed, 3 Apr 2024 08:45:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWnwCr+fjwFEZ+rgX42wL2SQhVvP0vxMSMx+vkSJFJS+mR4WexA0lWsPBnHpxayLsMozhiA9UG1G/WG1MbsxKHG9zXlid+ULxBO6Q== X-Google-Smtp-Source: AGHT+IEAK4ZEgChh1ReDLqk9lIGY7WF2Vyq6LFmryjDhFU169AVifxCSwVcPDrQRtJ4mChr7OnB9 X-Received: by 2002:a05:6402:50d0:b0:56c:62d0:2cb2 with SMTP id h16-20020a05640250d000b0056c62d02cb2mr11285922edb.3.1712159101433; Wed, 03 Apr 2024 08:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712159101; cv=none; d=google.com; s=arc-20160816; b=ftvf26cT1QX6nIrLg4qCO/jwylY82OpHRcyzskQ68PMJjVJEnn22ogRY9/bgqKnL6j iXop5d5AU3QAEK6pZm9bcOtY7ywvrjlEhbIHlrk+Rzg9++B4sjFpifsFxdrlvyapZDwa +PH7bquTUSoLBRwG9Z3FRMLhX0Z8EVFjVIpCgKUxJ1KzTsYoiZuMLUQYfbrlyuFueoCK COunNHvsMhm7mmygURC/lSrTHppamk7vZZgRgpLzwW7LdgHKRsrr4WDZ936pBliATscv 6SBXhTV5v8qAGc7zp92l2suwJpxHAI1PiakeYE1I4saEC0Pb62qbpQpdkb7Zzp0fL4nN je+Q== 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=3fxPBVRCY76DKwlSILK4O6x0vfw/agwKqucbGUJ8tHQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ZFJBMkDrymBPUTSQEXmU/Yb7DonLSvpc0BuMnr4IeH33iLizIbsV5XwQOTe+k0t02e MD5cPk3aes8DdXYF5DXMTijuMl1FSi8yLwp5K6Nsjyvzpc/dh/6gCrs9R0Mtefv9Anoa LkuJKfxmfwP+9Y4erL7zgRJiUmicAj8BFXr0gMYN3Gfxzu9HdTnce87MjlgXE6jT6/LB ZBnvbQg/UFOxrTbOeeHDoa3X2KRRK/RkhnAPIJVxMQ+CJWZ2ON/VW/yRgIiRgGEemxfb UI+vd/oTonqVYzEvKM7kXDlk/lJf45FZIpBnDdBQvaYRNG3qScU3NoNKbu6i5XUOuRGG nxxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=YUZPLjOT; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f20-20020a50d554000000b0056dffbce5basi1027071edj.405.2024.04.03.08.45.00; Wed, 03 Apr 2024 08:45:01 -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=@haasn.xyz header.s=mail header.b=YUZPLjOT; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFB7968D202; Wed, 3 Apr 2024 18:43:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE48F68D1C0 for ; Wed, 3 Apr 2024 18:43:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712159017; bh=AEStckKVyU7tZ92H7sOZKCzIyc/boUg/jr6V6WIiRbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YUZPLjOTJ8jJNlweUWA7sDxVugoilX+I8f6VNu64ZPZIK+ReWHBmLBbFjMj6YpaXT 4ADGEh3PlyykGWu6349gGKsyynrtsux+hMu7kOwK55/2ykpbYkNRhPG7pj/6lT6gDF XDqosIePK0jFNE3DFpDTXK+k6HLMWjVq8d3WOwWQ= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 09AE743961; Wed, 3 Apr 2024 17:43:37 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Apr 2024 17:43:30 +0200 Message-ID: <20240403154330.71585-10-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403154330.71585-1-ffmpeg@haasn.xyz> References: <20240403154330.71585-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/movenc: warn if dovi cfg ignored 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ecW0wi4dut+R From: Niklas Haas Since this is guarded behind strict unofficial, we should warn if the user feeds a dolby vision stream to this muxer, as it will otherwise result in a broken file. --- libavformat/movenc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 15b65dcf96d..0f819214be9 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2528,16 +2528,21 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex const AVPacketSideData *spherical_mapping = av_packet_side_data_get(track->st->codecpar->coded_side_data, track->st->codecpar->nb_coded_side_data, AV_PKT_DATA_SPHERICAL); - const AVPacketSideData *dovi = av_packet_side_data_get(track->st->codecpar->coded_side_data, - track->st->codecpar->nb_coded_side_data, - AV_PKT_DATA_DOVI_CONF); - if (stereo_3d) mov_write_st3d_tag(s, pb, (AVStereo3D*)stereo_3d->data); if (spherical_mapping) mov_write_sv3d_tag(mov->fc, pb, (AVSphericalMapping*)spherical_mapping->data); - if (dovi) + } + + if (track->mode == MODE_MP4) { + const AVPacketSideData *dovi = av_packet_side_data_get(track->st->codecpar->coded_side_data, + track->st->codecpar->nb_coded_side_data, + AV_PKT_DATA_DOVI_CONF); + if (dovi && mov->fc->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) { mov_write_dvcc_dvvc_tag(s, pb, (AVDOVIDecoderConfigurationRecord *)dovi->data); + } else if (dovi) { + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'dvcC'/'dvvC' box. Requires -strict unofficial.\n"); + } } if (track->par->sample_aspect_ratio.den && track->par->sample_aspect_ratio.num) {