forbid mp3 < 16000hz in anything except mov

[ffmpeg] / libavformat / rm.h

diff --git a/libavformat/rm.h b/libavformat/rm.h
index 2e307c2125ed8be1ac1c833ed2ce524d26f87deb..a57e517baba1a5543f6de02225c9d5bb27e82976 100644 (file)
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RM_H
-#define RM_H
+#ifndef AVFORMAT_RM_H
+#define AVFORMAT_RM_H
 
 #include "avformat.h"
 
@@ -46,6 +46,12 @@ typedef struct {
     int old_format;
     int current_stream;
     int remaining_len;
+    uint8_t *videobuf; ///< place to store merged video frame
+    int videobufsize;  ///< current assembled frame size
+    int videobufpos;   ///< position for the next slice in the video buffer
+    int curpic_num;    ///< picture number of current frame
+    int cur_slice, slices;
+    int64_t pktpos;    ///< first slice position in file
     /// Audio descrambling matrix parameters
     uint8_t *audiobuf; ///< place to store reordered audio data
     int64_t audiotimestamp; ///< Audio packet timestamp
@@ -57,4 +63,47 @@ typedef struct {
     int sub_packet_lengths[16]; /// Length of each aac subpacket
 } RMContext;
 
-#endif /* RM_H */
+/**
+ * Read the MDPR chunk, which contains stream-specific codec initialization
+ * parameters.
+ *
+ * @param s context containing RMContext and ByteIOContext for stream reading
+ * @param st the stream that the MDPR chunk belongs to and where to store the
+ *           parameters read from the chunk into
+ * @param codec_data_size size of the MDPR chunk
+ * @return 0 on success, errno codes on error
+ */
+int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st, int codec_data_size);
+
+/**
+ * Parse one rm-stream packet from the input bytestream.
+ *
+ * @param s context containing RMContext and ByteIOContext for stream reading
+ * @param st stream to which the packet to be read belongs
+ * @param len packet length to read from the input
+ * @param pkt packet location to store the parsed packet data
+ * @param seq pointer to an integer containing the sequence number, may be
+ *            updated
+ * @param flags pointer to an integer containing the packet flags, may be
+                updated
+ * @param ts pointer to timestamp, may be updated
+ * @return 0 on success, errno codes on error
+ */
+int ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len,
+                        AVPacket *pkt, int *seq, int *flags, int64_t *ts);
+
+/**
+ * Retrieve one cached packet from the rm-context. The real container can
+ * store several packets (as interpreted by the codec) in a single container
+ * packet, which means the demuxer holds some back when the first container
+ * packet is parsed and returned. The result is that rm->audio_pkt_cnt is
+ * a positive number, the amount of cached packets. Using this function, each
+ * of those packets can be retrieved sequentially.
+ *
+ * @param s context containing RMContext and ByteIOContext for stream reading
+ * @param st stream that this packet belongs to
+ * @param pkt location to store the packet data
+ */
+void ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt);
+
+#endif /* AVFORMAT_RM_H */