From patchwork Tue Jul 16 11:23:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp205613vqb; Tue, 16 Jul 2024 04:24:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXnjCMk4527q1wtXcwdLd4A92Db98ciq4/oN3CdBAIRR5q9y3BeD1jPg0tyQGcQVmX8Qff9dbd9GDG7umF9SGa4qZ8Nu4Pnwf0Fxw== X-Google-Smtp-Source: AGHT+IHF+FdvtOYPRcqxfXUY7UcYSwq29TKE4oMgpczXBZcxR2cevsTxfyG+WOF4/tUrxlZFKcTc X-Received: by 2002:a05:651c:1254:b0:2ec:57c7:c740 with SMTP id 38308e7fff4ca-2eef41d72bbmr12368631fa.39.1721129076515; Tue, 16 Jul 2024 04:24:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721129076; cv=none; d=google.com; s=arc-20160816; b=u1bm/LdClJhhjqs9Gc4hRznRC6fp6eS2RwyP8oZOu5QMSt4y7H61+u5c1VEJJms6tb gbtvcuBUPryj75IFtVhJCu2VZTzoMFnWaphEfz545kuIVoEOfNVXkFOQ0FCYQXp+MJCs 1tYUWPJwLft4AJRvAPH8xKBCuQIqichEkWan4btjkzpBT9ypeYOl2L0u7VOXn+SQsyjY 8cTINXcWjCsApKT/2EImdS9riygcR/eY1fEVWs5O6Ah3KEpZ8P4vYgQ3E5WhCLsYgwpi wjTc+pxJAR9UUvR96Vlen9wQA4BuGsePlRyxeON3se9K9zvUwr9uLfWQRz1bzLXveERn /G6g== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=AJbRuKM/XywHTMrGJ+dAwrvm5QLiIDifp7vr6dVkQd4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ggjbQa0wc2Fia5hVy/f1xgfvsiKmEr6U6YPm5Oww8DB9ChETA0aMFG47AY6m/LtDbv XMErRuOKLX3/1NZTiaNiFBj9kHZoq8cppIAhLoO2xUk+XmFiCayvr+D213g8/3AVQf9g DUiTaJhYRc8xiWGOqvG/hdwMiKnfmPQU2xSw/9BK92+kVmPjvXd93A68JY4lxYXVBB1f rUdBRiglSltUcKohCFzsXLo8kUltSq/F7YtAb0DYLhE38TppbUWRDNVbPGXl5FZ1/yE7 +UPnO6rqWswXL2AKY5+xWKvwRUlJrX7N8c9CLsDa1Ohy2mgp+bz8vTF+E9E3/9WqIajq wYRw==; 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=cASF6oAu; 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-2eee17ad42esi18079931fa.176.2024.07.16.04.24.36; Tue, 16 Jul 2024 04:24:36 -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=cASF6oAu; 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 6DD1C68D9F3; Tue, 16 Jul 2024 14:23:59 +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 A871B68D973 for ; Tue, 16 Jul 2024 14:23:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1721129026; bh=UZltaUdesu+f/xZ4clBZH6fOPftsPI2A12yEYAYV/nk=; h=From:To:Cc:Subject:Date:From; b=cASF6oAueRa/OOetN83q96PBm5h/w7GbN8HPC8ZYjYsMh7LIhRTVHlFeO2wWxFJbY mXg+05MdPEr1dPALouym2nGD0Y55oSwSluWsAH3ANN6NHl7LJ0eBafeOLuj3ogLGJ/ CvvHu6X5VJzsuGFeGL8xh7FjIPIQNEXqaTwEG6xc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 504B240216; Tue, 16 Jul 2024 13:23:46 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 13:23:13 +0200 Message-ID: <20240716112317.35745-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record 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: 4FTQ99AhwUjW From: Niklas Haas This field is used to signal the compression method in use. --- doc/APIchanges | 3 +++ libavutil/dovi_meta.h | 9 +++++++++ libavutil/version.h | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5751216b24..80ab3012c3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-07-16 - xxxxxxxxxx - lavu 59.29.100 - dovi_meta.h + Add AVDOVIDecoderConfigurationRecord.dv_md_compression. + 2024-07-xx - xxxxxxxxxx - lavf 61 - avformat.h Deprecate avformat_transfer_internal_stream_timing_info() and av_stream_get_codec_timebase() without replacement. diff --git a/libavutil/dovi_meta.h b/libavutil/dovi_meta.h index e168075a24..c942d0e133 100644 --- a/libavutil/dovi_meta.h +++ b/libavutil/dovi_meta.h @@ -46,6 +46,7 @@ * uint8_t el_present_flag * uint8_t bl_present_flag * uint8_t dv_bl_signal_compatibility_id + * uint8_t dv_md_compression, the compression method in use * @endcode * * @note The struct must be allocated with av_dovi_alloc() and @@ -60,8 +61,16 @@ typedef struct AVDOVIDecoderConfigurationRecord { uint8_t el_present_flag; uint8_t bl_present_flag; uint8_t dv_bl_signal_compatibility_id; + uint8_t dv_md_compression; } AVDOVIDecoderConfigurationRecord; +enum AVDOVICompression { + AV_DOVI_COMPRESSION_NONE = 0, + AV_DOVI_COMPRESSION_LIMITED = 1, + AV_DOVI_COMPRESSION_RESERVED = 2, + AV_DOVI_COMPRESSION_EXTENDED = 3, +}; + /** * Allocate a AVDOVIDecoderConfigurationRecord structure and initialize its * fields to default values. diff --git a/libavutil/version.h b/libavutil/version.h index 814892a4d5..852eeef1d6 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 28 +#define LIBAVUTIL_VERSION_MINOR 29 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From patchwork Tue Jul 16 11:23:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp205529vqb; Tue, 16 Jul 2024 04:24:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXDfT/ABEbGdLUWXnmlK3MMSPe3gC4T/hdorKHPprVkHSgV06CD0eobwH0S+9el1OwMHxvG8e/3nomWk73kz59Q6A6SHj/fD5O/Ng== X-Google-Smtp-Source: AGHT+IEhXjlQCo3Pzw2D2sNp9CpJmBm8snXr/AkJyKa5jwoMGH576rE27MRkDsV6f+yjS1sQr2MN X-Received: by 2002:a05:6512:3408:b0:52c:939a:d709 with SMTP id 2adb3069b0e04-52edf74aa87mr558627e87.0.1721129066892; Tue, 16 Jul 2024 04:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721129066; cv=none; d=google.com; s=arc-20160816; b=J7/UiJ8bbgvpyocZmautGmppiLPUCa0+Pj0JxlzHuSRudLwmUc6g7W9/cllrpTEP/1 SqLwaONro1xX9fN4nMH/FT3fBp7m+to5MZ7hQBp4ICKmQiMqUJUKi/utm5G9Ma+adVO/ ue2SbdKErHvreM8Su751SFOjx6wuFoIpO0mI4KuV/EPluXI6GnHMoAEB4zFG5+Uc6KXW i9YsDHHFMzRIMvFjyBhs3fZ3n/cNYf6ZDLlA3oQFQonXW4JleyvFQZuzDduiHx370Zhp 5/Gr14apF4byHU0YJ4BJ0emVrjrGAxCJnhNCC/otrDpMiq4zo5UW+Cdh3ZLThiQ0c8Qh ySgg== 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=YMTzNY3023L1gRnCGnWdx9rJ1gV8Cjmq/1UHllFGKE4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=QT5DZygcC+P/ss28h5WSgTUZUGq4Yj3ngm9eCGar35nO42X6q7cKm3inj+K0AC5PYn CiYddnMZ1TmzVhYh5WQbIc0wcjoSNGrBFCyUMheP9fYUfbSDMqxXA2rz5qKMBvuu7VCX 1KYBOp3/BT92hnVLCiwcaxdQvGp7xrHpkDsMFOTyisM9PQLf5Dd7Ye0Eb5QKwaSI+fYz lPW31PCI9w4KPrwW9TqUoRi+U9DBazQ4YdjTzjzMP1ol8DNu0vWUk/I70u7q5OXMbl3A xCDxgdReTv7T/aICFly3H8m7GNkawUV+NKtTswUbk6oyd2ltRMeSbyDNki1K0daonV5q HhcQ==; 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=Nw4036OP; 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 2adb3069b0e04-52ed2582286si2030640e87.617.2024.07.16.04.24.26; Tue, 16 Jul 2024 04:24:26 -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=Nw4036OP; 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 54A4568D9DC; Tue, 16 Jul 2024 14:23:58 +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 A58E968D8F5 for ; Tue, 16 Jul 2024 14:23:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1721129026; bh=4L+kS2PE4yNx67/nGhtpx6S/yoHUXDP6CWFesTiH9co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nw4036OP9C3jDzJENUuF+KGcDJPTGHO5e/12t0gg4ya3NlgJxz43OhR2it4C5C2Y9 QG1f1moyP8FJk1kx/+WXKct+9VeGqURGbBFZDmdPMrsN7i/bXHKI+ym/J8kiqA6MYy jcNoFKc0MnZEvA1Y3ExfyNjA/BZyeFTS9o3IgKhc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 86A3140455; Tue, 16 Jul 2024 13:23:46 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 13:23:14 +0200 Message-ID: <20240716112317.35745-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716112317.35745-1-ffmpeg@haasn.xyz> References: <20240716112317.35745-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: 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: bQf3p+JKUuFW From: Niklas Haas --- libavformat/dovi_isom.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c index d49aa5a75f..269374cff9 100644 --- a/libavformat/dovi_isom.c +++ b/libavformat/dovi_isom.c @@ -57,11 +57,14 @@ int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st, // Has enough remaining data if (size >= 5) { - dovi->dv_bl_signal_compatibility_id = ((*buf_ptr++) >> 4) & 0x0f; // 4 bits + uint8_t buf = *buf_ptr++; + dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits + dovi->dv_md_compression = (buf >> 2) & 0x03; // 2 bits } else { // 0 stands for None // Dolby Vision V1.2.93 profiles and levels dovi->dv_bl_signal_compatibility_id = 0; + dovi->dv_md_compression = AV_DOVI_COMPRESSION_NONE; } if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, @@ -71,13 +74,14 @@ int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st, } av_log(logctx, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d, compression: %d\n", 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); + dovi->dv_bl_signal_compatibility_id, + dovi->dv_md_compression); return 0; } @@ -97,8 +101,9 @@ void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE], put_bits(&pb, 1, !!dovi->el_present_flag); put_bits(&pb, 1, !!dovi->bl_present_flag); put_bits(&pb, 4, dovi->dv_bl_signal_compatibility_id & 0x0f); + put_bits(&pb, 2, dovi->dv_md_compression & 0x03); - put_bits(&pb, 28, 0); /* reserved */ + put_bits(&pb, 26, 0); /* reserved */ put_bits32(&pb, 0); /* reserved */ put_bits32(&pb, 0); /* reserved */ put_bits32(&pb, 0); /* reserved */ @@ -108,12 +113,14 @@ void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE], av_log(logctx, 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", + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d, " + "compression: %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); + dovi->dv_bl_signal_compatibility_id, + dovi->dv_md_compression); } From patchwork Tue Jul 16 11:23:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp214654vqb; Tue, 16 Jul 2024 04:41:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX/GEIu78utbeeOj9yDmhUmEDcO0u9KrOH/7PTaSxGjXSGr5y4GOEd3iPDFSj+NWOUICP9XtfrP+SobriQoF5QFS2yJ7s4iDgjmKg== X-Google-Smtp-Source: AGHT+IG6d82N34ADMWTGqckpen3z05ejGjRqa0kgItppkT6WzFQtRI5OIF8S4GbYn33uUbig2iYh X-Received: by 2002:a17:906:6a92:b0:a77:e2e3:3554 with SMTP id a640c23a62f3a-a79ea435a26mr124652166b.28.1721130109305; Tue, 16 Jul 2024 04:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721130109; cv=none; d=google.com; s=arc-20160816; b=znhNNOcD4KQAmyQwFBFbCBQDnbwVNUZTF+slBqUMrLGzMSU9WcWANtDPwRtttorVmR 2Cd9B1pj0Yojmro02eC/OsgzlbIo6OZ9f6YJ1qWXCAVFLq5oV7w7zX70UMH83ou+hKTh 0ndEadn7WsZodLtHblC+jUIphvEsDxURLrg+p4QZ8H5cc4JpqMISYeLoCcate6XyCRPK S1bAXfl7R1tfgWBKo2cg/jLdhnxccIjRDqVraZe+4Z+PiyfMt1k+/t2oibg7C6z8mFsU LSNFcudJz+rBe0Jin0RkW/ul0kwirFmTTbHnzH4Q9R/TnT4X4Jrdvuhgp3fq9COAn7sT mAwg== 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=SZ4cAgqWMN1MDSeUGHg8mpLX7sFsxjWRQzd+oPZGrH0=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=RDtV5wo4NEkSJYpfKFXsLlF3+X/8oCt1YAdLHJUxn2fhMFTRX3PZ5J8vdRinrQtJDA csuS3NM/rEkV8ccY4MSnTmVY7hSaV4BJPPBMW17t6X5SkKJqYBNrIN40Ejxe2R4YzxRX xERn5RxYxQOIoHZuDC6PFGqY0Td3e7gzeKkJA1H2tPrSvvMDp3U1YNasoD6wXo4YzwOx jpDrCjWuQlLaeo3SgDZI4HDT/Bt2AofqlX7o41CWqLAdigLHvAxfk1jX28KooaWMDJMo jYZ0/pb/P18E3XtfyVdjFTYx/0g5HfEU1nzTQp8OznoVYdzkeJRxpSg7HyHDsI4RsDh2 lheA==; 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="avu/EKOY"; 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 a640c23a62f3a-a79bc827a1bsi349704866b.974.2024.07.16.04.41.48; Tue, 16 Jul 2024 04:41:49 -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="avu/EKOY"; 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 017D968D82B; Tue, 16 Jul 2024 14:23:57 +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 A869168D937 for ; Tue, 16 Jul 2024 14:23:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1721129026; bh=UZyx2HoIJbHtU2mcZTzEx31DoebnHNA2taMmoGLSmI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=avu/EKOYZKH0bbQkY+IG09ObC04kmZrHw8yKWI8idF3T2VpTnFIlZK+V8B61lgIqI lDNd0QZ4GY0+zHkzCByDTZAaC6QOhxoYMS2LVAF0IdJ16TqEikmHL0UUvu7WpCCdqA C+j5BIpwQEkiXtgbMSSFWu1ELjsqHpV1/tjOnRNM= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id BBD94408E3; Tue, 16 Jul 2024 13:23:46 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 13:23:15 +0200 Message-ID: <20240716112317.35745-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716112317.35745-1-ffmpeg@haasn.xyz> References: <20240716112317.35745-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mpegts: 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: 5lBZhxCrFpYw From: Niklas Haas --- libavformat/mpegts.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c66a1ea6ed..6b02187eb1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2213,10 +2213,12 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type if (desc_end - *pp >= 1) { // 8 bits buf = get8(pp, desc_end); dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits + dovi->dv_md_compression = (buf >> 2) & 0x03; // 2 bits } else { // 0 stands for None // Dolby Vision V1.2.93 profiles and levels dovi->dv_bl_signal_compatibility_id = 0; + dovi->dv_md_compression = AV_DOVI_COMPRESSION_NONE; } if (!av_packet_side_data_add(&st->codecpar->coded_side_data, @@ -2228,14 +2230,16 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type } av_log(fc, AV_LOG_TRACE, "DOVI, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, dependency_pid: %d, compatibility id: %d\n", + "rpu flag: %d, el flag: %d, bl flag: %d, dependency_pid: %d, " + "compatibility id: %d, compression: %d\n", 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, dependency_pid, - dovi->dv_bl_signal_compatibility_id); + dovi->dv_bl_signal_compatibility_id, + dovi->dv_md_compression); } break; default: From patchwork Tue Jul 16 11:23:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp205346vqb; Tue, 16 Jul 2024 04:24:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULtBbVwU5pVz1ul9LeLI0o1v2udjbpoTUfY4NsGVguYYueYGljP8F8GGf3PhcdEHoEGk++6nlM0kxhjkexr/lNQmJDhcIfvFl1Dg== X-Google-Smtp-Source: AGHT+IEBU1gXCy/CZr0U2+PRy6WdiuK87jMfsK5PsijXSF9Gq09eO9Z15DatOJFfgYZDKupL89vb X-Received: by 2002:a17:906:f946:b0:a72:4207:479b with SMTP id a640c23a62f3a-a79eda0411amr127333266b.5.1721129048197; Tue, 16 Jul 2024 04:24:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721129048; cv=none; d=google.com; s=arc-20160816; b=J+k03BV/Bb58DcU9nM6e4uEAkO4fpHAO1hs/EtSXu48eNcF3butfSrP0dc8apNvH/B c+QXIAhATbsnmtjRQeOiUAtZIrNQMeaW93o4CV2bmIKU91e173r1dLQtzMYQiWuilPXe /VfrS0r/Jq4Jj9oYSNIiX+0rjlr2RnLcZk7ZFQrJAM/PZqzFwydeO/Ve1IQvGi4WmsKM 588V34eRG8ZiG13mgMD8PiKJvk0FXNMVoAH2/a3WVkXkW/kLWvN1cXt3AJkhuOuh67TN FY69zVo1B90X4plMuG4JXYoSBNPAnWLEtAnTEyUzuZw9G35X2oQu44KE4h3IxAyI4AnU prMA== 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=uirVCrvVFiI8wAmNMX5qGvxw6CR+poRpcMqc35J1xUw=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=GB9xBavj1i/OtS7jDtjbs4zI2UcyIa9pPNkkw22RRLUxuMv+flB5AOPLgHn1+KYmgZ bVy5ZQvzqMTq9a6s0p+Dvnn4QfGnfppaXRzQUk0k7lQoT7quBgEvp/9ndRAik/WCK5ya 7A4OBGqNG1j77FPjLg+iHkXHOKB9nLfNNIyjNhgN+JePqn2AhZko8/etxAdvkHgKdvCx eGxjqsVyJd1+uKhaK+YrhCHG1Fug+lyH9O8U48dstz50MOvj5N/7NwnfNyO58QI4AgHq +L8+DBplZO/h0HCTJaQHhVvj97PkOpzMSh4Q0HTjN3/VYGxH+t5lxb5NHrOLjiRfIX/S tk1A==; 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=dvcpyqw9; 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 a640c23a62f3a-a79bc58b83bsi372631466b.76.2024.07.16.04.24.07; Tue, 16 Jul 2024 04:24:08 -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=dvcpyqw9; 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 D2A4F68D9BF; Tue, 16 Jul 2024 14:23:55 +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 A283A68D82B for ; Tue, 16 Jul 2024 14:23:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1721129027; bh=r2Lzc3D54e+rgETASyz5XOfcp2FnAeyDK6YKKYL7qNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dvcpyqw9wkwacl+dwj9jiiSWhrtA8lrnCf1x/NzD2ukb55pZ8I97yJK4pSa0K6KFk JfSWMj8Abde82nLQL/dYdw3ems/0FfN8FgPID4lO8mJ3ixwr+KneScaXNqcWM9bAX9 930OxfeRMWGWg1k0XFIm9H39O5+T7QLP7HFPlTpw= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id ED760417D8; Tue, 16 Jul 2024 13:23:46 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 13:23:16 +0200 Message-ID: <20240716112317.35745-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716112317.35745-1-ffmpeg@haasn.xyz> References: <20240716112317.35745-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/dump: 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: dqP7TVvyCR3n From: Niklas Haas --- libavformat/dump.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 78b2481d90..5e1f367742 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -416,13 +416,15 @@ static void dump_dovi_conf(void *ctx, const AVPacketSideData *sd, (const AVDOVIDecoderConfigurationRecord *)sd->data; av_log(ctx, log_level, "version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d", + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d, " + "compression: %d", 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); + dovi->dv_bl_signal_compatibility_id, + dovi->dv_md_compression); } static void dump_s12m_timecode(void *ctx, const AVStream *st, const AVPacketSideData *sd, From patchwork Tue Jul 16 11:23:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50556 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:40f5:b0:482:c625:d099 with SMTP id lb53csp205272vqb; Tue, 16 Jul 2024 04:23:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDMpZBT9LbWYvCkEHmtb7cfuQji6pCflT2rJYh/h6Iy4i55Q88j3V5hvLoQkhulpCqz/vmyipW2Gd8AjGbDyoTN+TbQSWYvYzmUQ== X-Google-Smtp-Source: AGHT+IFUTLOzVJvp0hPgZPu5hACHOJabLeJ9YDuWUuXmb3L43ILIxAnf+QwfRCoh1cSEC6e0j8Xp X-Received: by 2002:a05:6402:210e:b0:57d:3df:f882 with SMTP id 4fb4d7f45d1cf-59eee05652fmr1349119a12.7.1721129038376; Tue, 16 Jul 2024 04:23:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721129038; cv=none; d=google.com; s=arc-20160816; b=SESFswhvOJgiM0qmR+mYtuGBtgsGMrL+B7XtV1AAQ+usw8ta2OULG8GakGdXQbXaSP 4I4sltRmE36tQDx/v/uUJos2UI+QvGgYtkbwNFqaGDvGGh7ti5ydU/qPmqlKCrQZjiO2 KFMjvU+NkCoqJ+aYeB3hjhvAln6sPSl1BbaAP87vUo9uHn0lNiRNxZ8ojKWmnuv3vurG AEnRH8DNnVPJGIZF2MxH3ia7Z7vedb/a+LFMK7hn/eqMFcTJm9RteZWVKT2AKflbN6yt sZGnvjcr8n0AemQFMMHsWibfLwTiehyz2XZqpB69uODS6YdnAKwdcbkuBlU9WvLKr7Rp 6wmA== 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=+EOF1jBKYCKTCFOEj6ZeS/eBoQTzsAz4S0q5w8WmjgE=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Rf/g6lvak1J+m4rjfjZeGgeJeS6Rd5WJYI7LvZPpFyfPyG3Tvv2vO6hruqoTo1bfDA sdUkMaxp+owJIALZs6DXyvQAuFEGvm7QYxC4xdmxS/3RiQYSOXSMfmnHAukmKhhNqMMS dtqS/CZ6CrhHfRnlUoVhgBU6vyTBTVM2qxv4L5ZI7uRAnQIWMmpLL9Xfmd0NdrTPS1jf 9S4BdQky+vEJ+luIYyAraTpWzDRgofwIWq5pskazSL5rSxgk6knhFLARNu2fgWllMz9z JS8v+LJhTxKx8XAEwmyGydgTslhERbYVMycx4aHeHl9uQwgFUhQyXUqhYSenW+O9vmnk +pCw==; 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=YCpGh692; 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 4fb4d7f45d1cf-59b26a8d6f3si3492993a12.221.2024.07.16.04.23.57; Tue, 16 Jul 2024 04:23:58 -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=YCpGh692; 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 D90ED68D9AA; Tue, 16 Jul 2024 14:23:54 +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 9FB9868D827 for ; Tue, 16 Jul 2024 14:23:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1721129027; bh=E6lI6T4806rkEHvZhZePD6SZq+JIAkFJQnMrqIoiYrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YCpGh692ozctAFLXx72zFbuNQHF3jI9Sc4rskF37eVoX4lhFbMJTiB9SP+gcE0JhR AOAdYdeqorTZk96pOgmge8EeoD2CFqyPp/5MBPi+uhwVYb6nigUiUicAnJdfsBQ8bc oKA8R3miJGWZlM+u+yA+bPD0pXlrW5c33ftKSLDw= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 2F931429D1; Tue, 16 Jul 2024 13:23:47 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 13:23:17 +0200 Message-ID: <20240716112317.35745-5-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716112317.35745-1-ffmpeg@haasn.xyz> References: <20240716112317.35745-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 1bkYd+7xQnsz From: Niklas Haas --- fftools/ffprobe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 0b7d4ce0d7..265718467f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2611,6 +2611,7 @@ 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); + print_int("dv_md_compression", dovi->dv_md_compression); } else if (sd->type == AV_PKT_DATA_AUDIO_SERVICE_TYPE) { enum AVAudioServiceType *t = (enum AVAudioServiceType *)sd->data; print_int("service_type", *t);