RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-13 18:55:08 +00:00
Code Issues Projects Releases Wiki Activity

force first track to be video and simplify

Browse Source 
Originally committed as revision 17034 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-08 02:38:07 +00:00
parent 67d8ac4a02
commit 5ccc2316ab
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mxfenc.c
View File

@ -124,7 +124,6 @@ typedef struct MXFContext {
int header_written; int header_written;
MXFIndexEntry *index_entries; MXFIndexEntry *index_entries;
unsigned edit_units_count; unsigned edit_units_count;
int edit_unit_start; ///< index of the stream starting edit unit
uint64_t timestamp; ///< timestamp, as year(16),month(8),day(8),hour(8),minutes(8),msec/4(8) uint64_t timestamp; ///< timestamp, as year(16),month(8),day(8),hour(8),minutes(8),msec/4(8)
} MXFContext; } MXFContext;
@ -921,7 +920,7 @@ static int mxf_write_index_table_segment(AVFormatContext *s)
if (sc->temporal_reordering) if (sc->temporal_reordering)
temporal_reordering = 1; temporal_reordering = 1;
put_byte(pb, i); put_byte(pb, i);
if (mxf->edit_unit_start) if (i == 0)
put_be32(pb, KAG_SIZE); // system item size including klv fill put_be32(pb, KAG_SIZE); // system item size including klv fill
else else
put_be32(pb, 0); // element delta put_be32(pb, 0); // element delta
@ -1181,6 +1180,10 @@ static int mxf_write_header(AVFormatContext *s)
st->priv_data = sc; st->priv_data = sc;
if (st->codec->codec_type == CODEC_TYPE_VIDEO) { if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
if (i != 0) {
av_log(s, AV_LOG_ERROR, "video stream must be first track\n");
return -1;
}
if (fabs(av_q2d(st->codec->time_base) - 1/25.0) < 0.0001) { if (fabs(av_q2d(st->codec->time_base) - 1/25.0) < 0.0001) {
samples_per_frame = PAL_samples_per_frame; samples_per_frame = PAL_samples_per_frame;
mxf->time_base = (AVRational){ 1, 25 }; mxf->time_base = (AVRational){ 1, 25 };
@ -1191,7 +1194,6 @@ static int mxf_write_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "unsupported video frame rate\n"); av_log(s, AV_LOG_ERROR, "unsupported video frame rate\n");
return -1; return -1;
} }
mxf->edit_unit_start = st->index;
av_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den); av_set_pts_info(st, 64, mxf->time_base.num, mxf->time_base.den);
} else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (st->codec->sample_rate != 48000) { if (st->codec->sample_rate != 48000) {
@ -1350,7 +1352,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt)
mxf_write_klv_fill(s); mxf_write_klv_fill(s);
if (st->index == mxf->edit_unit_start) { if (st->index == 0) {
mxf->index_entries[mxf->edit_units_count].offset = url_ftell(pb); mxf->index_entries[mxf->edit_units_count].offset = url_ftell(pb);
mxf->index_entries[mxf->edit_units_count].slice_offset[st->index] = 0; mxf->index_entries[mxf->edit_units_count].slice_offset[st->index] = 0;
@ -1466,12 +1468,11 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket
if (stream_count && (s->nb_streams == stream_count || flush)) { if (stream_count && (s->nb_streams == stream_count || flush)) {
pktl = s->packet_buffer; pktl = s->packet_buffer;
if (s->nb_streams != stream_count) { if (s->nb_streams != stream_count) {
MXFContext *mxf = s->priv_data;
AVPacketList *first = NULL; AVPacketList *first = NULL;
// find first packet in edit unit // find first packet in edit unit
while (pktl) { while (pktl) {
AVStream *st = s->streams[pktl->pkt.stream_index]; AVStream *st = s->streams[pktl->pkt.stream_index];
if (st->index == mxf->edit_unit_start) if (st->index == 0)
break; break;
else if (!first) else if (!first)
first = pktl; first = pktl;