few bistream fixes and verbosity tweaks
[ffmpeg.git] / ffplay.c
index 902ef44..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"
 #include <SDL.h>
 #include <SDL_thread.h>
 
+#ifdef CONFIG_WIN32
+#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
 #include <X11/Xlib.h>
 #endif
 
+//#define DEBUG_SYNC
+
 #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
 #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
 
+/* SDL audio buffer size, in samples. Should be small to have precise
+   A/V sync as SDL does not have hardware buffer fullness info. */
+#define SDL_AUDIO_BUFFER_SIZE 1024
+
+/* no AV sync correction is done if below the AV sync threshold */
+#define AV_SYNC_THRESHOLD 0.01
+/* no AV correction is done if too big error */
+#define AV_NOSYNC_THRESHOLD 10.0
+
+/* maximum audio speed change to get correct sync */
+#define SAMPLE_CORRECTION_PERCENT_MAX 10
+
+/* we use about AUDIO_DIFF_AVG_NB A-V differences to make the average */
+#define AUDIO_DIFF_AVG_NB   20
+
 /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
 #define SAMPLE_ARRAY_SIZE (2*65536)
 
@@ -51,7 +88,7 @@ typedef struct PacketQueue {
 #define VIDEO_PICTURE_QUEUE_SIZE 1
 
 typedef struct VideoPicture {
-    int delay; /* delay before showing the next picture */
+    double pts; /* presentation time stamp for this picture */
     SDL_Overlay *bmp;
     int width, height; /* source height & width */
     int allocated;
@@ -60,61 +97,84 @@ typedef struct VideoPicture {
 enum {
     AV_SYNC_AUDIO_MASTER, /* default choice */
     AV_SYNC_VIDEO_MASTER,
-    AV_SYNC_EXTERNAL_CLOCK, /* if external clock, then you must update external_clock yourself */
+    AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 };
 
 typedef struct VideoState {
     SDL_Thread *parse_tid;
     SDL_Thread *video_tid;
+    AVInputFormat *iformat;
     int no_background;
     int abort_request;
     int paused;
+    int last_paused;
+    int seek_req;
+    int seek_flags;
+    int64_t seek_pos;
     AVFormatContext *ic;
     int dtg_active_format;
 
     int audio_stream;
     
     int av_sync_type;
-    double external_clock; /* external clock */
-
-    double audio_clock;  /* current audio clock value */
+    double external_clock; /* external clock base */
+    int64_t external_clock_time;
+    
+    double audio_clock;
+    double audio_diff_cum; /* used for AV difference average computation */
+    double audio_diff_avg_coef;
+    double audio_diff_threshold;
+    int audio_diff_avg_count;
     AVStream *audio_st;
     PacketQueue audioq;
     int audio_hw_buf_size;
     /* 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];
     int sample_array_index;
+    int last_i_start;
     
-    double video_clock; /* current video clock value */
+    double frame_timer;
+    double frame_last_pts;
+    double frame_last_delay;
+    double video_clock;
     int video_stream;
     AVStream *video_st;
     PacketQueue videoq;
-
+    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
+                                 video_clock if frame fifos are used) */
+    int64_t video_current_pts_time; /* time at which we updated
+                                       video_current_pts - used to
+                                       have running video pts */
     VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
     int pictq_size, pictq_rindex, pictq_windex;
     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;
 } VideoState;
 
 void show_help(void);
-int audio_write_get_buf_size(VideoState *is);
+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;
@@ -124,14 +184,25 @@ static int audio_disable;
 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;
 static VideoState *cur_stream;
-static int16_t audio_callback_time;
+static int64_t audio_callback_time;
 
 #define FF_ALLOC_EVENT   (SDL_USEREVENT)
 #define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
+#define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 
 SDL_Surface *screen;
 
@@ -143,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);
 }
@@ -159,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)
@@ -288,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;
@@ -374,22 +464,27 @@ static void video_audio_display(VideoState *s)
     /* compute display index : center on currently output samples */
     channels = s->audio_st->codec.channels;
     nb_display_channels = channels;
