[FFmpeg-cvslog] r21526 - in trunk/libavformat: mxfenc.c oggenc.c
bcoudurier
subversion
Fri Jan 29 07:38:01 CET 2010
Author: bcoudurier
Date: Fri Jan 29 07:38:00 2010
New Revision: 21526
Log:
Remove MAX_STREAMS usage in ogg and mxf muxers
Modified:
trunk/libavformat/mxfenc.c
trunk/libavformat/oggenc.c
Modified: trunk/libavformat/mxfenc.c
==============================================================================
--- trunk/libavformat/mxfenc.c Fri Jan 29 05:13:29 2010 (r21525)
+++ trunk/libavformat/mxfenc.c Fri Jan 29 07:38:00 2010 (r21526)
@@ -1807,22 +1807,13 @@ static int mxf_write_footer(AVFormatCont
static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{
- AVPacketList *pktl;
- int stream_count = 0;
- int streams[MAX_STREAMS];
+ int i, stream_count = 0;
- memset(streams, 0, sizeof(streams));
- pktl = s->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;
- }
+ for (i = 0; i < s->nb_streams; i++)
+ stream_count += !!s->streams[i]->last_in_packet_buffer;
if (stream_count && (s->nb_streams == stream_count || flush)) {
- pktl = s->packet_buffer;
+ AVPacketList *pktl = s->packet_buffer;
if (s->nb_streams != stream_count) {
AVPacketList *last = NULL;
// find last packet in edit unit
Modified: trunk/libavformat/oggenc.c
==============================================================================
--- trunk/libavformat/oggenc.c Fri Jan 29 05:13:29 2010 (r21525)
+++ trunk/libavformat/oggenc.c Fri Jan 29 07:38:00 2010 (r21526)
@@ -36,6 +36,7 @@ typedef struct {
int64_t last_kf_pts;
int vrev;
int eos;
+ unsigned packet_count; ///< number of packet buffered
} OGGStreamContext;
static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset)
@@ -286,35 +287,33 @@ static int ogg_compare_granule(AVFormatC
static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
{
- AVPacketList *pktl;
- int stream_count = 0;
- int streams[MAX_STREAMS] = {0};
+ OGGStreamContext *ogg;
+ int i, stream_count = 0;
int interleaved = 0;
if (pkt) {
ff_interleave_add_packet(s, pkt, ogg_compare_granule);
+ ogg = s->streams[pkt->stream_index]->priv_data;
+ ogg->packet_count++;
}
- pktl = s->packet_buffer;
- while (pktl) {
- if (streams[pktl->pkt.stream_index] == 0)
- stream_count++;
- 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;
+ for (i = 0; i < s->nb_streams; i++) {
+ ogg = s->streams[i]->priv_data;
+ stream_count += !!ogg->packet_count;
+ interleaved += ogg->packet_count > 1;
}
if ((s->nb_streams == stream_count && interleaved == stream_count) ||
(flush && stream_count)) {
- pktl= s->packet_buffer;
+ AVPacketList *pktl= s->packet_buffer;
*out= pktl->pkt;
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->packet_count--;
+
if(!s->packet_buffer)
s->packet_buffer_end= NULL;
More information about the ffmpeg-cvslog
mailing list