Revert "Prepare for O_DIRECT"

[frescor/ffmpeg.git] / libavformat / rm.h

diff --git a/libavformat/rm.h b/libavformat/rm.h
index 5bb6c06e30f557d598ccb5239ff3f9e7f91d36d9..53dd019cded31a1328c4276a7ffa408881d5ba59 100644 (file)
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -1,6 +1,6 @@
 /*
  * "Real" compatible muxer and demuxer.
- * Copyright (c) 2000, 2001 Fabrice Bellard.
+ * Copyright (c) 2000, 2001 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -24,6 +24,13 @@
 
 #include "avformat.h"
 
+extern const char *ff_rm_metadata[4];
+
+typedef struct RMStream RMStream;
+
+RMStream *ff_rm_alloc_rmstream (void);
+void      ff_rm_free_rmstream  (RMStream *rms);
+
 /*< input format for Realmedia-style RTSP streams */
 extern AVInputFormat rdt_demuxer;
 
@@ -35,11 +42,13 @@ extern AVInputFormat rdt_demuxer;
  * @param pb context to read the data from
  * @param st the stream that the MDPR chunk belongs to and where to store the
  *           parameters read from the chunk into
+ * @param rst real-specific stream information
  * @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, ByteIOContext *pb,
-                               AVStream *st, int codec_data_size);
+                               AVStream *st, RMStream *rst,
+                               int codec_data_size);
 
 /**
  * Parse one rm-stream packet from the input bytestream.
@@ -47,6 +56,7 @@ int ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb,
  * @param s context containing RMContext and ByteIOContext for stream reading
  * @param pb context to read the data from
  * @param st stream to which the packet to be read belongs
+ * @param rst Real-specific stream information
  * @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
@@ -54,12 +64,12 @@ int ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb,
  * @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 (where >0 indicates there are cached samples that
- *         can be retrieved with subsequent calls to ff_rm_retrieve_cache()),
- *         errno codes on error
+ * @return <0 on error, 0 if a packet was placed in the \p pkt pointer. A
+ *         value >0 means that no data was placed in \p pkt, but that cached
+ *         data is available by calling ff_rm_retrieve_cache().
  */
 int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
-                        AVStream *st, int len,
+                        AVStream *st, RMStream *rst, int len,
                         AVPacket *pkt, int *seq, int *flags, int64_t *ts);
 
 /**
@@ -73,9 +83,12 @@ int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
  * @param s context containing RMContext and ByteIOContext for stream reading
  * @param pb context to read the data from
  * @param st stream that this packet belongs to
+ * @param rst Real-specific stream information
  * @param pkt location to store the packet data
+ * @returns the number of samples left for subsequent calls to this same
+ *          function, or 0 if all samples have been retrieved.
  */
-void ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
-                           AVStream *st, AVPacket *pkt);
+int ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
+                          AVStream *st, RMStream *rst, AVPacket *pkt);
 
 #endif /* AVFORMAT_RM_H */