-    n = 2 * channels;
-    delay = audio_write_get_buf_size(s);
-    delay /= n;
-    
-    /* to be more precise, we take into account the time spent since
-       the last buffer computation */
-    if (audio_callback_time) {
-        time_diff = av_gettime() - audio_callback_time;
-        delay += (time_diff * s->audio_st->codec.sample_rate) / 1000000;
+    if (!s->paused) {
+        n = 2 * channels;
+        delay = audio_write_get_buf_size(s);
+        delay /= n;
+        
+        /* to be more precise, we take into account the time spent since
+           the last buffer computation */
+        if (audio_callback_time) {
+            time_diff = av_gettime() - audio_callback_time;
+            delay += (time_diff * s->audio_st->codec.sample_rate) / 1000000;
+        }
+        
+        delay -= s->width / 2;
+        if (delay < s->width)
+            delay = s->width;
+        i_start = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
+        s->last_i_start = i_start;
+    } else {
+        i_start = s->last_i_start;
     }
 
-    delay -= s->width / 2;
-    if (delay < s->width)
-        delay = s->width;
-    i_start = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE);
-    
     bgcolor = SDL_MapRGB(screen->format, 0x00, 0x00, 0x00);
     fill_rectangle(screen, 
                    s->xleft, s->ytop, s->width, s->height, 
@@ -456,21 +551,147 @@ static void schedule_refresh(VideoState *is, int delay)
     SDL_AddTimer(delay, sdl_refresh_timer_cb, is);
 }
 
+/* get the current audio clock value */
+static double get_audio_clock(VideoState *is)
+{
+    double pts;
+    int hw_buf_size, bytes_per_sec;
+    pts = is->audio_clock;
+    hw_buf_size = audio_write_get_buf_size(is);
+    bytes_per_sec = 0;
+    if (is->audio_st) {
+        bytes_per_sec = is->audio_st->codec.sample_rate * 
+            2 * is->audio_st->codec.channels;
+    }
+    if (bytes_per_sec)
+        pts -= (double)hw_buf_size / bytes_per_sec;
+    return pts;
+}
+
+/* get the current video clock value */
+static double get_video_clock(VideoState *is)
+{
+    double delta;
+    if (is->paused) {
+        delta = 0;
+    } else {
+        delta = (av_gettime() - is->video_current_pts_time) / 1000000.0;
+    }
+    return is->video_current_pts + delta;
+}
+
+/* get the current external clock value */
+static double get_external_clock(VideoState *is)
+{
+    int64_t ti;
+    ti = av_gettime();
+    return is->external_clock + ((ti - is->external_clock_time) * 1e-6);
+}
+
+/* get the current master clock value */
+static double get_master_clock(VideoState *is)
+{
+    double val;
+
+    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)
 {
     VideoState *is = opaque;
     VideoPicture *vp;
+    double actual_delay, delay, sync_threshold, ref_clock, diff;
+
 
     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];
-            
+
+            /* update current video pts */
+            is->video_current_pts = vp->pts;
+            is->video_current_pts_time = av_gettime();
+
+            /* compute nominal delay */
+            delay = vp->pts - is->frame_last_pts;
+            if (delay <= 0 || delay >= 1.0) {
+                /* if incorrect delay, use previous one */
+                delay = is->frame_last_delay;
+            }
+            is->frame_last_delay = delay;
+            is->frame_last_pts = vp->pts;
+
+            /* update delay to follow master synchronisation source */
+            if (((is->av_sync_type == AV_SYNC_AUDIO_MASTER && is->audio_st) ||
+                 is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
+                /* if video is slave, we try to correct big delays by
+                   duplicating or deleting a frame */
+                ref_clock = get_master_clock(is);
+                diff = vp->pts - ref_clock;
+                
+                /* skip or repeat frame. We take into account the
+                   delay to compute the threshold. I still don't know
+                   if it is the best guess */
+                sync_threshold = AV_SYNC_THRESHOLD;
+                if (delay > sync_threshold)
+                    sync_threshold = delay;
+                if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
+                    if (diff <= -sync_threshold)
+                        delay = 0;
+                    else if (diff >= sync_threshold)
+                        delay = 2 * delay;
+                }
+            }
+
+            is->frame_timer += delay;
+            /* compute the REAL delay (we need to do that to avoid
+               long term errors */
+            actual_delay = is->frame_timer - (av_gettime() / 1000000.0);
+            if (actual_delay < 0.010) {
+                /* XXX: should skip picture */
+                actual_delay = 0.010;
+            }
             /* launch timer for next picture */
