few bistream fixes and verbosity tweaks
[ffmpeg.git] / ffplay.c
index c596306..2df39d9 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #define HAVE_AV_CONFIG_H
-#include "common.h"
 #include "avformat.h"
 
 #include "cmdutils.h"
 #undef main /* We don't want SDL to override our main() */
 #endif
 
+#ifdef CONFIG_OS2
+#define INCL_DOS
+ #include <os2.h>
+ #include <stdio.h>
+ void MorphToPM()
+ {
+   PPIB pib;
+   PTIB tib;
+   DosGetInfoBlocks(&tib, &pib);
+   // Change flag from VIO to PM:
+   if (pib->pib_ultype==2) pib->pib_ultype = 3;
+ }
+#endif
+
 #if defined(__linux__)
 #define HAVE_X11
 #endif
@@ -47,7 +63,7 @@
 #define SDL_AUDIO_BUFFER_SIZE 1024
 
 /* no AV sync correction is done if below the AV sync threshold */
-#define AV_SYNC_THRESHOLD 0.08
+#define AV_SYNC_THRESHOLD 0.01
 /* no AV correction is done if too big error */
 #define AV_NOSYNC_THRESHOLD 10.0
 
@@ -92,6 +108,9 @@ typedef struct VideoState {
     int abort_request;
     int paused;
     int last_paused;
+    int seek_req;
+    int seek_flags;
+    int64_t seek_pos;
     AVFormatContext *ic;
     int dtg_active_format;
 
@@ -112,12 +131,11 @@ typedef struct VideoState {
     /* samples output by the codec. we reserve more space for avsync
        compensation */
     uint8_t audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]; 
-    int audio_buf_size; /* in bytes */
+    unsigned int audio_buf_size; /* in bytes */
     int audio_buf_index; /* in bytes */
     AVPacket audio_pkt;
     uint8_t *audio_pkt_data;
     int audio_pkt_size;
-    int64_t audio_pkt_ipts;
     
     int show_audio; /* if true, display audio samples */
     int16_t sample_array[SAMPLE_ARRAY_SIZE];
@@ -131,8 +149,6 @@ typedef struct VideoState {
     int video_stream;
     AVStream *video_st;
     PacketQueue videoq;
-    int64_t ipts;
-    int picture_start; /* true if picture starts */
     double video_last_P_pts; /* pts of the last P picture (needed if B
                                 frames are present) */
     double video_current_pts; /* current displayed pts (different from
@@ -145,6 +161,9 @@ typedef struct VideoState {
     SDL_mutex *pictq_mutex;
     SDL_cond *pictq_cond;
     
+    SDL_mutex *video_decoder_mutex;
+    SDL_mutex *audio_decoder_mutex;
+
     //    QETimer *video_timer;
     char filename[1024];
     int width, height, xleft, ytop;
@@ -155,6 +174,7 @@ static int audio_write_get_buf_size(VideoState *is);
 
 /* options specified by the user */
 static AVInputFormat *file_iformat;
+static AVImageFormat *image_format;
 static const char *input_filename;
 static int fs_screen_width;
 static int fs_screen_height;
@@ -165,6 +185,15 @@ static int video_disable;
 static int display_disable;
 static int show_status;
 static int av_sync_type = AV_SYNC_AUDIO_MASTER;
+static int64_t start_time = AV_NOPTS_VALUE;
+static int debug = 0;
+static int debug_mv = 0;
+static int step = 0;
+static int thread_count = 1;
+static int workaround_bugs = 1;
+static int fast = 0;
+static int lowres = 0;
+static int idct = FF_IDCT_AUTO;
 
 /* current context */
 static int is_full_screen;
@@ -185,14 +214,24 @@ static void packet_queue_init(PacketQueue *q)
     q->cond = SDL_CreateCond();
 }
 
-static void packet_queue_end(PacketQueue *q)
+static void packet_queue_flush(PacketQueue *q)
 {
     AVPacketList *pkt, *pkt1;
 
     for(pkt = q->first_pkt; pkt != NULL; pkt = pkt1) {
         pkt1 = pkt->next;
         av_free_packet(&pkt->pkt);
+        av_freep(&pkt);
     }
+    q->last_pkt = NULL;
+    q->first_pkt = NULL;
+    q->nb_packets = 0;
+    q->size = 0;
+}
+
+static void packet_queue_end(PacketQueue *q)
+{
+    packet_queue_flush(q);
     SDL_DestroyMutex(q->mutex);
     SDL_DestroyCond(q->cond);
 }
@@ -201,12 +240,17 @@ static int packet_queue_put(PacketQueue *q, AVPacket *pkt)
 {
     AVPacketList *pkt1;
 
+    /* duplicate the packet */
+    if (av_dup_packet(pkt) < 0)
+        return -1;
+    
     pkt1 = av_malloc(sizeof(AVPacketList));
     if (!pkt1)
         return -1;
     pkt1->pkt = *pkt;
     pkt1->next = NULL;
 
+
     SDL_LockMutex(q->mutex);
 
     if (!q->last_pkt)
@@ -330,7 +374,11 @@ static void video_image_display(VideoState *is)
     vp = &is->pictq[is->pictq_rindex];
     if (vp->bmp) {
         /* XXX: use variable in the frame */
-        aspect_ratio = is->video_st->codec.aspect_ratio;
+        if (is->video_st->codec.sample_aspect_ratio.num == 0) 
+            aspect_ratio = 0;
+        else
+            aspect_ratio = av_q2d(is->video_st->codec.sample_aspect_ratio) 
+                * is->video_st->codec.width / is->video_st->codec.height;;
         if (aspect_ratio <= 0.0)
             aspect_ratio = (float)is->video_st->codec.width / 
                 (float)is->video_st->codec.height;
@@ -524,7 +572,11 @@ static double get_audio_clock(VideoState *is)
 static double get_video_clock(VideoState *is)
 {
     double delta;
-    delta = (av_gettime() - is->video_current_pts_time) / 1000000.0;
+    if (is->paused) {
+        delta = 0;
+    } else {
+        delta = (av_gettime() - is->video_current_pts_time) / 1000000.0;
+    }
     return is->video_current_pts + delta;
 }
 
@@ -541,15 +593,39 @@ static double get_master_clock(VideoState *is)
 {
     double val;
 
-    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st)
-        val = get_video_clock(is);
-    else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st)
-        val = get_audio_clock(is);
-    else
+    if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
+        if (is->video_st)
+            val = get_video_clock(is);
+        else
+            val = get_audio_clock(is);
+    } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
+        if (is->audio_st)
+            val = get_audio_clock(is);
+        else
+            val = get_video_clock(is);
+    } else {
         val = get_external_clock(is);
+    }
     return val;
 }
 
