[FFmpeg-soc] [soc]: r283 - in dvbmuxer: pes.h pesenc.c
realsun
subversion at mplayerhq.hu
Wed Jun 27 11:59:20 CEST 2007
Author: realsun
Date: Wed Jun 27 11:59:19 2007
New Revision: 283
Log:
adjust PES muxer structure, put PES payload construction out of it.
add prefix to non static functions.
Added:
dvbmuxer/pesenc.c
- copied, changed from r261, /dvbmuxer/pes.c
Modified:
dvbmuxer/pes.h
Modified: dvbmuxer/pes.h
==============================================================================
--- dvbmuxer/pes.h (original)
+++ dvbmuxer/pes.h Wed Jun 27 11:59:19 2007
@@ -1,5 +1,5 @@
/*
- * copyright (c) 2007 Xiaohui Sun <sunxiaohui at dsp.ac.cn>
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
*
* This file is part of FFmpeg.
*
@@ -39,16 +39,14 @@ typedef struct PacketDesc {
} PacketDesc;
typedef struct {
+ int is_ps; /*< whether it is a Program Stream */
int packet_number;
} PESContext;
typedef struct {
- uint8_t id;
AVFifoBuffer fifo;
- int max_buffer_size; /* in bytes */
+ int max_buffer_size; /*< in bytes */
int buffer_index;
- uint8_t lpcm_header[3];
- int lpcm_align;
PacketDesc *predecode_packet;
PacketDesc *premux_packet;
PacketDesc **next_packet;
@@ -77,14 +75,14 @@ static const int lpcm_freq_tab[4] = { 48
* @param[in] ctx the AVFormatContext which contains streams
* @return On error a negative value is returned, on success zero.
*/
-int pes_mux_init(AVFormatContext *ctx);
+int ff_pes_mux_init(AVFormatContext *ctx);
/*
* Finalization of PES mux.
* @param [in] ctx the AVFormatContext which contains streams.
* @return NULL
*/
-void pes_mux_end(AVFormatContext *ctx);
+void ff_pes_mux_end(AVFormatContext *ctx);
/*
* Write packet into PES fifo.
@@ -92,7 +90,7 @@ void pes_mux_end(AVFormatContext *ctx);
* @param [in] pkt the packet to write.
* @return NULL
*/
-void pes_write_packet(AVFormatContext *ctx, AVPacket *pkt);
+void ff_pes_write_packet(AVFormatContext *ctx, AVPacket *pkt);
/*
* Find the most fit stream to be muxed.
@@ -102,13 +100,21 @@ void pes_write_packet(AVFormatContext *c
* @param[out] best_i the best fit stream index
* @return On error a negative or zero value is returned, on success 1 is returned
*/
-int pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t scr, int* best_i);
+int ff_pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t scr, int* best_i);
+
+/*
+ * Get how many frames is muxed.
+ * @param[in] ctx the AVFormatContext
+ * @param[in] stream the PES stream
+ * @param[in] len PES packet size
+ * @return the frame number to be muxed
+ */
+int ff_get_nb_frames(AVFormatContext *ctx, PESStream *stream, int len);
/*
* Mux streams into a PES packet.
* @param [in] ctx the AVFormatContext which contains streams
* @param [in] stream_index the stream index to write
- * @param [in,out] q the stream to write
* @param [in] pts packet presentation time stamp
* @param [in] dts packet decoding time stamp
* @param [in] id stream id
@@ -120,17 +126,18 @@ int pes_find_beststream(AVFormatContext
* @param [in] trailer_size the trailer size of the packet
* @return bytes wirtten to PES stream.
*/
-int pes_mux_write(AVFormatContext *ctx, int stream_index, uint8_t* q,
+int ff_pes_mux_write(AVFormatContext *ctx, int stream_index,
int64_t pts,int64_t dts, int id, int startcode,
+ uint8_t* pes_content, int pes_content_len,
int header_len, int packet_size, int payload_size, int stuffing_size, int tailer_size);
/*
* Remove decoded packets of each stream.
* @param[in] ctx the AVFormatContext
* @param[in] scr System Clock Reference of PES stream.
- * @return NULL
+ * @return On error a negative or zero value is returned, on success 1 is returned
*/
-void pes_remove_decoded_packets(AVFormatContext *ctx, int64_t scr);
+int ff_pes_remove_decoded_packets(AVFormatContext *ctx, int64_t scr);
#endif/* PES_H */
Copied: dvbmuxer/pesenc.c (from r261, /dvbmuxer/pes.c)
==============================================================================
--- /dvbmuxer/pes.c (original)
+++ dvbmuxer/pesenc.c Wed Jun 27 11:59:19 2007
@@ -1,6 +1,6 @@
/*
* PES muxer.
- * Copyright (c) 2007 Xiaohui Sun <sunxiaohui at dsp.ac.cn>
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
*
* This file is part of FFmpeg.
*
@@ -20,94 +20,26 @@
*/
#include "pes.h"
-#include "bytestream.h"
-
-
-/*
- * Put timestamp into packet
- * @param[in] p the stream to write
- * @param[in] id stream id
- * @param[in] timestamp the timestamp to put in
- * @return NULL
- */
-static inline void put_timestamp(uint8_t* p, int id, int64_t timestamp)
-{
- bytestream_put_byte(&p,
- (id << 4) |
- (((timestamp >> 30) & 0x07) << 1) |
- 1);
- bytestream_put_be16(&p, (uint16_t)((((timestamp >> 15) & 0x7fff) << 1) | 1));
- bytestream_put_be16(&p, (uint16_t)((((timestamp) & 0x7fff) << 1) | 1));
-}
-static int get_nb_frames(AVFormatContext *ctx, PESStream *stream, int len){
- int nb_frames=0;
- PacketDesc *pkt_desc= stream->premux_packet;
-
- while(len>0){
- if(pkt_desc->size == pkt_desc->unwritten_size)
- nb_frames++;
- len -= pkt_desc->unwritten_size;
- pkt_desc= pkt_desc->next;
- }
-
- return nb_frames;
-}
-
-/*
- * Initialization of PES mux.
- * @param[in] ctx the AVFormatContext which contains streams
- * @return On error a negative value is returned, on success zero.
- */
-int pes_mux_init(AVFormatContext *ctx)
+int ff_pes_mux_init(AVFormatContext *ctx)
{
AVStream *st;
PESStream *stream;
- int i, j;
- int mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id;
-
- mpa_id = AUDIO_ID;
- ac3_id = AC3_ID;
- dts_id = DTS_ID;
- mpv_id = VIDEO_ID;
- mps_id = SUB_ID;
- lpcm_id = LPCM_ID;
+ int i;
- for (i = 0; i < ctx->nb_streams; i++) {
+ for(i=0;i<ctx->nb_streams;i++) {
st = ctx->streams[i];
stream = (PESStream*)st->priv_data;
av_set_pts_info(st, 64, 1, 90000);
switch(st->codec->codec_type) {
case CODEC_TYPE_AUDIO:
- if (st->codec->codec_id == CODEC_ID_AC3) {
- stream->id = ac3_id++;
- } else if (st->codec->codec_id == CODEC_ID_DTS) {
- stream->id = dts_id++;
- } else if (st->codec->codec_id == CODEC_ID_PCM_S16BE) {
- stream->id = lpcm_id++;
- for(j = 0; j < 4; j++) {
- if (lpcm_freq_tab[j] == st->codec->sample_rate)
- break;
- }
- if (j == 4)
- return AVERROR(ENOMEM);
- if (st->codec->channels > 8)
- return -1;
- stream->lpcm_header[0] = 0x0c;
- stream->lpcm_header[1] = (st->codec->channels - 1) | (j << 4);
- stream->lpcm_header[2] = 0x80;
- stream->lpcm_align = st->codec->channels * 2;
- } else {
- stream->id = mpa_id++;
- }
/* This value HAS to be used for VCD (see VCD standard, p. IV-7).
- Right now it is also used for everything else.*/
+ Right now it is also used for everything else.*/
stream->max_buffer_size = 4 * 1024;
break;
case CODEC_TYPE_VIDEO:
- stream->id = mpv_id++;
#if 0
/* see VCD standard, p. IV-7*/
stream->max_buffer_size = 46 * 1024;
@@ -122,7 +54,6 @@ int pes_mux_init(AVFormatContext *ctx)
stream->max_buffer_size = 230*1024; //FIXME this is probably too small as default
break;
case CODEC_TYPE_SUBTITLE:
- stream->id = mps_id++;
stream->max_buffer_size = 16 * 1024;
break;
default:
@@ -134,75 +65,121 @@ int pes_mux_init(AVFormatContext *ctx)
return 0;
}
-
-/*
- * Finalization of PES mux.
- * @param [in] ctx the AVFormatContext which contains streams.
- * @return NULL
- */
-void pes_mux_end(AVFormatContext *ctx)
+static inline void put_timestamp(ByteIOContext *pb, int id, int64_t timestamp)
{
- PESStream *stream;
- int i;
+ put_byte(pb,
+ (id << 4) |
+ (((timestamp >> 30) & 0x07) << 1) |
+ 1);
+ put_be16(pb, (uint16_t)((((timestamp >> 15) & 0x7fff) << 1) | 1));
+ put_be16(pb, (uint16_t)((((timestamp) & 0x7fff) << 1) | 1));
+}
- for (i = 0; i < ctx->nb_streams; i++) {
- stream = ctx->streams[i]->priv_data;
- assert(av_fifo_size(&stream->fifo) == 0);
- av_fifo_free(&stream->fifo);
+int ff_get_nb_frames(AVFormatContext *ctx, PESStream *stream, int len){
+ int nb_frames=0;
+ PacketDesc *pkt_desc= stream->premux_packet;
+
+ while(len>0){
+ if(pkt_desc->size == pkt_desc->unwritten_size)
+ nb_frames++;
+ len -= pkt_desc->unwritten_size;
+ pkt_desc= pkt_desc->next;
}
+
+ return nb_frames;
}
-/*
- * Write packet into PES fifo.
- * @param [in] ctx the AVFormatContext which contains streams.
- * @param [in] pkt the packet to write.
- * @return NULL
- */
-void pes_write_packet(AVFormatContext *ctx, AVPacket *pkt)
+int ff_pes_mux_write(AVFormatContext *ctx, int stream_index,
+ int64_t pts,int64_t dts, int id, int startcode,
+ uint8_t* pes_content, int pes_content_len,
+ int header_len, int packet_size, int payload_size, int stuffing_size, int trailer_size)
{
- int stream_index= pkt->stream_index;
- AVStream *st = ctx->streams[stream_index];
- PESStream *stream = st->priv_data;
- int size= pkt->size;
- uint8_t *buf= pkt->data;
- PacketDesc *pkt_desc;
- int64_t pts, dts;
- const int preload= av_rescale(ctx->preload, 90000, AV_TIME_BASE);
+ PESStream *stream = ctx->streams[stream_index]->priv_data;
+ PESContext *context = ctx->priv_data;
+ int pes_flags, i;
+ int data_size = payload_size - stuffing_size;
- pts= pkt->pts;
- dts= pkt->dts;
+ put_be32(&ctx->pb, startcode);
- if (pts != AV_NOPTS_VALUE)
- pts += preload;
- if (dts != AV_NOPTS_VALUE)
- dts += preload;
+ put_be16(&ctx->pb, packet_size);
+ put_byte(&ctx->pb, 0x80); /* mpeg2 id */
- if (!stream->premux_packet)
- stream->next_packet = &stream->premux_packet;
- *stream->next_packet=
- pkt_desc= av_mallocz(sizeof(PacketDesc));
- pkt_desc->pts= pkt->pts;
- pkt_desc->dts= pkt->dts;
- pkt_desc->unwritten_size=
- pkt_desc->size= size;
- if (!stream->predecode_packet)
- stream->predecode_packet= pkt_desc;
- stream->next_packet= &pkt_desc->next;
+ pes_flags=0;
- av_fifo_realloc(&stream->fifo, av_fifo_size(&stream->fifo) + size + 1);
- av_fifo_write(&stream->fifo, buf, size);
+ if (pts != AV_NOPTS_VALUE) {
+ pes_flags |= 0x80;
+ if (dts != pts)
+ pes_flags |= 0x40;
+ }
+
+ /* Both the MPEG-2 and the SVCD standards demand that the
+ P-STD_buffer_size field be included in the first packet of
+ every stream. (see SVCD standard p. 26 V.2.3.1 and V.2.3.2
+ and MPEG-2 standard 2.7.7) */
+ if (context->packet_number == 0 && context->is_ps)
+ pes_flags |= 0x01;
+
+ put_byte(&ctx->pb, pes_flags); /* flags */
+ put_byte(&ctx->pb, header_len - 3 + stuffing_size);
+
+ if (pes_flags & 0x80) /*write pts*/
+ put_timestamp(&ctx->pb, (pes_flags & 0x40) ? 0x03 : 0x02, pts);
+ if (pes_flags & 0x40) /*write dts*/
+ put_timestamp(&ctx->pb, 0x01, dts);
+
+ if (pes_flags & 0x01) { /*write pes extension*/
+ put_byte(&ctx->pb, 0x10); /* flags */
+
+ /* P-STD buffer info */
+ if (id == AUDIO_ID)
+ put_be16(&ctx->pb, 0x4000 | stream->max_buffer_size/128);
+ else
+ put_be16(&ctx->pb, 0x6000 | stream->max_buffer_size/1024);
+ }
+
+ /* special stuffing byte that is always written
+ to prevent accidental generation of start codes. */
+ put_byte(&ctx->pb, 0xff);
+
+ for (i=0;i<stuffing_size;i++)
+ put_byte(&ctx->pb, 0xff);
+
+ put_buffer(&ctx->pb, pes_content, pes_content_len);
+
+ /* output data */
+ if(av_fifo_generic_read(&stream->fifo, data_size, &put_buffer, &ctx->pb) < 0)
+ return -1;
+ return data_size;
}
+int ff_pes_remove_decoded_packets(AVFormatContext *ctx, int64_t scr)
+{
+ int i;
-/*
- * Find the most fit stream to be muxed.
- * @param[in] ctx the AVFormatContext
- * @param[in] packet_size the packet size of PES stream
- * @param[in] flush whether we flush after every single subtitle packet for subtitle
- * @param[out] best_i the best fit stream index
- * @return On error a negative or zero value is returned, on success 1 is returned
- */
-int pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t scr, int* best_i)
+ for(i=0; i<ctx->nb_streams; i++){
+ AVStream *st = ctx->streams[i];
+ PESStream *stream = st->priv_data;
+ PacketDesc *pkt_desc;
+
+ while((pkt_desc= stream->predecode_packet)
+ && scr > pkt_desc->dts){ //FIXME > vs >=
+ if(stream->buffer_index < pkt_desc->size ||
+ stream->predecode_packet == stream->premux_packet){
+ av_log(ctx, AV_LOG_ERROR,
+ "buffer underflow i=%d bufi=%d size=%d\n",
+ i, stream->buffer_index, pkt_desc->size);
+ break;
+ }
+ stream->buffer_index -= pkt_desc->size;
+ stream->predecode_packet= pkt_desc->next;
+ av_freep(&pkt_desc);
+ }
+ }
+ return 0;
+}
+
+
+int ff_pes_find_beststream(AVFormatContext *ctx, int packet_size, int flush, int64_t scr, int* best_i)
{
int best_score = INT_MIN;
int i, avail_space = 0;
@@ -210,61 +187,62 @@ int pes_find_beststream(AVFormatContext
const int64_t max_delay= av_rescale(ctx->max_delay, 90000, AV_TIME_BASE);
retry:
- for (i = 0; i < ctx->nb_streams; i++){
+ for(i=0; i<ctx->nb_streams; i++){
AVStream *st = ctx->streams[i];
PESStream*stream = st->priv_data;
- const int avail_data = av_fifo_size(&stream->fifo);
- const int space = stream->max_buffer_size - stream->buffer_index;
- int rel_space = 1024*space / stream->max_buffer_size;
- PacketDesc *next_pkt = stream->premux_packet;
+ const int avail_data= av_fifo_size(&stream->fifo);
+ const int space= stream->max_buffer_size - stream->buffer_index;
+ int rel_space= 1024*space / stream->max_buffer_size;
+ PacketDesc *next_pkt= stream->premux_packet;
/* for subtitle, a single PES packet must be generated,
- so we flush after every single subtitle packet */
- if (packet_size > avail_data && !flush
- && st->codec->codec_type != CODEC_TYPE_SUBTITLE)
+ so we flush after every single subtitle packet */
+ if(packet_size > avail_data && !flush
+ && st->codec->codec_type != CODEC_TYPE_SUBTITLE)
return 0;
- if (avail_data == 0)
+ if(avail_data==0)
continue;
- assert(avail_data > 0);
+ assert(avail_data>0);
- if (space < packet_size && !ignore_constraints)
+ if(space < packet_size && !ignore_constraints)
continue;
- if (next_pkt && next_pkt->dts - scr > max_delay)
+ if(next_pkt && next_pkt->dts - scr > max_delay)
continue;
- if (rel_space > best_score){
+ if(rel_space > best_score){
best_score= rel_space;
*best_i = i;
- avail_space = space;
+ avail_space= space;
}
}
- if (*best_i < 0){
- int64_t best_dts = INT64_MAX;
+ if(*best_i < 0){
+ int64_t best_dts= INT64_MAX;
- for (i = 0; i < ctx->nb_streams; i++){
- AVStream *st = ctx->streams[i];
- PESStream *stream = st->priv_data;
- PacketDesc *pkt_desc = stream->predecode_packet;
- if (pkt_desc && pkt_desc->dts < best_dts)
- best_dts = pkt_desc->dts;
+ for(i=0; i<ctx->nb_streams; i++){
+ AVStream *st = ctx->streams[i];
+ PESStream *stream = st->priv_data;
+ PacketDesc *pkt_desc= stream->predecode_packet;
+ if(pkt_desc && pkt_desc->dts < best_dts)
+ best_dts= pkt_desc->dts;
}
#if 0
av_log(ctx, AV_LOG_DEBUG, "bumping scr, scr:%f, dts:%f\n",
- scr/90000.0, best_dts/90000.0);
+ scr/90000.0, best_dts/90000.0);
#endif
- if (best_dts == INT64_MAX)
+ if(best_dts == INT64_MAX)
return 0;
- if (scr >= best_dts+1 && !ignore_constraints){
- av_log(ctx, AV_LOG_ERROR, "packet too large, ignoring buffer limits to mux it\n");
- ignore_constraints = 1;
+ if(scr >= best_dts+1 && !ignore_constraints){
+ av_log(ctx, AV_LOG_ERROR, "packet too large, ignoring buffer limits to mux it\n");
+ ignore_constraints= 1;
}
scr= FFMAX(best_dts+1, scr);
- pes_remove_decoded_packets(ctx, scr);
+ if(ff_pes_remove_decoded_packets(ctx, scr) < 0)
+ return -1;
goto retry;
}
assert(avail_space >= packet_size || ignore_constraints);
@@ -272,124 +250,48 @@ retry:
}
-/*
- * Mux streams into a PES packet.
- * @param [in] ctx the AVFormatContext which contains streams
- * @param [in] stream_index the stream index to write
- * @param [in,out] q the stream to write
- * @param [in] pts packet presentation time stamp
- * @param [in] dts packet decoding time stamp
- * @param [in] id stream id
- * @param [in] start_code PES packet start code
- * @param [in] header_len PES header size
- * @param [in] packet_size the total packet size
- * @param [in] payload_size the payload size of the packet
- * @param [in] stuffing_size the stuffing size of the packet
- * @param [in] trailer_size the trailer size of the packet
- * @return bytes wirtten to PES stream.
- */
-int pes_mux_write(AVFormatContext *ctx, int stream_index, uint8_t* q,
- int64_t pts,int64_t dts, int id, int startcode,
- int header_len, int packet_size, int payload_size, int stuffing_size, int trailer_size)
+void ff_pes_write_packet(AVFormatContext *ctx, AVPacket *pkt)
{
- PESStream *stream = ctx->streams[stream_index]->priv_data;
- PESContext *context = ctx->priv_data;
- int pes_flags, i, nb_frames;
- int data_size = payload_size - stuffing_size;
-
- bytestream_put_be32(&q, startcode);
- bytestream_put_be16(&q, packet_size);
- bytestream_put_byte(&q, 0x80); /* mpeg2 id */
-
- pes_flags=0;
-
- if (pts != AV_NOPTS_VALUE) {
- pes_flags |= 0x80;
- if (dts != pts)
- pes_flags |= 0x40;
- }
-
- /* Both the MPEG-2 and the SVCD standards demand that the
- P-STD_buffer_size field be included in the first packet of
- every stream. (see SVCD standard p. 26 V.2.3.1 and V.2.3.2
- and MPEG-2 standard 2.7.7) */
- if (context->packet_number == 0)
- pes_flags |= 0x01;
-
- bytestream_put_byte(&q, pes_flags);
- bytestream_put_byte(&q, header_len - 3 + stuffing_size);
-
- if (pes_flags & 0x80) /*write pts*/
- put_timestamp(q, (pes_flags & 0x40) ? 0x03 : 0x02, pts);
- if (pes_flags & 0x40) /*write dts*/
- put_timestamp(q, 0x01, dts);
-
- if (pes_flags & 0x01) { /*write pes extension*/
- bytestream_put_byte(&q, 0x10);
-
- /* P-STD buffer info */
- if (id == AUDIO_ID)
- bytestream_put_be16(&q, 0x4000 | stream ->max_buffer_size/128);
- else
- bytestream_put_be16(&q, 0x6000 | stream ->max_buffer_size/1024);
- }
+ int stream_index= pkt->stream_index;
+ AVStream *st = ctx->streams[stream_index];
+ PESStream *stream = st->priv_data;
+ PacketDesc *pkt_desc;
+ int size= pkt->size;
+ uint8_t *buf= pkt->data;
+ int64_t pts, dts;
+ const int preload= av_rescale(ctx->preload, 90000, AV_TIME_BASE);
- /* special stuffing byte that is always written
- to prevent accidental generation of start codes. */
- //put_byte(&ctx->pb, 0xff);
- bytestream_put_byte(&q, 0xff);
+ pts= pkt->pts;
+ dts= pkt->dts;
- for (i=0;i<stuffing_size;i++)
- bytestream_put_byte(&q, 0xff);
+ if(pts != AV_NOPTS_VALUE) pts += preload;
+ if(dts != AV_NOPTS_VALUE) dts += preload;
- if (startcode == PRIVATE_STREAM_1) {
- bytestream_put_byte(&q, id);
- if (id >= 0xa0) {
- /* LPCM (XXX: check nb_frames) */
- bytestream_put_byte(&q, 7);
- bytestream_put_be16(&q, 4); /* skip 3 header bytes */
- bytestream_put_byte(&q, stream->lpcm_header[0]);
- bytestream_put_byte(&q, stream->lpcm_header[1]);
- bytestream_put_byte(&q, stream->lpcm_header[2]);
- } else if (id >= 0x40) {
- /* AC3 */
- nb_frames= get_nb_frames(ctx, stream, data_size);
- bytestream_put_byte(&q, nb_frames);
- bytestream_put_be16(&q, trailer_size+1);
- }
- }
+ if (!stream->premux_packet)
+ stream->next_packet = &stream->premux_packet;
+ *stream->next_packet=
+ pkt_desc= av_mallocz(sizeof(PacketDesc));
+ pkt_desc->pts= pkt->pts;
+ pkt_desc->dts= pkt->dts;
+ pkt_desc->unwritten_size=
+ pkt_desc->size= size;
+ if(!stream->predecode_packet)
+ stream->predecode_packet= pkt_desc;
+ stream->next_packet= &pkt_desc->next;
- /* output data */
- if (av_fifo_read(&stream->fifo, q, data_size) < 0)
- return -1;
- q += data_size;
- return data_size;
+ av_fifo_realloc(&stream->fifo, av_fifo_size(&stream->fifo) + size + 1);
+ av_fifo_write(&stream->fifo, buf, size);
}
-/*
- * Remove decoded packets of each stream.
- * @param[in] ctx the AVFormatContext
- * @param[in] scr System Clock Reference of PES stream.
- * @return NULL
- */
-void pes_remove_decoded_packets(AVFormatContext *ctx, int64_t scr)
+
+void ff_pes_mux_end(AVFormatContext *ctx)
{
+ PESStream *stream;
int i;
- for (i = 0; i < ctx->nb_streams; i++){
- AVStream *st = ctx->streams[i];
- PESStream *stream = st->priv_data;
- PacketDesc *pkt_desc= stream->predecode_packet;
-
- while (pkt_desc && scr > pkt_desc->dts){ //FIXME > vs >=
- if (stream->buffer_index < pkt_desc->size ||
- stream->predecode_packet == stream->premux_packet){
- av_log(ctx, AV_LOG_ERROR, "buffer underflow\n");
- break;
- }
- stream->buffer_index -= pkt_desc->size;
- stream->predecode_packet= pkt_desc->next;
- av_freep(&pkt_desc);
- }
+ for(i=0;i<ctx->nb_streams;i++) {
+ stream = ctx->streams[i]->priv_data;
+ assert(av_fifo_size(&stream->fifo) == 0);
+ av_fifo_free(&stream->fifo);
}
}
More information about the FFmpeg-soc
mailing list