* [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record
@ 2024-07-16 11:23 Niklas Haas
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: implement dv_md_compression Niklas Haas
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Niklas Haas @ 2024-07-16 11:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
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, \
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: implement dv_md_compression
2024-07-16 11:23 [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record Niklas Haas
@ 2024-07-16 11:23 ` Niklas Haas
[not found] ` <21B56119-B46F-409D-B398-746420438132@cosmin.at>
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 3/5] avformat/mpegts: " Niklas Haas
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Niklas Haas @ 2024-07-16 11:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
---
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);
}
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* [FFmpeg-devel] [PATCH 3/5] avformat/mpegts: implement dv_md_compression
2024-07-16 11:23 [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record Niklas Haas
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: implement dv_md_compression Niklas Haas
@ 2024-07-16 11:23 ` Niklas Haas
[not found] ` <5F5C69A3-01BC-4F25-A69A-C397509AE652@cosmin.at>
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 4/5] avformat/dump: " Niklas Haas
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Niklas Haas @ 2024-07-16 11:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
---
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:
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* [FFmpeg-devel] [PATCH 4/5] avformat/dump: implement dv_md_compression
2024-07-16 11:23 [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record Niklas Haas
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: implement dv_md_compression Niklas Haas
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 3/5] avformat/mpegts: " Niklas Haas
@ 2024-07-16 11:23 ` Niklas Haas
[not found] ` <FB82B6B8-716A-4F38-BD26-57AE355678D3@cosmin.at>
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: " Niklas Haas
[not found] ` <71460422-4A3C-45F1-A588-3DCE4600AE51@cosmin.at>
4 siblings, 1 reply; 12+ messages in thread
From: Niklas Haas @ 2024-07-16 11:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
---
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,
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: implement dv_md_compression
2024-07-16 11:23 [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record Niklas Haas
` (2 preceding siblings ...)
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 4/5] avformat/dump: " Niklas Haas
@ 2024-07-16 11:23 ` Niklas Haas
[not found] ` <157FF15A-BCC1-4BAC-9875-6E5CF4928FDC@cosmin.at>
2024-07-17 18:07 ` Michael Niedermayer
[not found] ` <71460422-4A3C-45F1-A588-3DCE4600AE51@cosmin.at>
4 siblings, 2 replies; 12+ messages in thread
From: Niklas Haas @ 2024-07-16 11:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
---
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);
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record
[not found] ` <71460422-4A3C-45F1-A588-3DCE4600AE51@cosmin.at>
@ 2024-07-16 11:30 ` Cosmin Stejerean via ffmpeg-devel
0 siblings, 0 replies; 12+ messages in thread
From: Cosmin Stejerean via ffmpeg-devel @ 2024-07-16 11:30 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Cosmin Stejerean, Niklas Haas
> On Jul 16, 2024, at 1:23 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote:
>
> From: Niklas Haas <git@haasn.dev>
>
> 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,
> +};
> +
>
Looks good to me.
- Cosmin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: implement dv_md_compression
[not found] ` <157FF15A-BCC1-4BAC-9875-6E5CF4928FDC@cosmin.at>
@ 2024-07-16 11:32 ` Cosmin Stejerean via ffmpeg-devel
0 siblings, 0 replies; 12+ messages in thread
From: Cosmin Stejerean via ffmpeg-devel @ 2024-07-16 11:32 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Cosmin Stejerean
> On Jul 16, 2024, at 1:23 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote:
>
> From: Niklas Haas <git@haasn.dev>
>
> ---
> 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);
> --
> 2.45.2
>
>
LGTM
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: implement dv_md_compression
[not found] ` <21B56119-B46F-409D-B398-746420438132@cosmin.at>
@ 2024-07-16 11:40 ` Cosmin Stejerean via ffmpeg-devel
0 siblings, 0 replies; 12+ messages in thread
From: Cosmin Stejerean via ffmpeg-devel @ 2024-07-16 11:40 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Cosmin Stejerean, Niklas Haas
> On Jul 16, 2024, at 1:23 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote:
>
> From: Niklas Haas <git@haasn.dev>
>
> ---
> 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
This seems fine based on what this code is currently doing, but I'm curious, should this be moved to something like get_bits at some point?
> } 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",
would it be more user friendly to log the display value like limited, none, extended rather than numeric value here?
> 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);
> }
> --
>
Overall LGTM.
- Cosmin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 3/5] avformat/mpegts: implement dv_md_compression
[not found] ` <5F5C69A3-01BC-4F25-A69A-C397509AE652@cosmin.at>
@ 2024-07-16 11:41 ` Cosmin Stejerean via ffmpeg-devel
0 siblings, 0 replies; 12+ messages in thread
From: Cosmin Stejerean via ffmpeg-devel @ 2024-07-16 11:41 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Cosmin Stejerean
> On Jul 16, 2024, at 1:23 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote:
>
> From: Niklas Haas <git@haasn.dev>
>
> ---
> 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:
>
LGTM, although like the previous patch I'm curious if the logging should be using display names instead of integer values for compression.
- Cosmin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 4/5] avformat/dump: implement dv_md_compression
[not found] ` <FB82B6B8-716A-4F38-BD26-57AE355678D3@cosmin.at>
@ 2024-07-16 11:41 ` Cosmin Stejerean via ffmpeg-devel
0 siblings, 0 replies; 12+ messages in thread
From: Cosmin Stejerean via ffmpeg-devel @ 2024-07-16 11:41 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Cosmin Stejerean, Niklas Haas
> On Jul 16, 2024, at 1:23 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote:
>
> From: Niklas Haas <git@haasn.dev>
>
> ---
> 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,
>
LGTM
- Cosmin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: implement dv_md_compression
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: " Niklas Haas
[not found] ` <157FF15A-BCC1-4BAC-9875-6E5CF4928FDC@cosmin.at>
@ 2024-07-17 18:07 ` Michael Niedermayer
2024-07-18 10:52 ` Niklas Haas
1 sibling, 1 reply; 12+ messages in thread
From: Michael Niedermayer @ 2024-07-17 18:07 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 448 bytes --]
On Tue, Jul 16, 2024 at 01:23:17PM +0200, Niklas Haas wrote:
> From: Niklas Haas <git@haasn.dev>
>
> ---
> fftools/ffprobe.c | 1 +
> 1 file changed, 1 insertion(+)
breaks fate / needs update to fate
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The smallest minority on earth is the individual. Those who deny
individual rights cannot claim to be defenders of minorities. - Ayn Rand
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: implement dv_md_compression
2024-07-17 18:07 ` Michael Niedermayer
@ 2024-07-18 10:52 ` Niklas Haas
0 siblings, 0 replies; 12+ messages in thread
From: Niklas Haas @ 2024-07-18 10:52 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Wed, 17 Jul 2024 20:07:54 +0200 Michael Niedermayer <michael@niedermayer.cc> wrote:
> On Tue, Jul 16, 2024 at 01:23:17PM +0200, Niklas Haas wrote:
> > From: Niklas Haas <git@haasn.dev>
> >
> > ---
> > fftools/ffprobe.c | 1 +
> > 1 file changed, 1 insertion(+)
>
> breaks fate / needs update to fate
Fixed, thanks for pointing that out.
>
> thx
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> The smallest minority on earth is the individual. Those who deny
> individual rights cannot claim to be defenders of minorities. - Ayn Rand
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-07-18 10:52 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-16 11:23 [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record Niklas Haas
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 2/5] avformat/dovi_isom: implement dv_md_compression Niklas Haas
[not found] ` <21B56119-B46F-409D-B398-746420438132@cosmin.at>
2024-07-16 11:40 ` Cosmin Stejerean via ffmpeg-devel
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 3/5] avformat/mpegts: " Niklas Haas
[not found] ` <5F5C69A3-01BC-4F25-A69A-C397509AE652@cosmin.at>
2024-07-16 11:41 ` Cosmin Stejerean via ffmpeg-devel
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 4/5] avformat/dump: " Niklas Haas
[not found] ` <FB82B6B8-716A-4F38-BD26-57AE355678D3@cosmin.at>
2024-07-16 11:41 ` Cosmin Stejerean via ffmpeg-devel
2024-07-16 11:23 ` [FFmpeg-devel] [PATCH 5/5] fftools/ffprobe: " Niklas Haas
[not found] ` <157FF15A-BCC1-4BAC-9875-6E5CF4928FDC@cosmin.at>
2024-07-16 11:32 ` Cosmin Stejerean via ffmpeg-devel
2024-07-17 18:07 ` Michael Niedermayer
2024-07-18 10:52 ` Niklas Haas
[not found] ` <71460422-4A3C-45F1-A588-3DCE4600AE51@cosmin.at>
2024-07-16 11:30 ` [FFmpeg-devel] [PATCH 1/5] avutil/dovi_meta: add dv_md_compression to cfg record Cosmin Stejerean via ffmpeg-devel
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git