+/* seek in the stream */
+static void stream_seek(VideoState *is, int64_t pos, int rel)
+{
+    is->seek_pos = pos;
+    is->seek_req = 1;
+    is->seek_flags = rel < 0 ? AVSEEK_FLAG_BACKWARD : 0;
+}
+
+/* pause or resume the video */
+static void stream_pause(VideoState *is)
+{
+    is->paused = !is->paused;
+    if (is->paused) {
+        is->video_current_pts = get_video_clock(is);
+    }
+}
+
 /* called to display each frame */
 static void video_refresh_timer(void *opaque)
 {
@@ -561,7 +637,7 @@ static void video_refresh_timer(void *opaque)
     if (is->video_st) {
         if (is->pictq_size == 0) {
             /* if no picture, need to wait */
-            schedule_refresh(is, 40);
+            schedule_refresh(is, 1);
         } else {
             /* dequeue the picture */
             vp = &is->pictq[is->pictq_rindex];
@@ -673,14 +749,15 @@ static void alloc_picture(void *opaque)
 {
     VideoState *is = opaque;
     VideoPicture *vp;
-    int is_yuv;
 
     vp = &is->pictq[is->pictq_windex];
 
     if (vp->bmp)
         SDL_FreeYUVOverlay(vp->bmp);
 
+#if 0
     /* XXX: use generic function */
+    /* XXX: disable overlay if no hardware acceleration or if RGB format */
     switch(is->video_st->codec.pix_fmt) {
     case PIX_FMT_YUV420P:
     case PIX_FMT_YUV422P:
@@ -694,22 +771,11 @@ static void alloc_picture(void *opaque)
         is_yuv = 0;
         break;
     }
-
-    if (is_yuv) {
-        vp->bmp = SDL_CreateYUVOverlay(is->video_st->codec.width,
-                                       is->video_st->codec.height,
-                                       SDL_YV12_OVERLAY, 
-                                       screen);
-    } else {
-#if 0
-        vp->bmp = bmp_alloc(screen, 
-                            is->video_st->codec.width,
-                            is->video_st->codec.height,
-                            screen->bitmap_format, 
-                            0);
 #endif
-        vp->bmp = NULL;
-    }
+    vp->bmp = SDL_CreateYUVOverlay(is->video_st->codec.width,
+                                   is->video_st->codec.height,
+                                   SDL_YV12_OVERLAY, 
+                                   screen);
     vp->width = is->video_st->codec.width;
     vp->height = is->video_st->codec.height;
 
@@ -776,7 +842,6 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts)
         pict.linesize[0] = vp->bmp->pitches[0];
         pict.linesize[1] = vp->bmp->pitches[2];
         pict.linesize[2] = vp->bmp->pitches[1];
-        
         img_convert(&pict, dst_pix_fmt, 
                     (AVPicture *)src_frame, is->video_st->codec.pix_fmt, 
                     is->video_st->codec.width, is->video_st->codec.height);
@@ -802,29 +867,20 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1)
     
     pts = pts1;
 
-    /* if B frames are present, and if the current picture is a I
-       or P frame, we use the last pts */
-    if (is->video_st->codec.has_b_frames && 
-        src_frame->pict_type != FF_B_TYPE) {
-        /* use last pts */
-        pts = is->video_last_P_pts;
-        /* get the pts for the next I or P frame if present */
-        is->video_last_P_pts = pts1;
-    }
-
     if (pts != 0) {
         /* update video clock with pts, if present */
         is->video_clock = pts;
     } else {
-        frame_delay = (double)is->video_st->codec.frame_rate_base / 
-            (double)is->video_st->codec.frame_rate;
-        is->video_clock += frame_delay;
-        /* for MPEG2, the frame can be repeated, so we update the
-           clock accordingly */
-        if (src_frame->repeat_pict) {
-            is->video_clock += src_frame->repeat_pict * (frame_delay * 0.5);
-        }
+        pts = is->video_clock;
     }
+    /* update video clock for next frame */
+    frame_delay = av_q2d(is->video_st->codec.time_base);
+    /* for MPEG2, the frame can be repeated, so we update the
+       clock accordingly */
+    if (src_frame->repeat_pict) {
+        frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
+    }
+    is->video_clock += frame_delay;
 
 #if defined(DEBUG_SYNC) && 0
     {
@@ -836,20 +892,18 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1)
         else
             ftype = 'P';
         printf("frame_type=%c clock=%0.3f pts=%0.3f\n", 
-               ftype, is->video_clock, pts1);
+               ftype, pts, pts1);
     }
 #endif