-            schedule_refresh(is, vp->delay);
+            schedule_refresh(is, (int)(actual_delay * 1000 + 0.5));
+
+#if defined(DEBUG_SYNC)
+            printf("video: delay=%0.3f actual_delay=%0.3f pts=%0.3f A-V=%f\n", 
+                   delay, actual_delay, vp->pts, -diff);
+#endif
 
             /* display picture */
             video_display(is);
@@ -501,6 +722,7 @@ static void video_refresh_timer(void *opaque)
         static int64_t last_time;
         int64_t cur_time;
         int aqsize, vqsize;
+        double av_diff;
         
         cur_time = av_gettime();
         if (!last_time || (cur_time - last_time) >= 500 * 1000) {
@@ -510,8 +732,11 @@ static void video_refresh_timer(void *opaque)
                 aqsize = is->audioq.size;
             if (is->video_st)
                 vqsize = is->videoq.size;
-            printf("A:%7.2f V:%7.2f aq=%5dKB vq=%5dKB    \r", 
-                   is->audio_clock, is->video_clock, aqsize / 1024, vqsize / 1024);
+            av_diff = 0;
+            if (is->audio_st && is->video_st)
+                av_diff = get_audio_clock(is) - get_video_clock(is);
+            printf("%7.2f A-V:%7.3f aq=%5dKB vq=%5dKB    \r", 
+                   get_master_clock(is), av_diff, aqsize / 1024, vqsize / 1024);
             fflush(stdout);
             last_time = cur_time;
         }
@@ -524,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:
@@ -545,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;
 
@@ -570,14 +785,11 @@ static void alloc_picture(void *opaque)
     SDL_UnlockMutex(is->pictq_mutex);
 }
 
-#define VIDEO_CORRECTION_THRESHOLD 0.2
-
-static int output_picture(VideoState *is, AVPicture *src_pict, double pts)
+static int queue_picture(VideoState *is, AVFrame *src_frame, double pts)
 {
     VideoPicture *vp;
     int dst_pix_fmt;
     AVPicture pict;
-    double delay, ref_clock, diff;
     
     /* wait until we have space to put a new picture */
     SDL_LockMutex(is->pictq_mutex);
@@ -617,6 +829,7 @@ static int output_picture(VideoState *is, AVPicture *src_pict, double pts)
             return -1;
     }
 
