rtpdec_svq3: Return the timestamp in *timestamp instead of pkt->pts

[ffmpeg] / libavformat / audiointerleave.h

diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h
index a50e7a61bff616796cf36eec2224c2a3b0bf1fe7..c948c366fbf70662502a7988cae6b2cdb0979301 100644 (file)
--- a/libavformat/audiointerleave.h
+++ b/libavformat/audiointerleave.h
@@ -1,5 +1,5 @@
 /*
- * Audio Interleaving prototypes and declarations
+ * audio interleaving prototypes and declarations
  *
  * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
  *
@@ -27,11 +27,11 @@
 #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;
@@ -40,10 +40,17 @@ int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_frame, A
 void ff_audio_interleave_close(AVFormatContext *s);
 
 int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacket *pkt);
-int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
-                                   int stream_index, int flush);
-int ff_audio_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush,
+/**
+ * Rechunk audio PCM packets per AudioInterleaveContext->samples_per_frame
+ * and interleave them correctly.
+ * 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_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 */