diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-02 04:36:54 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-02 04:36:54 +0000 |
| commit | f9303ffd62403b470acb77fc0e26ba1b02c873cf (patch) | |
| tree | e52723f991ba46fb4cfce0d2914b377393e2c62e /libavformat | |
| parent | 4966b98a57f51b5d4fd9ffbf3e51f725ee1afa24 (diff) | |
| download | ffmpeg-f9303ffd62403b470acb77fc0e26ba1b02c873cf.tar.gz | |
write req local tags for wav
Originally committed as revision 16931 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfenc.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 2d26494049..0c04f7d6f9 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -190,6 +190,9 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = { { 0x3D06, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x02,0x04,0x02,0x00,0x00,0x00,0x00}}, /* Sound Essence Compression */ // MPEG video Descriptor { 0x8000, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x01,0x06,0x02,0x01,0x0B,0x00,0x00}}, /* BitRate */ + // Wave Audio Essence Descriptor + { 0x3D09, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x03,0x05,0x00,0x00,0x00}}, /* Average Bytes Per Second */ + { 0x3D0A, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x02,0x01,0x00,0x00,0x00}}, /* Block Align */ }; static void mxf_write_uuid(ByteIOContext *pb, enum MXFMetadataSetType type, int value) @@ -679,12 +682,30 @@ static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st, const static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st) { - mxf_write_generic_sound_desc(s, st, mxf_wav_descriptor_key, 93); + ByteIOContext *pb = s->pb; + + mxf_write_generic_sound_desc(s, st, mxf_wav_descriptor_key, 107); + + mxf_write_local_tag(pb, 2, 0x3D0A); + put_be16(pb, st->codec->block_align); + + // avg bytes per sec + mxf_write_local_tag(pb, 4, 0x3D09); + put_be32(pb, st->codec->block_align*st->codec->sample_rate); } static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st) { - mxf_write_generic_sound_desc(s, st, mxf_aes3_descriptor_key, 93); + ByteIOContext *pb = s->pb; + + mxf_write_generic_sound_desc(s, st, mxf_aes3_descriptor_key, 107); + + mxf_write_local_tag(pb, 2, 0x3D0A); + put_be16(pb, st->codec->block_align); + + // avg bytes per sec + mxf_write_local_tag(pb, 4, 0x3D09); + put_be32(pb, st->codec->block_align*st->codec->sample_rate); } static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type) |