+    /* if the frame is not skipped, then display it */
     if (vp->bmp) {
         /* get a pointer on the bitmap */
         SDL_LockYUVOverlay (vp->bmp);
@@ -629,41 +842,13 @@ static int output_picture(VideoState *is, AVPicture *src_pict, 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, 
-                    src_pict, is->video_st->codec.pix_fmt, 
+                    (AVPicture *)src_frame, is->video_st->codec.pix_fmt, 
                     is->video_st->codec.width, is->video_st->codec.height);
         /* update the bitmap content */
         SDL_UnlockYUVOverlay(vp->bmp);
 
-        /* compute delay for the next frame and take into account the
-           pts if needed to make a correction. Since we do not support
-           correct MPEG B frame PTS, we put a high threshold */
-        
-        if (is->av_sync_type == AV_SYNC_VIDEO_MASTER) {
-            ref_clock = is->video_clock;
-        } else if (is->av_sync_type == AV_SYNC_AUDIO_MASTER) {
-            /* cannot use audio master if no audio, so fall back to no sync */
-            if (!is->audio_st)
-                ref_clock = is->video_clock;
-            else
-                ref_clock = is->audio_clock;
-        } else {
-            ref_clock = is->external_clock;
-        }
-        diff = is->video_clock - ref_clock;
-        delay = (double)is->video_st->codec.frame_rate_base / 
-            (double)is->video_st->codec.frame_rate;
-        if (fabs(diff) > VIDEO_CORRECTION_THRESHOLD) {
-            /* if too big difference, then we adjust */
-            delay += diff;
-            /* compute the difference */
-            if (delay < 0.01)
-                delay = 0.01;
-            else if (delay > 1.0)
-                delay = 1.0;
-        }
-        vp->delay = (int)(delay * 1000 + 0.5);
+        vp->pts = pts;
 
         /* now we can update the picture count */
         if (++is->pictq_windex == VIDEO_PICTURE_QUEUE_SIZE)
@@ -672,26 +857,53 @@ static int output_picture(VideoState *is, AVPicture *src_pict, double pts)
         is->pictq_size++;
         SDL_UnlockMutex(is->pictq_mutex);
     }
+    return 0;
+}
+
+/* compute the exact PTS for the picture if it is omitted in the stream */
+static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1)
+{
+    double frame_delay, pts;
+    
+    pts = pts1;
 
-    /* update video clock */
     if (pts != 0) {
+        /* update video clock with pts, if present */
         is->video_clock = pts;
     } else {
-        is->video_clock += (double)is->video_st->codec.frame_rate_base / 
-            (double)is->video_st->codec.frame_rate;
+        pts = is->video_clock;
     }
-    return 0;
+    /* 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
+    {
+        int ftype;
+        if (src_frame->pict_type == FF_B_TYPE)
+            ftype = 'B';
+        else if (src_frame->pict_type == FF_I_TYPE)
+            ftype = 'I';
+        else
+            ftype = 'P';
+        printf("frame_type=%c clock=%0.3f pts=%0.3f\n", 
+               ftype, pts, pts1);
+    }
+#endif
+    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, i;
-    AVFrame frame;
-    AVPicture pict;
-    int64_t ipts;
+    int len1, got_picture;
+    AVFrame *frame= avcodec_alloc_frame();
     double pts;
 
     for(;;) {
@@ -700,44 +912,30 @@ static int video_thread(void *arg)
         }
         if (packet_queue_get(&is->videoq, pkt, 1) < 0)
             break;
-        ipts = pkt->pts;
-        ptr = pkt->data;
-        if (is->video_st->codec.codec_id == CODEC_ID_RAWVIDEO) {
-            avpicture_fill(&pict, 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;
-            if (output_picture(is, &pict, pts) < 0)
-                goto the_end;
-        } else {
-            len = pkt->size;
-            while (len > 0) {
-                len1 = avcodec_decode_video(&is->video_st->codec, 
-                                            &frame, &got_picture, ptr, len);
-                if (len1 < 0)
-                    break;
-                if (got_picture) {
-                    for(i=0;i<4;i++) {
-                        pict.data[i] = frame.data[i];
-                        pict.linesize[i] = frame.linesize[i];
-                    }
-                    pts = 0;
-                    if (ipts != AV_NOPTS_VALUE)
-                        pts = (double)ipts * is->ic->pts_num / is->ic->pts_den;
-                    ipts = AV_NOPTS_VALUE;
-                    if (output_picture(is, &pict, pts) < 0)
-                        goto the_end;
-                }
-                ptr += len1;
-                len -= len1;
+        /* NOTE: ipts is the PTS of the _first_ picture beginning in
+           this packet, if any */
+        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;
 }
 
@@ -762,74 +960,80 @@ static void update_sample_display(VideoState *is, short *samples, int samples_si
     }
 }
 
