From patchwork Thu Jul 18 10:55:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50628 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2011:b0:482:c625:d099 with SMTP id fe17csp313201vqb; Thu, 18 Jul 2024 04:31:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEAR0IIZNXpoEc3i0sF831aRqA/LcrJGrkytIdFGa7BubFkTwOcJ0+r475xs3zhINJ+ZxNlBd4IdEcOZ2JMYAj0uUgkU/U2Ufa1Q== X-Google-Smtp-Source: AGHT+IHt/nBG94sxd9U8CmEyX3tyWl9a6ppf7uToZJU6C24BGf1l9unyRr5YpbUYqku3VCcHPkvI X-Received: by 2002:a2e:8750:0:b0:2ee:dae6:6cda with SMTP id 38308e7fff4ca-2ef05d42e74mr15168041fa.43.1721302310082; Thu, 18 Jul 2024 04:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721302310; cv=none; d=google.com; s=arc-20160816; b=T/THKgm8GjfPnlgbJqBM+4tw706jAzm01pNRNneyFCYE3n+0eYc0zxyJU627WCAf5C aj4EArCWY1dPcWmMAtnNX3dF16bX890L3re3ogoGwg5I4RTXoX90ZyFlr0bXC41fdXdO NoD+ks1XGL3QwAoCGb3dP9BUnw+Y9cg6cOQBQz1EucqAnYbXdfcg31cMWs4VMKgGFyGC l2xbYOM4YAWRjcUK36k+NK+PKaq9aMAHNnf8YCNkX53imrODuaEt5LWKrLajIrIz3ESf 4SPjnFoTKKUSoVMlQetUBaI/ygWCcxSnnTHW5PJ9N71BnJQeBGQETvGHZfLWwqDQyLNL bFIw== 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=aI87Oiz+eUAA9Aq4nIwlmyP0NpBcI7czH1Vde5FAGr4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=YpIuYkJbkb03aF6WnfhBqhmTzVWMTAI3W8kTHdCTd5An+w9TTC+tDCxZ0E8AjieeAD lkoaHE6WrpkG80tJ1V97fTmhxX6AxAJcDJk4o9NN2VrPpyLhLiYRbRk80P/RFRM1cuJz ZbUsFjJ1Vy8QuKrpv0qcU6Z3mlueWcWiF+Tmqbsd1HArNcb+Vv57TidgGvetZ1OomegW o20AyUyMC26kSsBAZDKCCZH+4qPSYFaNdoDxmVdXQUazk3t6pKZ7+0umu8MTIHaB/3du wEcdoXAXtgkSGCibqUaMmsyEEhgsC8gGww6cdM0QLEYg1jANLhHpJWgqgnle0m245SGi wSHg==; 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=fosT8kF6; 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 38308e7fff4ca-2ef072f600bsi3767501fa.403.2024.07.18.04.31.49; Thu, 18 Jul 2024 04:31:50 -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=fosT8kF6; 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 0964468DAE3; Thu, 18 Jul 2024 13:55:16 +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 6B95F68DAF8 for ; Thu, 18 Jul 2024 13:55:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1721300106; bh=+ngB0sKO02Qijo+8OX61hnOm4oBARuas0BJZPQNbNnA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fosT8kF6DcynJns+arBN4AIVAMtqKh0VG7KmLbJjm5IV1xy4BlLZ//+lx+5xkuZX6 v6Y1QuOOwGQOg/EMlgnEiBD/n5771zLdhqcGwur5mVm34BkvRarMlRjF12JBGHjju+ kOnGHOvamvgLNVqWK95g5dATlEFQQIzZWXCXmqps= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2DC9742383; Thu, 18 Jul 2024 12:55:06 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jul 2024 12:55:02 +0200 Message-ID: <20240718105502.232604-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240718105502.232604-1-ffmpeg@haasn.xyz> References: <20240718105502.232604-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] fftools/ffprobe: implement dv_md_compression 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: IPB+jTm387LJ From: Niklas Haas --- fftools/ffprobe.c | 9 +++++++++ tests/ref/fate/matroska-dovi-write-config7 | 1 + tests/ref/fate/matroska-dovi-write-config8 | 1 + 3 files changed, 11 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 0b7d4ce0d7..f9bc830f33 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2603,6 +2603,7 @@ static void print_pkt_side_data(WriterContext *w, print_dynamic_hdr10_plus(w, metadata); } else if (sd->type == AV_PKT_DATA_DOVI_CONF) { AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *)sd->data; + const char *comp = "unknown"; print_int("dv_version_major", dovi->dv_version_major); print_int("dv_version_minor", dovi->dv_version_minor); print_int("dv_profile", dovi->dv_profile); @@ -2611,6 +2612,14 @@ static void print_pkt_side_data(WriterContext *w, print_int("el_present_flag", dovi->el_present_flag); print_int("bl_present_flag", dovi->bl_present_flag); print_int("dv_bl_signal_compatibility_id", dovi->dv_bl_signal_compatibility_id); + switch (dovi->dv_md_compression) + { + case AV_DOVI_COMPRESSION_NONE: comp = "none"; break; + case AV_DOVI_COMPRESSION_LIMITED: comp = "limited"; break; + case AV_DOVI_COMPRESSION_RESERVED: comp = "reserved"; break; + case AV_DOVI_COMPRESSION_EXTENDED: comp = "extended"; break; + } + print_str("dv_md_compression", comp); } else if (sd->type == AV_PKT_DATA_AUDIO_SERVICE_TYPE) { enum AVAudioServiceType *t = (enum AVAudioServiceType *)sd->data; print_int("service_type", *t); diff --git a/tests/ref/fate/matroska-dovi-write-config7 b/tests/ref/fate/matroska-dovi-write-config7 index dc5b73a44e..5f3e000279 100644 --- a/tests/ref/fate/matroska-dovi-write-config7 +++ b/tests/ref/fate/matroska-dovi-write-config7 @@ -45,5 +45,6 @@ rpu_present_flag=1 el_present_flag=1 bl_present_flag=0 dv_bl_signal_compatibility_id=6 +dv_md_compression=none [/SIDE_DATA] [/STREAM] diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index 44ca015e0e..85899d5f6d 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -64,5 +64,6 @@ rpu_present_flag=1 el_present_flag=0 bl_present_flag=1 dv_bl_signal_compatibility_id=4 +dv_md_compression=none [/SIDE_DATA] [/STREAM]