From patchwork Tue Apr 9 12:57:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9c8d:b0:1a7:a0dc:8de5 with SMTP id mj13csp333437pzb; Tue, 9 Apr 2024 06:01:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIW2sXROOOW1sQgMq88FJh88GX63k5V6/RFqQGPoX1dSrx+4vJfHNAU+RisNhZa9DfvrpLX2LvfIBaFGFJSUMVdhgu4BG+md22rA== X-Google-Smtp-Source: AGHT+IERkHoGzOXL0NikFIqvp7pafXBYbW+iPZa8V11PuJasVngqZ9+ezy9QsbMogJ2gbO8bp6dM X-Received: by 2002:a50:a6dc:0:b0:568:c6fd:4f50 with SMTP id f28-20020a50a6dc000000b00568c6fd4f50mr2644507edc.7.1712667665550; Tue, 09 Apr 2024 06:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712667665; cv=none; d=google.com; s=arc-20160816; b=oV27E4U+mNRCKlBupzDDnpFi8jG/Ad2IQC5WIhrJdqBnukrEtS+AASB4vlLG91uzfl YhoFLDsi1eCfNql5xa6+8GzxONAVk+x6PnnSvcGKQje8e26vSyk9bVkDiYU7Ol0/FQrh s6bEfXWhzVe5piNJH/H1xlXVjf41TTWjlzZg3HNu7R9AsB5KRaRGrUP4qkSK2Xj+4z68 OcuQQBB7cQp3c7d8Sgg5AywaAl5R9D+T2D+zBOEXBhEEmyWQvn5ML6MebgHzswL3tGeg wsJPtKu/SkRjk7JOwL08RGpnbTXoCctiZwbBemrMAm4LtZFXhdbKpXNUF+Z3oI8cSLqg BRiQ== 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=KFvt0cDf+rz3IIsMfYzajc+WTivT5e1h1KmicteZEf4co7/7UPbr8NhPbSDgC/L5EL g6EcOIwMG6fRtM6Lnc8vlGzxL9X7nJVBF9+RzsPgjmvl4VgSUY4VLG39FUHNen3Htsr9 FY3RRVJCmv5kyisOoefIQgmQhKbiLBwYMx2j5ixdelXt9wNQ7lqTq9Squq/LJfSN0Fdr d5lksZ/dKuogHpBdeAnlC0+WOxsaw/USSAloxKg8UntwLj96qmU+VcqSTjTU1+AmnLw9 b+QxK/EHHjtexohvok3pnr7ZB99SgcPrBjchvRR5MInq9hLaSX0J4LKX0IARfPbOCUCO m+OQ==; 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=WWNgZyAH; 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 b29-20020a50ccdd000000b0056c49ebbb14si4788698edj.275.2024.04.09.06.01.02; Tue, 09 Apr 2024 06:01:05 -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=WWNgZyAH; 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 E228968D1D8; Tue, 9 Apr 2024 15:59:31 +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 1BC5D68D18A for ; Tue, 9 Apr 2024 15:59:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712667558; bh=AEStckKVyU7tZ92H7sOZKCzIyc/boUg/jr6V6WIiRbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWNgZyAH1ZcQhkQsS7/DuHU8VDNL5JQC25NTzABRwTPcOhEMpcgvdAnEqF+wjmIeD +jYKUBPNL/OLBkA4WJ6hKwsZlYN9yn+dfFLJzjQCJX/UB5r9jwA/WEEwzhgdzWS5eJ Nl7TSQyWO21Zx6hST6ChaPB2DbCohN7vRQiL+IfI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 20F4B43315; Tue, 9 Apr 2024 14:59:18 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Apr 2024 14:57:28 +0200 Message-ID: <20240409125914.61149-9-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240409125914.61149-1-ffmpeg@haasn.xyz> References: <20240409125914.61149-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 08/11] 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: 2l1fzl0qBPXi 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) {