-    return queue_picture(is, src_frame, is->video_clock);
+    return queue_picture(is, src_frame, pts);
 }
 
 static int video_thread(void *arg)
 {
     VideoState *is = arg;
     AVPacket pkt1, *pkt = &pkt1;
-    unsigned char *ptr;
-    int len, len1, got_picture;
-    AVFrame frame;
-    int64_t ipts;
+    int len1, got_picture;
+    AVFrame *frame= avcodec_alloc_frame();
     double pts;
 
     for(;;) {
@@ -860,46 +914,28 @@ static int video_thread(void *arg)
             break;
         /* NOTE: ipts is the PTS of the _first_ picture beginning in
            this packet, if any */
-        ipts = pkt->pts;
-        ptr = pkt->data;
-        if (is->video_st->codec.codec_id == CODEC_ID_RAWVIDEO) {
-            avpicture_fill((AVPicture *)&frame, ptr, 
-                           is->video_st->codec.pix_fmt,
-                           is->video_st->codec.width,
-                           is->video_st->codec.height);
-            pts = 0;
-            if (ipts != AV_NOPTS_VALUE)
-                pts = (double)ipts * is->ic->pts_num / is->ic->pts_den;
-            frame.pict_type = FF_I_TYPE;
-            if (output_picture2(is, &frame, pts) < 0)
-                goto the_end;
-        } else {
-            len = pkt->size;
-            while (len > 0) {
-                if (is->picture_start) {
-                    is->ipts = ipts;
-                    is->picture_start = 0;
-                    ipts = AV_NOPTS_VALUE;
-                }
-                len1 = avcodec_decode_video(&is->video_st->codec, 
-                                            &frame, &got_picture, ptr, len);
-                if (len1 < 0)
-                    break;
-                if (got_picture) {
-                    pts = 0;
-                    if (is->ipts != AV_NOPTS_VALUE)
-                        pts = (double)is->ipts * is->ic->pts_num / is->ic->pts_den;
-                    if (output_picture2(is, &frame, pts) < 0)
-                        goto the_end;
-                    is->picture_start = 1;
-                }
-                ptr += len1;
-                len -= len1;
+        pts = 0;
+        if (pkt->dts != AV_NOPTS_VALUE)
+            pts = av_q2d(is->video_st->time_base)*pkt->dts;
+
+            SDL_LockMutex(is->video_decoder_mutex);
+            len1 = avcodec_decode_video(&is->video_st->codec, 
+                                        frame, &got_picture, 
+                                        pkt->data, pkt->size);
+            SDL_UnlockMutex(is->video_decoder_mutex);
+//            if (len1 < 0)
+//                break;
+            if (got_picture) {
+                if (output_picture2(is, frame, pts) < 0)
+                    goto the_end;
             }
-        }
         av_free_packet(pkt);
+        if (step) 
+            if (cur_stream)
+                stream_pause(cur_stream);
     }
  the_end:
+    av_free(frame);
     return 0;
 }
 
@@ -1005,59 +1041,63 @@ static int synchronize_audio(VideoState *is, short *samples,
 static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_ptr)
 {
     AVPacket *pkt = &is->audio_pkt;
-    int len1, data_size;
+    int n, len1, data_size;
     double pts;
 
     for(;;) {
-        if (is->paused || is->audioq.abort_request) {
-            return -1;
-        }
+        /* NOTE: the audio packet can contain several frames */
         while (is->audio_pkt_size > 0) {
+            SDL_LockMutex(is->audio_decoder_mutex);
             len1 = avcodec_decode_audio(&is->audio_st->codec, 
                                         (int16_t *)audio_buf, &data_size, 
                                         is->audio_pkt_data, is->audio_pkt_size);
-            if (len1 < 0)
+            SDL_UnlockMutex(is->audio_decoder_mutex);
+            if (len1 < 0) {
+                /* if error, we skip the frame */
+                is->audio_pkt_size = 0;
                 break;
+            }
+            
             is->audio_pkt_data += len1;
             is->audio_pkt_size -= len1;
-            if (data_size > 0) {
-                pts = 0;
-                if (is->audio_pkt_ipts != AV_NOPTS_VALUE)
-                    pts = (double)is->audio_pkt_ipts * is->ic->pts_num / is->ic->pts_den;
-                /* if no pts, then compute it */
-                if (pts != 0) {
-                    is->audio_clock = pts;
-                } else {
-                    int n;
-                    n = 2 * is->audio_st->codec.channels;
-                    is->audio_clock += (double)data_size / (double)(n * is->audio_st->codec.sample_rate);
-                }
+            if (data_size <= 0)
+                continue;
+            /* if no pts, then compute it */
+            pts = is->audio_clock;
+            *pts_ptr = pts;
+            n = 2 * is->audio_st->codec.channels;
+            is->audio_clock += (double)data_size / 
+                (double)(n * is->audio_st->codec.sample_rate);
 #if defined(DEBUG_SYNC)
-                {
-                    static double last_clock;
-                    printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
-                           is->audio_clock - last_clock,
-                           is->audio_clock, pts);
-                    last_clock = is->audio_clock;
-                }
-#endif
-                *pts_ptr = is->audio_clock;
-                is->audio_pkt_ipts = AV_NOPTS_VALUE;
-                /* we got samples : we can exit now */
-                return data_size;
+            {
+                static double last_clock;
+                printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n",
+                       is->audio_clock - last_clock,
+                       is->audio_clock, pts);
+                last_clock = is->audio_clock;
             }
+#endif
+            return data_size;
         }
 
-        /* free previous packet if any */
-        if (pkt->destruct)
+        /* free the current packet */
+        if (pkt->data)
             av_free_packet(pkt);
-
+        
+        if (is->paused || is->audioq.abort_request) {
+            return -1;
+        }
+        
         /* read next packet */
         if (packet_queue_get(&is->audioq, pkt, 1) < 0)
             return -1;
         is->audio_pkt_data = pkt->data;
         is->audio_pkt_size = pkt->size;
-        is->audio_pkt_ipts = pkt->pts;
+        
+        /* if update the audio clock with the pts */
+        if (pkt->pts != AV_NOPTS_VALUE) {
+            is->audio_clock = av_q2d(is->audio_st->time_base)*pkt->pts;
+        }
     }
 }
 