-/* maximum audio speed change to get correct sync */
-#define SAMPLE_CORRECTION_PERCENT_MAX 2
-
 /* return the new audio buffer size (samples can be added or deleted
    to get better sync if video or external master clock) */
 static int synchronize_audio(VideoState *is, short *samples, 
-                             int samples_size, double pts)
+                             int samples_size1, double pts)
 {
-    int n, delay;
+    int n, samples_size;
     double ref_clock;
     
     n = 2 * is->audio_st->codec.channels;
+    samples_size = samples_size1;
 
-    if (is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)
-        ref_clock = is->external_clock;
-    else if (is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st)
-        ref_clock = is->video_clock;
-    else
-        ref_clock = is->audio_clock;
-    
     /* if not master, then we try to remove or add samples to correct the clock */
-
     if (((is->av_sync_type == AV_SYNC_VIDEO_MASTER && is->video_st) ||
-         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK) && pts != 0) {
-        double diff;
+         is->av_sync_type == AV_SYNC_EXTERNAL_CLOCK)) {
+        double diff, avg_diff;
         int wanted_size, min_size, max_size, nb_samples;
-        delay = audio_write_get_buf_size(is);
-        diff = pts - (double)delay / (double)(n * is->audio_st->codec.sample_rate) - ref_clock;
-        wanted_size = (int)(diff * is->audio_st->codec.sample_rate) * n;
-        nb_samples = samples_size / n;
-
-        min_size = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
-        max_size = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
-        if (wanted_size < min_size)
-            wanted_size = min_size;
-        else if (wanted_size > max_size)
-            wanted_size = max_size;
+            
+        ref_clock = get_master_clock(is);
+        diff = get_audio_clock(is) - ref_clock;
         
-        /* do the correct */
-        /* XXX: do it better with sample interpolation */
-        if (wanted_size < samples_size) {
-            /* remove samples */
-            samples_size = wanted_size;
-        } else if (wanted_size > samples_size) {
-            uint8_t *samples_end, *q;
-            int nb;
-
-            /* add samples */
-            nb = (samples_size - wanted_size);
-            samples_end = (uint8_t *)samples + samples_size - n;
-            q = samples_end + n;
-            while (nb > 0) {
-                memcpy(q, samples_end, n);
-                q += n;
-                nb -= n;
+        if (diff < AV_NOSYNC_THRESHOLD) {
+            is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
+            if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
+                /* not enough measures to have a correct estimate */
+                is->audio_diff_avg_count++;
+            } else {
+                /* estimate the A-V difference */
+                avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
+
+                if (fabs(avg_diff) >= is->audio_diff_threshold) {
+                    wanted_size = samples_size + ((int)(diff * is->audio_st->codec.sample_rate) * n);
+                    nb_samples = samples_size / n;
+                
+                    min_size = ((nb_samples * (100 - SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
+                    max_size = ((nb_samples * (100 + SAMPLE_CORRECTION_PERCENT_MAX)) / 100) * n;
+                    if (wanted_size < min_size)
+                        wanted_size = min_size;
+                    else if (wanted_size > max_size)
+                        wanted_size = max_size;
+                    
+                    /* add or remove samples to correction the synchro */
+                    if (wanted_size < samples_size) {
+                        /* remove samples */
+                        samples_size = wanted_size;
+                    } else if (wanted_size > samples_size) {
+                        uint8_t *samples_end, *q;
+                        int nb;
+                        
+                        /* add samples */
+                        nb = (samples_size - wanted_size);
+                        samples_end = (uint8_t *)samples + samples_size - n;
+                        q = samples_end + n;
+                        while (nb > 0) {
+                            memcpy(q, samples_end, n);
+                            q += n;
+                            nb -= n;
+                        }
+                        samples_size = wanted_size;
+                    }
+                }
+#if 0
+                printf("diff=%f adiff=%f sample_diff=%d apts=%0.3f vpts=%0.3f %f\n", 
+                       diff, avg_diff, samples_size - samples_size1, 
+                       is->audio_clock, is->video_clock, is->audio_diff_threshold);
+#endif
             }
-            samples_size = wanted_size;
+        } else {
+            /* too big difference : may be initial PTS errors, so
+               reset A-V filter */
+            is->audio_diff_avg_count = 0;
+            is->audio_diff_cum = 0;
         }
     }
 
-    /* update audio clock */
-    if (is->av_sync_type == AV_SYNC_AUDIO_MASTER && pts != 0) {
-        /* a pts is given: we update the audio clock precisely */
-        delay = audio_write_get_buf_size(is);
-        is->audio_clock = pts - (double)delay / (double)(n * is->audio_st->codec.sample_rate);
-    } else {
-        is->audio_clock += (double)samples_size / (double)(n * is->audio_st->codec.sample_rate);
-    }
     return samples_size;
 }
 
@@ -837,59 +1041,71 @@ 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;
-                *pts_ptr = pts;
-                is->audio_pkt_ipts = AV_NOPTS_VALUE;
-                /* we got samples : we can exit now */
-                return data_size;
+            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
+            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;
+        }
     }
 }
 
