* [FFmpeg-devel] [PATCH] Add track name information when track is written. - Sponsored by INA
@ 2023-03-29 21:12 Cédric Le Barz
2023-04-03 8:41 ` Cédric Le Barz
0 siblings, 1 reply; 3+ messages in thread
From: Cédric Le Barz @ 2023-03-29 21:12 UTC (permalink / raw)
To: ffmpeg-devel
Add track name information in MXF when track is written.
Signed-off-by: Cedric Le Barz <clebarz@ektacom.com>
---
ffmpeg/libavformat/mxfenc.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/ffmpeg/libavformat/mxfenc.c b/ffmpeg/libavformat/mxfenc.c
index 3bdf90a..bfbd5a6 100644
--- a/ffmpeg/libavformat/mxfenc.c
+++ b/ffmpeg/libavformat/mxfenc.c
@@ -299,6 +299,8 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
{ 0x4B01,
{0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x30,0x04,0x05,0x00,0x00,0x00,0x00}},
/* Edit Rate */
{ 0x4B02,
{0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x03,0x00,0x00}},
/* Origin */
{ 0x4803,
{0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x04,0x00,0x00}},
/* Sequence reference */
+ // Track name
+ { 0x4802,
{0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x01,0x07,0x01,0x02,0x01,0x00,0x00,0x00}},
/* TrackName */
// Sequence
{ 0x0201,
{0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x07,0x01,0x00,0x00,0x00,0x00,0x00}},
/* Data Definition UL */
{ 0x0202,
{0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x02,0x01,0x01,0x03,0x00,0x00}},
/* Duration */
@@ -862,7 +864,28 @@ static void mxf_write_track(AVFormatContext *s,
AVStream *st, MXFPackage *packag
mxf_write_metadata_key(pb, 0x013b00);
PRINT_KEY(s, "track key", pb->buf_ptr - 16);
+
+ if (st->codecpar) {
+ static const char * pcTrackName_Video = "Picture" ;
+ static const char * pcTrackName_Audio = "Sound" ;
+ static const char * pcTrackName_Anc = "Ancillary" ;
+ if ( st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO )
+ {
+ //TrackName Video
+ klv_encode_ber_length(pb, 80 +
mxf_utf16_local_tag_length(pcTrackName_Video));
+ mxf_write_local_tag_utf16(s, 0x4802 , pcTrackName_Video);
+ } else if ( st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) {
+ //TrackName Audio
+ klv_encode_ber_length(pb, 80 +
mxf_utf16_local_tag_length(pcTrackName_Audio));
+ mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Audio);
+ } else {
+ //TrackName Ancillary
+ klv_encode_ber_length(pb, 80 +
mxf_utf16_local_tag_length(pcTrackName_Anc));
+ mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Anc);
+ }
+ } else {
klv_encode_ber_length(pb, 80);
+ }
// write track uid
mxf_write_local_tag(s, 16, 0x3C0A);
@@ -3383,3 +3406,4 @@ const FFOutputFormat ff_mxf_opatom_muxer = {
.p.priv_class = &mxf_opatom_muxer_class,
};
+
--
2.34.1
_______________________________________________
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] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] Add track name information when track is written. - Sponsored by INA
2023-03-29 21:12 [FFmpeg-devel] [PATCH] Add track name information when track is written. - Sponsored by INA Cédric Le Barz
@ 2023-04-03 8:41 ` Cédric Le Barz
2023-04-05 12:45 ` Tomas Härdin
0 siblings, 1 reply; 3+ messages in thread
From: Cédric Le Barz @ 2023-04-03 8:41 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1: Type: text/plain, Size: 3138 bytes --]
Hi,
I've attached the patch to this mail, in order to solve newlines
insertion issue.
Regards,
Cédric
Le 29/03/2023 à 23:12, Cédric Le Barz a écrit :
> Add track name information in MXF when track is written.
>
> Signed-off-by: Cedric Le Barz <clebarz@ektacom.com>
> ---
> ffmpeg/libavformat/mxfenc.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/ffmpeg/libavformat/mxfenc.c b/ffmpeg/libavformat/mxfenc.c
> index 3bdf90a..bfbd5a6 100644
> --- a/ffmpeg/libavformat/mxfenc.c
> +++ b/ffmpeg/libavformat/mxfenc.c
> @@ -299,6 +299,8 @@ static const MXFLocalTagPair mxf_local_tag_batch[]
> = {
> { 0x4B01,
> {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x30,0x04,0x05,0x00,0x00,0x00,0x00}},
> /* Edit Rate */
> { 0x4B02,
> {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x03,0x00,0x00}},
> /* Origin */
> { 0x4803,
> {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x04,0x00,0x00}},
> /* Sequence reference */
> + // Track name
> + { 0x4802,
> {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x01,0x07,0x01,0x02,0x01,0x00,0x00,0x00}},
> /* TrackName */
> // Sequence
> { 0x0201,
> {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x07,0x01,0x00,0x00,0x00,0x00,0x00}},
> /* Data Definition UL */
> { 0x0202,
> {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x02,0x01,0x01,0x03,0x00,0x00}},
> /* Duration */
> @@ -862,7 +864,28 @@ static void mxf_write_track(AVFormatContext *s,
> AVStream *st, MXFPackage *packag
> mxf_write_metadata_key(pb, 0x013b00);
> PRINT_KEY(s, "track key", pb->buf_ptr - 16);
> +
> + if (st->codecpar) {
> + static const char * pcTrackName_Video = "Picture" ;
> + static const char * pcTrackName_Audio = "Sound" ;
> + static const char * pcTrackName_Anc = "Ancillary" ;
> + if ( st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO )
> + {
> + //TrackName Video
> + klv_encode_ber_length(pb, 80 +
> mxf_utf16_local_tag_length(pcTrackName_Video));
> + mxf_write_local_tag_utf16(s, 0x4802 , pcTrackName_Video);
> + } else if ( st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) {
> + //TrackName Audio
> + klv_encode_ber_length(pb, 80 +
> mxf_utf16_local_tag_length(pcTrackName_Audio));
> + mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Audio);
> + } else {
> + //TrackName Ancillary
> + klv_encode_ber_length(pb, 80 +
> mxf_utf16_local_tag_length(pcTrackName_Anc));
> + mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Anc);
> + }
> + } else {
> klv_encode_ber_length(pb, 80);
> + }
> // write track uid
> mxf_write_local_tag(s, 16, 0x3C0A);
> @@ -3383,3 +3406,4 @@ const FFOutputFormat ff_mxf_opatom_muxer = {
> .p.priv_class = &mxf_opatom_muxer_class,
> };
> +
[-- Attachment #2: 0001-Add-track-name-information-when-track-is-written.eml --]
[-- Type: message/rfc822, Size: 2745 bytes --]
From: Cedric Le Barz <clebarz@ektacom.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [PATCH] Add track name information when track is written.
Date: Wed, 29 Mar 2023 23:10:48 +0200
Signed-off-by: Cedric Le Barz <clebarz@ektacom.com>
---
ffmpeg/libavformat/mxfenc.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/ffmpeg/libavformat/mxfenc.c b/ffmpeg/libavformat/mxfenc.c
index 3bdf90a..bfbd5a6 100644
--- a/ffmpeg/libavformat/mxfenc.c
+++ b/ffmpeg/libavformat/mxfenc.c
@@ -299,6 +299,8 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
{ 0x4B01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x05,0x30,0x04,0x05,0x00,0x00,0x00,0x00}}, /* Edit Rate */
{ 0x4B02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x01,0x03,0x01,0x03,0x00,0x00}}, /* Origin */
{ 0x4803, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x02,0x04,0x00,0x00}}, /* Sequence reference */
+ // Track name
+ { 0x4802, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x01,0x07,0x01,0x02,0x01,0x00,0x00,0x00}}, /* TrackName */
// Sequence
{ 0x0201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x07,0x01,0x00,0x00,0x00,0x00,0x00}}, /* Data Definition UL */
{ 0x0202, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x07,0x02,0x02,0x01,0x01,0x03,0x00,0x00}}, /* Duration */
@@ -862,7 +864,28 @@ static void mxf_write_track(AVFormatContext *s, AVStream *st, MXFPackage *packag
mxf_write_metadata_key(pb, 0x013b00);
PRINT_KEY(s, "track key", pb->buf_ptr - 16);
+
+ if (st->codecpar) {
+ static const char * pcTrackName_Video = "Picture" ;
+ static const char * pcTrackName_Audio = "Sound" ;
+ static const char * pcTrackName_Anc = "Ancillary" ;
+ if ( st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO )
+ {
+ //TrackName Video
+ klv_encode_ber_length(pb, 80 + mxf_utf16_local_tag_length(pcTrackName_Video));
+ mxf_write_local_tag_utf16(s, 0x4802 , pcTrackName_Video);
+ } else if ( st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) {
+ //TrackName Audio
+ klv_encode_ber_length(pb, 80 + mxf_utf16_local_tag_length(pcTrackName_Audio));
+ mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Audio);
+ } else {
+ //TrackName Ancillary
+ klv_encode_ber_length(pb, 80 + mxf_utf16_local_tag_length(pcTrackName_Anc));
+ mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Anc);
+ }
+ } else {
klv_encode_ber_length(pb, 80);
+ }
// write track uid
mxf_write_local_tag(s, 16, 0x3C0A);
@@ -3383,3 +3406,4 @@ const FFOutputFormat ff_mxf_opatom_muxer = {
.p.priv_class = &mxf_opatom_muxer_class,
};
+
--
2.34.1
[-- Attachment #3: 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] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] Add track name information when track is written. - Sponsored by INA
2023-04-03 8:41 ` Cédric Le Barz
@ 2023-04-05 12:45 ` Tomas Härdin
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Härdin @ 2023-04-05 12:45 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> + if (st->codecpar) {
> + static const char * pcTrackName_Video = "Picture" ;
> + static const char * pcTrackName_Audio = "Sound" ;
> + static const char * pcTrackName_Anc = "Ancillary" ;
> + if ( st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO )
> + {
> + //TrackName Video
> + klv_encode_ber_length(pb, 80 +
> mxf_utf16_local_tag_length(pcTrackName_Video));
> + mxf_write_local_tag_utf16(s, 0x4802 ,
> pcTrackName_Video);
> + } else if ( st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
> {
> + //TrackName Audio
> + klv_encode_ber_length(pb, 80 +
> mxf_utf16_local_tag_length(pcTrackName_Audio));
> + mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Audio);
> + } else {
> + //TrackName Ancillary
> + klv_encode_ber_length(pb, 80 +
> mxf_utf16_local_tag_length(pcTrackName_Anc));
> + mxf_write_local_tag_utf16(s, 0x4802, pcTrackName_Anc);
Is calling timecode, subtitle etc tracks "Ancillary" really
appropriate?
Also you need to update the FATE references like Michael says
/Tomas
_______________________________________________
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] 3+ messages in thread
end of thread, other threads:[~2023-04-05 12:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-29 21:12 [FFmpeg-devel] [PATCH] Add track name information when track is written. - Sponsored by INA Cédric Le Barz
2023-04-03 8:41 ` Cédric Le Barz
2023-04-05 12:45 ` Tomas Härdin
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