MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

split mpegvideo descriptor into cdci descriptor and wav common in sound common

Browse Source 
Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-13 07:11:21 +00:00
parent 86dd3974e5
commit db6db7e505
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/mxfenc.c
View File

@ -705,7 +705,7 @@ static const UID mxf_mpegvideo_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,
static const UID mxf_wav_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 };
static const UID mxf_aes3_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x47,0x00 };
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
{
MXFStreamContext *sc = st->priv_data;
ByteIOContext *pb = s->pb;
@ -713,7 +713,7 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
AVRational dar;
int f1, f2;
mxf_write_generic_desc(s, st, mxf_mpegvideo_descriptor_key, 169+sc->interlaced*4);
mxf_write_generic_desc(s, st, key, size);
mxf_write_local_tag(pb, 4, 0x3203);
put_be32(pb, st->codec->width);
@ -735,10 +735,6 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
mxf_write_local_tag(pb, 4, 0x3302);
put_be32(pb, 2);
// bit rate
mxf_write_local_tag(pb, 4, 0x8000);
put_be32(pb, st->codec->bit_rate);
// frame layout
mxf_write_local_tag(pb, 1, 0x320C);
put_byte(pb, sc->interlaced);
@ -779,7 +775,19 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
put_buffer(pb, *sc->codec_ul, 16);
}
static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
{
MXFStreamContext *sc = st->priv_data;
ByteIOContext *pb = s->pb;
mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 169+sc->interlaced*4);
// bit rate
mxf_write_local_tag(pb, 4, 0x8000);
put_be32(pb, st->codec->bit_rate);
}
static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
{
ByteIOContext *pb = s->pb;
@ -801,11 +809,11 @@ static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st, const
put_be32(pb, av_get_bits_per_sample(st->codec->codec_id));
}
static void mxf_write_wav_common_desc(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size)
{
ByteIOContext *pb = s->pb;
mxf_write_generic_sound_desc(s, st, key, size);
mxf_write_generic_sound_common(s, st, key, size);
mxf_write_local_tag(pb, 2, 0x3D0A);
put_be16(pb, st->codec->block_align);
@ -817,12 +825,12 @@ static void mxf_write_wav_common_desc(AVFormatContext *s, AVStream *st, const UI
static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st)
{
mxf_write_wav_common_desc(s, st, mxf_wav_descriptor_key, 107);
mxf_write_wav_common(s, st, mxf_wav_descriptor_key, 107);
}
static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st)
{
mxf_write_wav_common_desc(s, st, mxf_aes3_descriptor_key, 107);
mxf_write_wav_common(s, st, mxf_aes3_descriptor_key, 107);
}
static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type)