@@ -1137,16 +1177,27 @@ static int stream_component_open(VideoState *is, int stream_index)
     }
 
     codec = avcodec_find_decoder(enc->codec_id);
+    enc->debug_mv = debug_mv;
+    enc->debug = debug;
+    enc->workaround_bugs = workaround_bugs;
+    enc->lowres = lowres;
+    if(lowres) enc->flags |= CODEC_FLAG_EMU_EDGE;
+    enc->idct_algo= idct;
+    if(fast) enc->flags2 |= CODEC_FLAG2_FAST;
     if (!codec ||
         avcodec_open(enc, codec) < 0)
         return -1;
+#if defined(HAVE_THREADS)
+    if(thread_count>1)
+        avcodec_thread_init(enc, thread_count);
+#endif
+    enc->thread_count= thread_count;
     switch(enc->codec_type) {
     case CODEC_TYPE_AUDIO:
         is->audio_stream = stream_index;
         is->audio_st = ic->streams[stream_index];
         is->audio_buf_size = 0;
         is->audio_buf_index = 0;
-        is->audio_pkt_size = 0;
 
         /* init averaging filter */
         is->audio_diff_avg_coef = exp(log(0.01) / AUDIO_DIFF_AVG_NB);
@@ -1165,7 +1216,6 @@ static int stream_component_open(VideoState *is, int stream_index)
 
         is->frame_last_delay = 40e-3;
         is->frame_timer = (double)av_gettime() / 1000000.0;
-        is->picture_start = 1;
         is->video_current_pts_time = av_gettime();
 
         packet_queue_init(&is->videoq);
@@ -1224,6 +1274,22 @@ static void stream_component_close(VideoState *is, int stream_index)
     }
 }
 