-int audio_write_get_buf_size(VideoState *is)
+/* get the current audio output buffer size, in samples. With SDL, we
+   cannot have a precise information */
+static int audio_write_get_buf_size(VideoState *is)
 {
-    int delay;
-    delay = is->audio_hw_buf_size; 
-#if 0
-    /* just a test to check if the estimated delay is OK */
-    {
-        int val;
-        if (ioctl(sdl_audio_fd, SNDCTL_DSP_GETODELAY, &val) < 0) 
-            perror("SNDCTL_DSP_GETODELAY");
-        printf("real_delay=%d delay=%d\n", val, delay);
-    }
-#endif
-    return delay;
+    return is->audio_hw_buf_size - is->audio_buf_index;
 }
 
 
@@ -941,32 +1157,55 @@ static int stream_component_open(VideoState *is, int stream_index)
         return -1;
     enc = &ic->streams[stream_index]->codec;
     
-
     /* prepare audio output */
     if (enc->codec_type == CODEC_TYPE_AUDIO) {
         wanted_spec.freq = enc->sample_rate;
         wanted_spec.format = AUDIO_S16SYS;
+        /* hack for AC3. XXX: suppress that */
+        if (enc->channels > 2)
+            enc->channels = 2;
         wanted_spec.channels = enc->channels;
         wanted_spec.silence = 0;
-        wanted_spec.samples = 8192;
+        wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
         wanted_spec.callback = sdl_audio_callback;
         wanted_spec.userdata = is;
-        if (SDL_OpenAudio(&wanted_spec, &spec) < 0)
+        if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
+            fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
             return -1;
+        }
         is->audio_hw_buf_size = spec.size;
     }
 
     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;
-        switch(enc->codec_type) {
+#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);
+        is->audio_diff_avg_count = 0;
+        /* since we do not have a precise anough audio fifo fullness,
+           we correct audio sync only if larger than this threshold */
+        is->audio_diff_threshold = 2.0 * SDL_AUDIO_BUFFER_SIZE / enc->sample_rate;
+
         memset(&is->audio_pkt, 0, sizeof(is->audio_pkt));
         packet_queue_init(&is->audioq);
        SDL_PauseAudio(0);
@@ -975,6 +1214,10 @@ static int stream_component_open(VideoState *is, int stream_index)
         is->video_stream = stream_index;
         is->video_st = ic->streams[stream_index];
 
+        is->frame_last_delay = 40e-3;
+        is->frame_timer = (double)av_gettime() / 1000000.0;
+        is->video_current_pts_time = av_gettime();
+
         packet_queue_init(&is->videoq);
         is->video_tid = SDL_CreateThread(video_thread, is);
         break;
@@ -1031,27 +1274,101 @@ 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;
+
+static int decode_interrupt_cb(void)
+{
+    return (global_video_state && global_video_state->abort_request);
+}
 
 /* this thread gets the stream from the disk or the network */
 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;
     is->video_stream = -1;
     is->audio_stream = -1;
 
-    err = av_open_input_file(&ic, is->filename, NULL, 0, NULL);
-    if (err < 0)
-        return 0;
-    is->ic = ic;
-    err = av_find_stream_info(ic);
-    if (err < 0)
+    global_video_state = is;
+    url_set_interrupt_cb(decode_interrupt_cb);
+
+    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;
+#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;
@@ -1070,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 */
@@ -1085,22 +1403,63 @@ static int decode_thread(void *arg)
     }
 
     if (is->video_stream < 0 && is->audio_stream < 0) {
+        fprintf(stderr, "%s: could not open codecs\n", is->filename);
+        ret = -1;
         goto fail;
     }
 
     for(;;) {
         if (is->abort_request)
             break;
+#ifdef CONFIG_NETWORK
+        if (is->paused != is->last_paused) {
+            is->last_paused = is->paused;
+            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 */
+            /* XXX: horrible */
+            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);
@@ -1115,25 +1474,33 @@ static int decode_thread(void *arg)
         SDL_Delay(100);
     }
 
