[FFmpeg-cvslog] r16368 - in trunk/libavformat: rdt.c rm.h rmdec.c

[rbultje]

Author: rbultje
Date: Sun Dec 28 06:58:23 2008
New Revision: 16368

Log:
Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
"[PATCH] oops I broke rdt.c" mailinglist thread.

Modified:
   trunk/libavformat/rdt.c
   trunk/libavformat/rm.h
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	Sun Dec 28 06:55:09 2008	(r16367)
+++ trunk/libavformat/rdt.c	Sun Dec 28 06:58:23 2008	(r16368)
@@ -315,6 +315,7 @@ rdt_parse_packet (PayloadContext *rdt, A
                                                 NULL, NULL, NULL, NULL);
         }
     } else {
+        rdt->audio_pkt_cnt =
         ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, st, rdt->rmst[0], pkt);
         if (rdt->audio_pkt_cnt == 0 &&
             st->codec->codec_id == CODEC_ID_AAC)

Modified: trunk/libavformat/rm.h
==============================================================================
--- trunk/libavformat/rm.h	Sun Dec 28 06:55:09 2008	(r16367)
+++ trunk/libavformat/rm.h	Sun Dec 28 06:58:23 2008	(r16368)
@@ -83,8 +83,10 @@ int ff_rm_parse_packet (AVFormatContext 
  * @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,
+int ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
                            AVStream *st, RMStream *rst, AVPacket *pkt);
 
 #endif /* AVFORMAT_RM_H */

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	Sun Dec 28 06:55:09 2008	(r16367)
+++ trunk/libavformat/rmdec.c	Sun Dec 28 06:58:23 2008	(r16368)
@@ -681,7 +681,7 @@ ff_rm_parse_packet (AVFormatContext *s, 
     return st->codec->codec_type == CODEC_TYPE_AUDIO ? rm->audio_pkt_cnt : 0;
 }
 
-void
+int
 ff_rm_retrieve_cache (AVFormatContext *s, ByteIOContext *pb,
                       AVStream *st, RMStream *ast, AVPacket *pkt)
 {
@@ -700,6 +700,8 @@ ff_rm_retrieve_cache (AVFormatContext *s
     rm->audio_pkt_cnt--;
     pkt->flags = 0;
     pkt->stream_index = st->index;
+
+    return rm->audio_pkt_cnt;
 }
 
 static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)