+void dump_stream_info(AVFormatContext *s)
+{
+    if (s->track != 0)
+        fprintf(stderr, "Track: %d\n", s->track);
+    if (s->title[0] != '\0')
+        fprintf(stderr, "Title: %s\n", s->title);
+    if (s->author[0] != '\0')
+        fprintf(stderr, "Author: %s\n", s->author);
+    if (s->album[0] != '\0')
+        fprintf(stderr, "Album: %s\n", s->album);
+    if (s->year != 0)
+        fprintf(stderr, "Year: %d\n", s->year);
+    if (s->genre[0] != '\0')
+        fprintf(stderr, "Genre: %s\n", s->genre);
+}
+
 /* since we have only one decoding thread, we can use a global
    variable instead of a thread local variable */
 static VideoState *global_video_state;
@@ -1238,8 +1304,9 @@ static int decode_thread(void *arg)
 {
     VideoState *is = arg;
     AVFormatContext *ic;
-    int err, i, ret, video_index, audio_index;
+    int err, i, ret, video_index, audio_index, use_play;
     AVPacket pkt1, *pkt = &pkt1;
+    AVFormatParameters params, *ap = &params;
 
     video_index = -1;
     audio_index = -1;
@@ -1249,20 +1316,60 @@ static int decode_thread(void *arg)
     global_video_state = is;
     url_set_interrupt_cb(decode_interrupt_cb);
 
-    err = av_open_input_file(&ic, is->filename, is->iformat, 0, NULL);
+    memset(ap, 0, sizeof(*ap));
+    ap->image_format = image_format;
+    ap->initial_pause = 1; /* we force a pause when starting an RTSP
+                              stream */
+    
+    err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap);
     if (err < 0) {
         print_error(is->filename, err);
         ret = -1;
         goto fail;
     }
     is->ic = ic;
