frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / tests / seek_test.c

diff --git a/tests/seek_test.c b/tests/seek_test.c
index 025268549fd198e190bb0ea99c21efefc25e8d31..7d64058458196f4cdaea8c8f4039f589508abca7 100644 (file)
--- a/tests/seek_test.c
+++ b/tests/seek_test.c
@@ -18,12 +18,17 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "avformat.h"
+#include "libavutil/common.h"
+#include "libavformat/avformat.h"
 
 #undef exit
+#undef printf
+#undef fprintf
 
 int main(int argc, char **argv)
 {
@@ -31,6 +36,10 @@ int main(int argc, char **argv)
     AVFormatContext *ic;
     int i, ret, stream_id;
     int64_t timestamp;
+    AVFormatParameters params, *ap= &params;
+    memset(ap, 0, sizeof(params));
+    ap->channels=1;
+    ap->sample_rate= 22050;
 
     /* initialize libavcodec, and register all codecs and formats */
     av_register_all();
@@ -44,13 +53,13 @@ int main(int argc, char **argv)
     filename = argv[1];
 
     /* allocate the media context */
-    ic = av_alloc_format_context();
+    ic = avformat_alloc_context();
     if (!ic) {
         fprintf(stderr, "Memory error\n");
         exit(1);
     }
 
-    ret = av_open_input_file(&ic, filename, NULL, 0, NULL);
+    ret = av_open_input_file(&ic, filename, NULL, 0, ap);
     if (ret < 0) {
         fprintf(stderr, "cannot open %s\n", filename);
         exit(1);
@@ -64,7 +73,7 @@ int main(int argc, char **argv)
 
     for(i=0; ; i++){
         AVPacket pkt;
-        AVStream *st;
+        AVStream *av_uninit(st);
 
         memset(&pkt, 0, sizeof(pkt));
         if(ret>=0){
@@ -72,7 +81,7 @@ int main(int argc, char **argv)
             printf("ret:%2d", ret);
             if(ret>=0){
                 st= ic->streams[pkt.stream_index];
-                printf(" st:%2d dts:%f pts:%f pos:%Ld size:%d flags:%d", pkt.stream_index, pkt.dts*av_q2d(st->time_base), pkt.pts*av_q2d(st->time_base), pkt.pos, pkt.size, pkt.flags);
+                printf(" st:%2d dts:%f pts:%f pos:%" PRId64 " size:%d flags:%d", pkt.stream_index, pkt.dts*av_q2d(st->time_base), pkt.pts*av_q2d(st->time_base), pkt.pos, pkt.size, pkt.flags);
             }
             printf("\n");
         }
@@ -85,7 +94,9 @@ int main(int argc, char **argv)
             st= ic->streams[stream_id];
             timestamp= av_rescale_q(timestamp, AV_TIME_BASE_Q, st->time_base);
         }
-        ret = av_seek_frame(ic, stream_id, timestamp, (i&1)*AVSEEK_FLAG_BACKWARD);
+        //FIXME fully test the new seek API
+        if(i&1) ret = avformat_seek_file(ic, stream_id, INT64_MIN, timestamp, timestamp, 0);
+        else    ret = avformat_seek_file(ic, stream_id, timestamp, timestamp, INT64_MAX, 0);
         printf("ret:%2d st:%2d ts:%f flags:%d\n", ret, stream_id, timestamp*(stream_id<0 ? 1.0/AV_TIME_BASE : av_q2d(st->time_base)), i&1);
     }