From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 80BE045CC1 for ; Mon, 3 Apr 2023 08:41:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E37D368BC75; Mon, 3 Apr 2023 11:41:39 +0300 (EEST) Received: from gandalf.ektacom.com (gandalf.ektacom.com [62.23.45.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2504968B418 for ; Mon, 3 Apr 2023 11:41:33 +0300 (EEST) Received: from ektacom.com (82-64-203-93.subs.proxad.net [82.64.203.93]) by gandalf.ektacom.com (Postfix) with ESMTP id CF0E845A266 for ; Mon, 3 Apr 2023 10:41:32 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------SvSqZfiejHFo01qGzmj0MirE" Message-ID: Date: Mon, 3 Apr 2023 10:41:29 +0200 MIME-Version: 1.0 Content-Language: en-US From: =?UTF-8?Q?C=c3=a9dric_Le_Barz?= To: ffmpeg-devel@ffmpeg.org References: <24e1274d-db0c-da87-60a1-50a9e9f63f13@ektacom.com> In-Reply-To: <24e1274d-db0c-da87-60a1-50a9e9f63f13@ektacom.com> X-MailScanner-ID: 47D7E1B1BC45.A7B49 X-MailScanner: Found to be clean X-MailScanner-From: clebarz@ektacom.com X-Spam-Status: No Subject: Re: [FFmpeg-devel] [PATCH] Add track name information when track is written. - Sponsored by INA 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------SvSqZfiejHFo01qGzmj0MirE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 > --- >  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, >  }; >  + --------------SvSqZfiejHFo01qGzmj0MirE Content-Type: message/rfc822; name="0001-Add-track-name-information-when-track-is-written.eml" Content-Disposition: attachment; filename*0="0001-Add-track-name-information-when-track-is-written.eml" Content-Transfer-Encoding: 7bit From: Cedric Le Barz Date: Wed, 29 Mar 2023 23:10:48 +0200 Subject: [PATCH] Add track name information when track is written. X-Unsent: 1 To: ffmpeg-devel@ffmpeg.org Signed-off-by: Cedric Le Barz --- 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 --------------SvSqZfiejHFo01qGzmj0MirE Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --------------SvSqZfiejHFo01qGzmj0MirE--