+    ret = 0;
  fail:
+    /* disable interrupting */
+    global_video_state = NULL;
+
     /* close each stream */
     if (is->audio_stream >= 0)
         stream_component_close(is, is->audio_stream);
     if (is->video_stream >= 0)
         stream_component_close(is, is->video_stream);
+    if (is->ic) {
+        av_close_input_file(is->ic);
+        is->ic = NULL; /* safety */
+    }
+    url_set_interrupt_cb(NULL);
 
-    av_close_input_file(is->ic);
-    is->ic = NULL; /* safety */
+    if (ret != 0) {
+        SDL_Event event;
+        
+        event.type = FF_QUIT_EVENT;
+        event.user.data1 = is;
+        SDL_PushEvent(&event);
+    }
     return 0;
 }
 
-/* pause or resume the video */
-static void stream_pause(VideoState *is)
-{
-    is->paused = !is->paused;
-}
-
-static VideoState *stream_open(const char *filename)
+static VideoState *stream_open(const char *filename, AVInputFormat *iformat)
 {
     VideoState *is;
 
@@ -1141,6 +1508,7 @@ static VideoState *stream_open(const char *filename)
     if (!is)
         return NULL;
     pstrcpy(is->filename, sizeof(is->filename), filename);
+    is->iformat = iformat;
     if (screen) {
         is->width = screen->w;
         is->height = screen->h;
@@ -1151,12 +1519,14 @@ static VideoState *stream_open(const char *filename)
     /* 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);
 
-    is->av_sync_type = AV_SYNC_AUDIO_MASTER;
-
+    is->av_sync_type = av_sync_type;
     is->parse_tid = SDL_CreateThread(decode_thread, is);
     if (!is->parse_tid) {
         av_free(is);
@@ -1183,8 +1553,50 @@ 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)
+{
+    AVFormatContext *ic = is->ic;
+    int start_index, stream_index;
+    AVStream *st;
+
+    if (codec_type == CODEC_TYPE_VIDEO)
+        start_index = is->video_stream;
+    else
+        start_index = is->audio_stream;
+    if (start_index < 0)
+        return;
+    stream_index = start_index;
+    for(;;) {
+        if (++stream_index >= is->ic->nb_streams)
+            stream_index = 0;
+        if (stream_index == start_index)
+            return;
+        st = ic->streams[stream_index];
+        if (st->codec.codec_type == codec_type) {
+            /* check that parameters are OK */
+            switch(codec_type) {
+            case CODEC_TYPE_AUDIO:
+                if (st->codec.sample_rate != 0 &&
+                    st->codec.channels != 0)
+                    goto the_end;
+                break;
+            case CODEC_TYPE_VIDEO:
+                goto the_end;
+            default:
+                break;
+            }
+        }
+    }
+ the_end:
+    stream_component_close(is, start_index);
+    stream_component_open(is, stream_index);
 }
 
