/*
- * Audio Interleaving prototypes and declarations
+ * audio interleaving prototypes and declarations
*
* Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
*
#include "avformat.h"
typedef struct {
- AVFifoBuffer fifo;
- unsigned fifo_size; ///< current fifo size allocated
+ AVFifoBuffer *fifo;
+ unsigned fifo_size; ///< size of currently allocated FIFO
uint64_t dts; ///< current dts
int sample_size; ///< size of one sample all channels included
- const int *samples_per_frame; ///< must be 0 terminated
+ const int *samples_per_frame; ///< must be 0-terminated
const int *samples; ///< current samples per frame, pointer to samples_per_frame
AVRational time_base; ///< time base of output audio packets
} AudioInterleaveContext;
int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_frame, AVRational time_base);
void ff_audio_interleave_close(AVFormatContext *s);
-int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt);
/**
- * Rechunk audio pcm packets per AudioInterleaveContext->samples_per_frame
+ * Rechunk audio PCM packets per AudioInterleaveContext->samples_per_frame
* and interleave them correctly.
- * AVStream->priv_data first element must be AudioInterleaveContext
+ * The first element of AVStream->priv_data must be AudioInterleaveContext
* when using this function.
*
* @param get_packet function will output a packet when streams are correctly interleaved.
* @param compare_ts function will compare AVPackets and decide interleaving order.
*/
-int ff_audio_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
+int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int),
int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *));
-#endif // AVFORMAT_AUDIOINTERLEAVE_H
+#endif /* AVFORMAT_AUDIOINTERLEAVE_H */