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

Remove MAX_STREAMS usage in ogg and mxf muxers

Browse Source 
Originally committed as revision 21526 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2010-01-29 06:38:00 +00:00
parent 402d55eef1
commit 012dc2c426
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/mxfenc.c
View File

@ -1807,22 +1807,13 @@ static int mxf_write_footer(AVFormatContext *s)
static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{ {
AVPacketList *pktl; int i, stream_count = 0;
int stream_count = 0;
int streams[MAX_STREAMS];
memset(streams, 0, sizeof(streams)); for (i = 0; i < s->nb_streams; i++)
pktl = s->packet_buffer; stream_count += !!s->streams[i]->last_in_packet_buffer;
while (pktl) {
//av_log(s, AV_LOG_DEBUG, "show st:%d dts:%lld\n", pktl->pkt.stream_index, pktl->pkt.dts);
if (!streams[pktl->pkt.stream_index])
stream_count++;
streams[pktl->pkt.stream_index]++;
pktl = pktl->next;
}
if (stream_count && (s->nb_streams == stream_count || flush)) { if (stream_count && (s->nb_streams == stream_count || flush)) {
pktl = s->packet_buffer; AVPacketList *pktl = s->packet_buffer;
if (s->nb_streams != stream_count) { if (s->nb_streams != stream_count) {
AVPacketList *last = NULL; AVPacketList *last = NULL;
// find last packet in edit unit // find last packet in edit unit

31
libavformat/oggenc.c
View File

@ -36,6 +36,7 @@ typedef struct {
int64_t last_kf_pts; int64_t last_kf_pts;
int vrev; int vrev;
int eos; int eos;
unsigned packet_count; ///< number of packet buffered
} OGGStreamContext; } OGGStreamContext;
static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset) static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset)
@ -286,35 +287,33 @@ static int ogg_compare_granule(AVFormatContext *s, AVPacket *next, AVPacket *pkt
static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush) static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{ {
AVPacketList *pktl; OGGStreamContext *ogg;
int stream_count = 0; int i, stream_count = 0;
int streams[MAX_STREAMS] = {0};
int interleaved = 0; int interleaved = 0;
if (pkt) { if (pkt) {
ff_interleave_add_packet(s, pkt, ogg_compare_granule); ff_interleave_add_packet(s, pkt, ogg_compare_granule);
ogg = s->streams[pkt->stream_index]->priv_data;
ogg->packet_count++;
} }
pktl = s->packet_buffer; for (i = 0; i < s->nb_streams; i++) {
while (pktl) { ogg = s->streams[i]->priv_data;
if (streams[pktl->pkt.stream_index] == 0) stream_count += !!ogg->packet_count;
stream_count++; interleaved += ogg->packet_count > 1;
streams[pktl->pkt.stream_index]++;
// need to buffer at least one packet to set eos flag
if (streams[pktl->pkt.stream_index] == 2)
interleaved++;
pktl = pktl->next;
} }
if ((s->nb_streams == stream_count && interleaved == stream_count) || if ((s->nb_streams == stream_count && interleaved == stream_count) ||
(flush && stream_count)) { (flush && stream_count)) {
pktl= s->packet_buffer; AVPacketList *pktl= s->packet_buffer;
*out= pktl->pkt; *out= pktl->pkt;
s->packet_buffer = pktl->next; s->packet_buffer = pktl->next;
if (flush && streams[out->stream_index] == 1) {
OGGStreamContext *ogg = s->streams[out->stream_index]->priv_data; ogg = s->streams[out->stream_index]->priv_data;
if (flush && ogg->packet_count == 1)
ogg->eos = 1; ogg->eos = 1;
} ogg->packet_count--;
if(!s->packet_buffer) if(!s->packet_buffer)
s->packet_buffer_end= NULL; s->packet_buffer_end= NULL;