-    err = av_find_stream_info(ic);
-    if (err < 0) {
-        fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
-        ret = -1;
-        goto fail;
+#ifdef CONFIG_NETWORK
+    use_play = (ic->iformat == &rtsp_demux);
+#else
+    use_play = 0;
+#endif
+    if (!use_play) {
+        err = av_find_stream_info(ic);
+        if (err < 0) {
+            fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
+            ret = -1;
+            goto fail;
+        }
+        ic->pb.eof_reached= 0; //FIXME hack, ffplay maybe shouldnt use url_feof() to test for the end
     }
-    
+
+    /* if seeking requested, we execute it */
+    if (start_time != AV_NOPTS_VALUE) {
+        int64_t timestamp;
+
+        timestamp = start_time;
+        /* add the stream start time */
+        if (ic->start_time != AV_NOPTS_VALUE)
+            timestamp += ic->start_time;
+        ret = av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_BACKWARD);
+        if (ret < 0) {
+            fprintf(stderr, "%s: could not seek to position %0.3f\n", 
+                    is->filename, (double)timestamp / AV_TIME_BASE);
+        }
+    }
+
+    /* now we can begin to play (RTSP stream only) */
+    av_read_play(ic);
+
+    if (use_play) {
+        err = av_find_stream_info(ic);
+        if (err < 0) {
+            fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
+            ret = -1;
+            goto fail;
+        }
+    }
+
     for(i = 0; i < ic->nb_streams; i++) {
         AVCodecContext *enc = &ic->streams[i]->codec;
         switch(enc->codec_type) {
@@ -1280,6 +1387,7 @@ static int decode_thread(void *arg)
     }
     if (show_status) {
         dump_format(ic, 0, is->filename, 0);
+        dump_stream_info(ic);
     }
 
     /* open the streams */
@@ -1303,14 +1411,13 @@ static int decode_thread(void *arg)
     for(;;) {
         if (is->abort_request)
             break;
+#ifdef CONFIG_NETWORK
         if (is->paused != is->last_paused) {
             is->last_paused = is->paused;
-            if (ic->iformat == &rtsp_demux) {
-                if (is->paused)
-                    rtsp_pause(ic);
-                else
-                    rtsp_resume(ic);
-            }
+            if (is->paused)
+                av_read_pause(ic);
+            else
+                av_read_play(ic);
         }
         if (is->paused && ic->iformat == &rtsp_demux) {
             /* wait 10 ms to avoid trying to get another packet */
@@ -1318,17 +1425,41 @@ static int decode_thread(void *arg)
             SDL_Delay(10);
             continue;
         }
+#endif
+        if (is->seek_req) {
+            /* XXX: must lock decoder threads */
+            ret = av_seek_frame(is->ic, -1, is->seek_pos, is->seek_flags);
+            if (ret < 0) {
+                fprintf(stderr, "%s: error while seeking\n", is->ic->filename);
+            }else{
+                if (is->audio_stream >= 0) {
+                    packet_queue_flush(&is->audioq);
+                }
+                if (is->video_stream >= 0) {
+                    packet_queue_flush(&is->videoq);
+                    SDL_LockMutex(is->video_decoder_mutex);
+                    avcodec_flush_buffers(&ic->streams[video_index]->codec);
+                    SDL_UnlockMutex(is->video_decoder_mutex);
+                }
+            }
+            is->seek_req = 0;
+        }
 
         /* if the queue are full, no need to read more */
         if (is->audioq.size > MAX_AUDIOQ_SIZE ||
-            is->videoq.size > MAX_VIDEOQ_SIZE) {
+            is->videoq.size > MAX_VIDEOQ_SIZE || 
+            url_feof(&ic->pb)) {
             /* wait 10 ms */
             SDL_Delay(10);
             continue;
         }
-        ret = av_read_packet(ic, pkt);
+        ret = av_read_frame(ic, pkt);
         if (ret < 0) {
-            break;
+           if (url_feof(&ic->pb) && url_ferror(&ic->pb) == 0) {
+                SDL_Delay(100); /* wait for user event */
+               continue;
+           } else
+               break;
         }
         if (pkt->stream_index == is->audio_stream) {
             packet_queue_put(&is->audioq, pkt);
@@ -1369,12 +1500,6 @@ static int decode_thread(void *arg)
     return 0;
 }
 
-/* pause or resume the video */
-static void stream_pause(VideoState *is)
-{
-    is->paused = !is->paused;
-}
-
 static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 {
     VideoState *is;
@@ -1394,6 +1519,9 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
     /* start video display */
     is->pictq_mutex = SDL_CreateMutex();
     is->pictq_cond = SDL_CreateCond();
+    
+    is->audio_decoder_mutex = SDL_CreateMutex();
+    is->video_decoder_mutex = SDL_CreateMutex();
 
     /* add the refresh timer to draw the picture */
     schedule_refresh(is, 40);
@@ -1425,6 +1553,8 @@ static void stream_close(VideoState *is)
     }
     SDL_DestroyMutex(is->pictq_mutex);
     SDL_DestroyCond(is->pictq_cond);
+    SDL_DestroyMutex(is->audio_decoder_mutex);
+    SDL_DestroyMutex(is->video_decoder_mutex);
 }
 
 void stream_cycle_channel(VideoState *is, int codec_type)
@@ -1496,6 +1626,17 @@ void toggle_pause(void)
 {
     if (cur_stream)
         stream_pause(cur_stream);
+    step = 0;
+}
+
+void step_to_next_frame(void)
+{
+    if (cur_stream) {
+        if (cur_stream->paused)
+            cur_stream->paused=0;
+        cur_stream->video_current_pts = get_video_clock(cur_stream);
+    }
+    step = 1;
 }
 
 void do_exit(void)
@@ -1521,6 +1662,7 @@ void toggle_audio_display(void)
 void event_loop(void)
 {
     SDL_Event event;
+    double incr, pos, frac;
 
     for(;;) {
         SDL_WaitEvent(&event);
@@ -1538,6 +1680,9 @@ void event_loop(void)
             case SDLK_SPACE:
                 toggle_pause();
                 break;
+            case SDLK_s: //S: Step to next frame
+                step_to_next_frame();
+                break;
             case SDLK_a:
                 if (cur_stream) 
                     stream_cycle_channel(cur_stream, CODEC_TYPE_AUDIO);
@@ -1549,10 +1694,46 @@ void event_loop(void)
             case SDLK_w:
                 toggle_audio_display();
                 break;
+            case SDLK_LEFT:
+                incr = -10.0;
+                goto do_seek;
+            case SDLK_RIGHT:
+                incr = 10.0;
+                goto do_seek;
+            case SDLK_UP:
+                incr = 60.0;
+                goto do_seek;
+            case SDLK_DOWN:
+                incr = -60.0;
+            do_seek:
+                if (cur_stream) {
+                    pos = get_master_clock(cur_stream);
+                    pos += incr;
+                    stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE), incr);
+                }
+                break;
             default:
                 break;
             }
             break;
