diff options
| -rw-r--r-- | libavformat/rm.h | 42 | ||||
| -rw-r--r-- | libavformat/rmdec.c | 6 |
2 files changed, 45 insertions, 3 deletions
diff --git a/libavformat/rm.h b/libavformat/rm.h index 4acf226f48..2f7f8df2ee 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -63,4 +63,46 @@ typedef struct { int sub_packet_lengths[16]; /// Length of each aac subpacket } RMContext; +/** + * 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 + * @return 0 on success, errno codes on error + */ +int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st); + +/** + * 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 /* FFMPEG_RM_H */ diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 959419ec23..970f5a3524 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -188,7 +188,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st, return 0; } -static int +int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st) { ByteIOContext *pb = s->pb; @@ -546,7 +546,7 @@ rm_ac3_swap_bytes (AVStream *st, AVPacket *pkt) } } -static int +int ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len, AVPacket *pkt, int *seq, int *flags, int64_t *timestamp) { @@ -644,7 +644,7 @@ ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len, AVPacket *pkt, return 0; } -static void +void ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt) { ByteIOContext *pb = s->pb; |