+
 void toggle_full_screen(void)
 {
     int w, h, flags;
@@ -1214,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)
@@ -1239,6 +1662,7 @@ void toggle_audio_display(void)
 void event_loop(void)
 {
     SDL_Event event;
+    double incr, pos, frac;
 
     for(;;) {
         SDL_WaitEvent(&event);
@@ -1256,13 +1680,60 @@ 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);
+                break;
+            case SDLK_v:
+                if (cur_stream) 
+                    stream_cycle_channel(cur_stream, CODEC_TYPE_VIDEO);
+                break;
+            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, 
@@ -1272,6 +1743,7 @@ void event_loop(void)
             }
             break;
         case SDL_QUIT:
+        case FF_QUIT_EVENT:
             do_exit();
             break;
         case FF_ALLOC_EVENT:
@@ -1305,46 +1777,140 @@ 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)
+{
+    if (!strcmp(arg, "audio"))
+        av_sync_type = AV_SYNC_AUDIO_MASTER;
+    else if (!strcmp(arg, "video"))
+        av_sync_type = AV_SYNC_VIDEO_MASTER;
+    else if (!strcmp(arg, "ext"))
+        av_sync_type = AV_SYNC_EXTERNAL_CLOCK;
+    else
+        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
+    /* disabled as SDL/X11 does not support it correctly on application launch */
+    { "fs", OPT_BOOL, {(void*)&is_full_screen}, "force full screen" },
+#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", "" },
+#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, },
 };
 
 void show_help(void)
 {
-    printf("usage: ffplay [options] input_file\n"
+    printf("ffplay version " FFMPEG_VERSION ", Copyright (c) 2003 Fabrice Bellard\n"
+           "usage: ffplay [options] input_file\n"
            "Simple media player\n");
     printf("\n");
-    show_help_options(options);
+    show_help_options(options, "Main options:\n",
+                      OPT_EXPERT, 0);
+    show_help_options(options, "\nAdvanced options:\n",
+                      OPT_EXPERT, OPT_EXPERT);
     printf("\nWhile playing:\n"
            "q, ESC              quit\n"
            "f                   toggle full screen\n"
            "p, SPC              pause\n"
-           "a                   show audio waves\n"
+           "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;
 }
 
 /* Called from the main */
 int main(int argc, char **argv)
 {
-    int flags;
+    int flags, w, h;
     
     /* 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)
@@ -1353,20 +1919,16 @@ int main(int argc, char **argv)
     if (display_disable) {
         video_disable = 1;
     }
-    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_EVENTTHREAD;
+    flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
+#ifndef CONFIG_WIN32
+    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);
     }
 
     if (!display_disable) {
-        screen = SDL_SetVideoMode(screen_width, screen_height, 0, 
-                                  SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL);
-        if (!screen) {
-            fprintf(stderr, "SDL: could not set video mode - exiting\n");
-            exit(1);
-        }
-        SDL_WM_SetCaption("FFplay", "FFplay");
 #ifdef HAVE_X11
         /* save the screen resolution... SDL should allow full screen
            by resizing the window */
@@ -1380,6 +1942,22 @@ int main(int argc, char **argv)
             }
         }
 #endif
+        flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
+        if (is_full_screen && fs_screen_width) {
+            w = fs_screen_width;
+            h = fs_screen_height;
+            flags |= SDL_FULLSCREEN;
+        } else {
+            w = screen_width;
+            h = screen_height;
+            flags |= SDL_RESIZABLE;
+        }
+        screen = SDL_SetVideoMode(w, h, 0, flags);
+        if (!screen) {
+            fprintf(stderr, "SDL: could not set video mode - exiting\n");
+            exit(1);
+        }
+        SDL_WM_SetCaption("FFplay", "FFplay");
     }
 
     SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
@@ -1387,7 +1965,7 @@ int main(int argc, char **argv)
     SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
     SDL_EventState(SDL_USEREVENT, SDL_IGNORE);
 
-    cur_stream = stream_open(input_filename);
+    cur_stream = stream_open(input_filename, file_iformat);
 
     event_loop();