+        case SDL_MOUSEBUTTONDOWN:
+           if (cur_stream) {
+               int ns, hh, mm, ss;
+               int tns, thh, tmm, tss;
+               tns = cur_stream->ic->duration/1000000LL;
+               thh = tns/3600;
+               tmm = (tns%3600)/60;
+               tss = (tns%60);
+               frac = (double)event.button.x/(double)cur_stream->width;
+               ns = frac*tns;
+               hh = ns/3600;
+               mm = (ns%3600)/60;
+               ss = (ns%60);
+               fprintf(stderr, "Seek to %2.0f%% (%2d:%02d:%02d) of total duration (%2d:%02d:%02d)       \n", frac*100,
+                       hh, mm, ss, thh, tmm, tss);
+               stream_seek(cur_stream, (int64_t)(cur_stream->ic->start_time+frac*cur_stream->ic->duration), 0);
+           }
+           break;
         case SDL_VIDEORESIZE:
             if (cur_stream) {
                 screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0, 
@@ -1596,11 +1777,28 @@ static void opt_format(const char *arg)
     }
 }
 
+static void opt_image_format(const char *arg)
+{
+    AVImageFormat *f;
+    
+    for(f = first_image_format; f != NULL; f = f->next) {
+        if (!strcmp(arg, f->name))
+            break;
+    }
+    if (!f) {
+        fprintf(stderr, "Unknown image format: '%s'\n", arg);
+        exit(1);
+    }
+    image_format = f;
+}
+
+#ifdef CONFIG_NETWORK
 void opt_rtp_tcp(void)
 {
     /* only tcp protocol */
     rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP);
 }
