RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge declaration and init 

Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-08-31 00:36:30 +00:00
parent e7daab1e9c
commit ac0ab12fe9
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/mxfenc.c
View File

@ -230,11 +230,10 @@ static void mxf_write_metadata_key(ByteIOContext *pb, unsigned int value)
static void mxf_free(AVFormatContext *s) static void mxf_free(AVFormatContext *s)
{ {
AVStream *st;
int i; int i;
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i]; AVStream *st = s->streams[i];
av_freep(&st->priv_data); av_freep(&st->priv_data);
} }
} }
@ -426,8 +425,8 @@ static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type)
static void mxf_write_track(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type, int *track_number_sign) static void mxf_write_track(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type, int *track_number_sign)
{ {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
AVStream *st; AVStream *st = s->streams[stream_index];
MXFStreamContext *sc; MXFStreamContext *sc = st->priv_data;
const MXFCodecUL *element; const MXFCodecUL *element;
int i = 0; int i = 0;
@ -435,9 +434,6 @@ static void mxf_write_track(AVFormatContext *s, int stream_index, enum MXFMetada
PRINT_KEY(s, "track key", pb->buf_ptr - 16); PRINT_KEY(s, "track key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 80); klv_encode_ber_length(pb, 80);
st = s->streams[stream_index];
sc = st->priv_data;
// write track uid // write track uid
mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, stream_index); mxf_write_uuid(pb, type == MaterialPackage ? Track : Track + TypeBottom, stream_index);
@ -480,10 +476,8 @@ static void mxf_write_track(AVFormatContext *s, int stream_index, enum MXFMetada
static void mxf_write_common_fields(ByteIOContext *pb, AVStream *st) static void mxf_write_common_fields(ByteIOContext *pb, AVStream *st)
{ {
const MXFDataDefinitionUL *data_def_ul; const MXFDataDefinitionUL *data_def_ul = mxf_get_data_definition_ul(st->codec->codec_type);
// find data define uls // find data define uls
data_def_ul = mxf_get_data_definition_ul(st->codec->codec_type);
mxf_write_local_tag(pb, 16, 0x0201); mxf_write_local_tag(pb, 16, 0x0201);
put_buffer(pb, data_def_ul->uid, 16); put_buffer(pb, data_def_ul->uid, 16);
@ -495,14 +489,12 @@ static void mxf_write_common_fields(ByteIOContext *pb, AVStream *st)
static void mxf_write_sequence(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type) static void mxf_write_sequence(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type)
{ {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
AVStream *st; AVStream *st = s->streams[stream_index];
mxf_write_metadata_key(pb, 0x010f00); mxf_write_metadata_key(pb, 0x010f00);
PRINT_KEY(s, "sequence key", pb->buf_ptr - 16); PRINT_KEY(s, "sequence key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 80); klv_encode_ber_length(pb, 80);
st = s->streams[stream_index];
mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, type == MaterialPackage ? Sequence: Sequence + TypeBottom, stream_index); mxf_write_uuid(pb, type == MaterialPackage ? Sequence: Sequence + TypeBottom, stream_index);
@ -518,15 +510,13 @@ static void mxf_write_sequence(AVFormatContext *s, int stream_index, enum MXFMet
static void mxf_write_structural_component(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type) static void mxf_write_structural_component(AVFormatContext *s, int stream_index, enum MXFMetadataSetType type)
{ {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
AVStream *st; AVStream *st = s->streams[stream_index];
int i; int i;
mxf_write_metadata_key(pb, 0x011100); mxf_write_metadata_key(pb, 0x011100);
PRINT_KEY(s, "sturctural component key", pb->buf_ptr - 16); PRINT_KEY(s, "sturctural component key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 108); klv_encode_ber_length(pb, 108);
st = s->streams[stream_index];
// write uid // write uid
mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, type == MaterialPackage ? SourceClip: SourceClip + TypeBottom, stream_index); mxf_write_uuid(pb, type == MaterialPackage ? SourceClip: SourceClip + TypeBottom, stream_index);
@ -607,9 +597,8 @@ static void mxf_write_generic_desc(ByteIOContext *pb, const MXFDescriptorWriteTa
static void mxf_write_mpegvideo_desc(AVFormatContext *s, const MXFDescriptorWriteTableEntry *desc_tbl, int stream_index) static void mxf_write_mpegvideo_desc(AVFormatContext *s, const MXFDescriptorWriteTableEntry *desc_tbl, int stream_index)
{ {
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
AVStream *st; AVStream *st = s->streams[stream_index];
st = s->streams[stream_index];
mxf_write_generic_desc(pb, desc_tbl, st); mxf_write_generic_desc(pb, desc_tbl, st);
mxf_write_local_tag(pb, 4, 0x3203); mxf_write_local_tag(pb, 4, 0x3203);