From patchwork Fri Apr 12 11:35:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 48019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp202798pzb; Fri, 12 Apr 2024 04:37:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXD48RARggeKoCplV9U7mzLdy/8w79BPtwo+YY+sNxb7NQ/jvKswUHLaVG64dgko1zgsRNatx3P41GsG9iKr9D6taUdEnyvL6aRDw== X-Google-Smtp-Source: AGHT+IGVg4YBPwASRH9i+d2hWfOpXo3WunTJGqyrXw+QCMuD+IL2T/jaFdXkI/I5cdC/nFHuy6hG X-Received: by 2002:a17:906:6a09:b0:a52:42b:4d59 with SMTP id qw9-20020a1709066a0900b00a52042b4d59mr2418877ejc.26.1712921831649; Fri, 12 Apr 2024 04:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712921831; cv=none; d=google.com; s=arc-20160816; b=DYUhE85walW3kTCv0RdeBK+1g/TupZOANVxPPER+lXRmXEq/kcSh1XBRabom0Mo+tD c2n/OzzmxmyRBvblbcoAPHoH5LIcqQ+LbUGx4gX1eNSfnZy+zQbbQoUW0aGveOqt5z3k WqOp+E74zDLvQyKWStFYaViE/o6OqAYRPwkx5lWg55wGaVadYP675fvES+ImdTY24+u4 1GMFuHMGLzn0w5X4eYIgm6CrL4Rj85xyiUINOUx778tdVEkxt7vLDlOIoPGzJfnocXTG Cm3QdI25kEytByphzbesnObS+5xX26pGysY9Lq0xKOpGyuaoo7XCilLzVIUf421fUF5B QowA== 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=JeJRRBqbeSjtqX46u+x1Mb4T9DvhI75j1WG4lGPR+sc=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Nw3HEs7uVRxqclhohQ2nQ/e2/3Hb6tTdL30hwKW8MRXN7H6iGKlQSkoZ6ICR8hGudh 2u1aUO5JLnLLheMN3ztwGDNBbH6qcnxXN6dTrhfZk3gIstP0AVLSgnzQQEh/wXaVaVca AwZyDhiaZKBf9bPR9LREJLzJ8Nyv20LmW1mz8boxjP4/kTTNV7xhLe+mZUZctrEDYBIn 5tv/NiRWpD4ciWvhCeELMYtbEx4Wk3EgQpVmnPjhiwpKBzF4/vgWBv368M6jRKp8muzH gZ9VkIzIfLmLubfwN7JyOe5VsL61Ynf4U8D5nsmU5CFwjqhKrHKvqm5tGz79G0KiWR0T z0QQ==; 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="dH5W/Nmf"; 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 dk22-20020a170906f0d600b00a522e4f53edsi901791ejb.249.2024.04.12.04.37.11; Fri, 12 Apr 2024 04:37:11 -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="dH5W/Nmf"; 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 4728468CD7D; Fri, 12 Apr 2024 14:36:34 +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 CC71768D198 for ; Fri, 12 Apr 2024 14:36:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712921785; bh=fdzzSnMNWSyP3hpqFbY7N9uiC16qCPuVLrtKJtiesX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dH5W/NmfkLU1dh7OQ1V3nQjIqywUKPc3b+CcN1KqT/Q/aYOAJePDve7RkqwSEvFZI JBHBBy/JreUrZQDGcGKHD0WAnuzIXTukgJoAyGWklIfD2qHZ6E4kIKc3fkxc3hlFMr 1/Mxpj8068Gtv4/tMpuoN2/aBbFuayp5mzbIQxIg= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 285D84367B; Fri, 12 Apr 2024 13:36:25 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Apr 2024 13:35:24 +0200 Message-ID: <20240412113620.84013-11-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240412113620.84013-1-ffmpeg@haasn.xyz> References: <20240412113620.84013-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 10/13] 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: 6b7zEGNWKami 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 6ede5119f0..1a0502bbb1 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2526,16 +2526,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) {