+#endif
 
 void opt_sync(const char *arg)
 {
@@ -1614,8 +1812,31 @@ void opt_sync(const char *arg)
         show_help();
 }
 
+void opt_seek(const char *arg)
+{
+    start_time = parse_date(arg, 1);
+}
+
+static void opt_debug(const char *arg)
+{
+    debug = atoi(arg);
+}
+    
+static void opt_vismv(const char *arg)
+{
+    debug_mv = atoi(arg);
+}
+
+static void opt_thread_count(const char *arg)
+{
+    thread_count= atoi(arg);
+#if !defined(HAVE_THREADS)
+    fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
+#endif
+}
+    
 const OptionDef options[] = {
-    { "h", 0, {(void*)show_help}, "show help" },
+    { "h", 0, {(void*)show_help}, "show help" },    
     { "x", HAS_ARG, {(void*)opt_width}, "force displayed width", "width" },
     { "y", HAS_ARG, {(void*)opt_height}, "force displayed height", "height" },
 #if 0
@@ -1624,11 +1845,22 @@ const OptionDef options[] = {
 #endif
     { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" },
     { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" },
+    { "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" },
     { "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" },
     { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
+    { "img", HAS_ARG, {(void*)opt_image_format}, "force image format", "img_fmt" },
     { "stats", OPT_BOOL | OPT_EXPERT, {(void*)&show_status}, "show status", "" },
+    { "debug", HAS_ARG | OPT_EXPERT, {(void*)opt_debug}, "print specific debug info", "" },
+    { "bug", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&workaround_bugs}, "workaround bugs", "" },
+    { "vismv", HAS_ARG | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" },
+    { "fast", OPT_BOOL | OPT_EXPERT, {(void*)&fast}, "non spec compliant optimizations", "" },
+    { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" },
+    { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo",  "algo" },
+#ifdef CONFIG_NETWORK
     { "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" },
-    { "sync", HAS_ARG | OPT_EXPERT, {(void*)&opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
+#endif
+    { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
+    { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
     { NULL, },
 };
 
@@ -1649,12 +1881,17 @@ void show_help(void)
            "a                   cycle audio channel\n"
            "v                   cycle video channel\n"
            "w                   show audio waves\n"
+           "left/right          seek backward/forward 10 seconds\n"
+           "down/up             seek backward/forward 1 minute\n"
+           "mouse click         seek to percentage in file corresponding to fraction of width\n"
            );
     exit(1);
 }
 
 void parse_arg_file(const char *filename)
 {
+    if (!strcmp(filename, "-"))
+                    filename = "pipe:";
     input_filename = filename;
 }
 
@@ -1666,6 +1903,14 @@ int main(int argc, char **argv)
     /* register all codecs, demux and protocols */
     av_register_all();
 
+    #ifdef CONFIG_OS2
+      MorphToPM(); // Morph the VIO application to a PM one to be able to use Win* functions
+      // Make stdout and stderr unbuffered
+      setbuf( stdout, NULL );
+      setbuf( stderr, NULL );
+    #endif
+
     parse_options(argc, argv, options);
 
     if (!input_filename)
@@ -1679,7 +1924,7 @@ int main(int argc, char **argv)
     flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 */
 #endif
     if (SDL_Init (flags)) {
-        fprintf(stderr, "Could not initialize SDL - exiting\n");
+        fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
         exit(1);
     }