X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffplay.c;h=e4259007994a578d36b46c9b8b01fdcd13c23ad4;hb=e2e2e7dd70db2b1643041853ce7472257814524e;hp=5ac33c6f23f0716b66e70ac6d8bc3b6cf9548978;hpb=94b594c68ae36848605766c84771674ef7b21bc9;p=ffmpeg diff --git a/ffplay.c b/ffplay.c index 5ac33c6f23f..e4259007994 100644 --- a/ffplay.c +++ b/ffplay.c @@ -18,9 +18,12 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define HAVE_AV_CONFIG_H + +#include +#include #include "avformat.h" #include "swscale.h" +#include "avstring.h" #include "version.h" #include "cmdutils.h" @@ -32,22 +35,7 @@ #undef main /* We don't want SDL to override our main() */ #endif -#ifdef CONFIG_OS2 -#define INCL_DOS - #include - #include - - 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 +#undef exit //#define DEBUG_SYNC @@ -171,10 +159,6 @@ typedef struct VideoState { SDL_mutex *pictq_mutex; SDL_cond *pictq_cond; - SDL_mutex *video_decoder_mutex; - SDL_mutex *audio_decoder_mutex; - SDL_mutex *subtitle_decoder_mutex; - // QETimer *video_timer; char filename[1024]; int width, height, xleft, ytop; @@ -188,10 +172,14 @@ static AVInputFormat *file_iformat; static const char *input_filename; static int fs_screen_width; static int fs_screen_height; -static int screen_width = 640; -static int screen_height = 480; +static int screen_width = 0; +static int screen_height = 0; +static int frame_width = 0; +static int frame_height = 0; +static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE; static int audio_disable; static int video_disable; +static int wanted_audio_stream= 0; static int seek_by_bytes; static int display_disable; static int show_status; @@ -211,12 +199,15 @@ static enum AVDiscard skip_idct= AVDISCARD_DEFAULT; static enum AVDiscard skip_loop_filter= AVDISCARD_DEFAULT; static int error_resilience = FF_ER_CAREFUL; static int error_concealment = 3; +static int decoder_reorder_pts= 0; /* current context */ static int is_full_screen; static VideoState *cur_stream; static int64_t audio_callback_time; +AVPacket flush_pkt; + #define FF_ALLOC_EVENT (SDL_USEREVENT) #define FF_REFRESH_EVENT (SDL_USEREVENT + 1) #define FF_QUIT_EVENT (SDL_USEREVENT + 2) @@ -260,7 +251,7 @@ static int packet_queue_put(PacketQueue *q, AVPacket *pkt) AVPacketList *pkt1; /* duplicate the packet */ - if (av_dup_packet(pkt) < 0) + if (pkt!=&flush_pkt && av_dup_packet(pkt) < 0) return -1; pkt1 = av_malloc(sizeof(AVPacketList)); @@ -737,7 +728,7 @@ static void video_image_display(VideoState *is) is->no_background = 0; } rect.x = is->xleft + x; - rect.y = is->xleft + y; + rect.y = is->ytop + y; rect.w = width; rect.h = height; SDL_DisplayYUVOverlay(vp->bmp, &rect); @@ -783,7 +774,23 @@ static void video_audio_display(VideoState *s) delay -= s->width / 2; if (delay < s->width) delay = s->width; - i_start = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE); + + i_start= x = compute_mod(s->sample_array_index - delay * channels, SAMPLE_ARRAY_SIZE); + + h= INT_MIN; + for(i=0; i<1000; i+=channels){ + int idx= (SAMPLE_ARRAY_SIZE + x - i) % SAMPLE_ARRAY_SIZE; + int a= s->sample_array[idx]; + int b= s->sample_array[(idx + 4*channels)%SAMPLE_ARRAY_SIZE]; + int c= s->sample_array[(idx + 5*channels)%SAMPLE_ARRAY_SIZE]; + int d= s->sample_array[(idx + 9*channels)%SAMPLE_ARRAY_SIZE]; + int score= a-d; + if(hlast_i_start = i_start; } else { i_start = s->last_i_start; @@ -831,9 +838,49 @@ static void video_audio_display(VideoState *s) SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height); } +static int video_open(VideoState *is){ + int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; + int w,h; + + if(is_full_screen) flags |= SDL_FULLSCREEN; + else flags |= SDL_RESIZABLE; + + if (is_full_screen && fs_screen_width) { + w = fs_screen_width; + h = fs_screen_height; + } else if(!is_full_screen && screen_width){ + w = screen_width; + h = screen_height; + }else if (is->video_st && is->video_st->codec->width){ + w = is->video_st->codec->width; + h = is->video_st->codec->height; + } else { + w = 640; + h = 480; + } +#ifndef CONFIG_DARWIN + screen = SDL_SetVideoMode(w, h, 0, flags); +#else + /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */ + screen = SDL_SetVideoMode(w, h, 24, flags); +#endif + if (!screen) { + fprintf(stderr, "SDL: could not set video mode - exiting\n"); + return -1; + } + SDL_WM_SetCaption("FFplay", "FFplay"); + + is->width = screen->w; + is->height = screen->h; + + return 0; +} + /* display the current picture, if any */ static void video_display(VideoState *is) { + if(!screen) + video_open(cur_stream); if (is->audio_st && is->show_audio) video_audio_display(is); else if (is->video_st) @@ -929,8 +976,9 @@ static void stream_seek(VideoState *is, int64_t pos, int rel) static void stream_pause(VideoState *is) { is->paused = !is->paused; - if (is->paused) { + if (!is->paused) { is->video_current_pts = get_video_clock(is); + is->frame_timer += (av_gettime() - is->video_current_pts_time) / 1000000.0; } } @@ -1118,7 +1166,7 @@ static void alloc_picture(void *opaque) case PIX_FMT_YUV420P: case PIX_FMT_YUV422P: case PIX_FMT_YUV444P: - case PIX_FMT_YUV422: + case PIX_FMT_YUYV422: case PIX_FMT_YUV410P: case PIX_FMT_YUV411P: is_yuv = 1; @@ -1269,6 +1317,21 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1) return queue_picture(is, src_frame, pts); } +static uint64_t global_video_pkt_pts= AV_NOPTS_VALUE; + +static int my_get_buffer(struct AVCodecContext *c, AVFrame *pic){ + int ret= avcodec_default_get_buffer(c, pic); + uint64_t *pts= av_malloc(sizeof(uint64_t)); + *pts= global_video_pkt_pts; + pic->opaque= pts; + return ret; +} + +static void my_release_buffer(struct AVCodecContext *c, AVFrame *pic){ + if(pic) av_freep(&pic->opaque); + avcodec_default_release_buffer(c, pic); +} + static int video_thread(void *arg) { VideoState *is = arg; @@ -1283,23 +1346,34 @@ static int video_thread(void *arg) } if (packet_queue_get(&is->videoq, pkt, 1) < 0) break; + + if(pkt->data == flush_pkt.data){ + avcodec_flush_buffers(is->video_st->codec); + continue; + } + /* 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); + global_video_pkt_pts= pkt->pts; + len1 = avcodec_decode_video(is->video_st->codec, + frame, &got_picture, + pkt->data, pkt->size); + + if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE) + && frame->opaque && *(uint64_t*)frame->opaque != AV_NOPTS_VALUE) + pts= *(uint64_t*)frame->opaque; + else if(pkt->dts != AV_NOPTS_VALUE) + pts= pkt->dts; + else + pts= 0; + pts *= av_q2d(is->video_st->time_base); + // if (len1 < 0) // break; - if (got_picture) { - if (output_picture2(is, frame, pts) < 0) - goto the_end; - } + if (got_picture) { + if (output_picture2(is, frame, pts) < 0) + goto the_end; + } av_free_packet(pkt); if (step) if (cur_stream) @@ -1327,6 +1401,10 @@ static int subtitle_thread(void *arg) if (packet_queue_get(&is->subtitleq, pkt, 1) < 0) break; + if(pkt->data == flush_pkt.data){ + avcodec_flush_buffers(is->subtitle_st->codec); + continue; + } SDL_LockMutex(is->subpq_mutex); while (is->subpq_size >= SUBPICTURE_QUEUE_SIZE && !is->subtitleq.abort_request) { @@ -1345,11 +1423,9 @@ static int subtitle_thread(void *arg) if (pkt->pts != AV_NOPTS_VALUE) pts = av_q2d(is->subtitle_st->time_base)*pkt->pts; - SDL_LockMutex(is->subtitle_decoder_mutex); len1 = avcodec_decode_subtitle(is->subtitle_st->codec, &sp->sub, &got_subtitle, pkt->data, pkt->size); - SDL_UnlockMutex(is->subtitle_decoder_mutex); // if (len1 < 0) // break; if (got_subtitle && sp->sub.format == 0) { @@ -1482,7 +1558,7 @@ static int synchronize_audio(VideoState *is, short *samples, } /* decode one audio frame and returns its uncompressed size */ -static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_ptr) +static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, int buf_size, double *pts_ptr) { AVPacket *pkt = &is->audio_pkt; int n, len1, data_size; @@ -1491,11 +1567,10 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt for(;;) { /* 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, + data_size = buf_size; + len1 = avcodec_decode_audio2(is->audio_st->codec, (int16_t *)audio_buf, &data_size, is->audio_pkt_data, is->audio_pkt_size); - SDL_UnlockMutex(is->audio_decoder_mutex); if (len1 < 0) { /* if error, we skip the frame */ is->audio_pkt_size = 0; @@ -1535,6 +1610,11 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt /* read next packet */ if (packet_queue_get(&is->audioq, pkt, 1) < 0) return -1; + if(pkt->data == flush_pkt.data){ + avcodec_flush_buffers(is->audio_st->codec); + continue; + } + is->audio_pkt_data = pkt->data; is->audio_pkt_size = pkt->size; @@ -1549,7 +1629,7 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt cannot have a precise information */ static int audio_write_get_buf_size(VideoState *is) { - return is->audio_hw_buf_size - is->audio_buf_index; + return is->audio_buf_size - is->audio_buf_index; } @@ -1564,7 +1644,7 @@ void sdl_audio_callback(void *opaque, Uint8 *stream, int len) while (len > 0) { if (is->audio_buf_index >= is->audio_buf_size) { - audio_size = audio_decode_frame(is, is->audio_buf, &pts); + audio_size = audio_decode_frame(is, is->audio_buf, sizeof(is->audio_buf), &pts); if (audio_size < 0) { /* if error, just output silence */ is->audio_buf_size = 1024; @@ -1588,7 +1668,6 @@ void sdl_audio_callback(void *opaque, Uint8 *stream, int len) } } - /* open a given stream. Return 0 if OK */ static int stream_component_open(VideoState *is, int stream_index) { @@ -1636,10 +1715,8 @@ static int stream_component_open(VideoState *is, int stream_index) 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: @@ -1669,6 +1746,9 @@ static int stream_component_open(VideoState *is, int stream_index) packet_queue_init(&is->videoq); is->video_tid = SDL_CreateThread(video_thread, is); + + enc-> get_buffer= my_get_buffer; + enc->release_buffer= my_release_buffer; break; case CODEC_TYPE_SUBTITLE: is->subtitle_stream = stream_index; @@ -1802,6 +1882,11 @@ static int decode_thread(void *arg) ap->initial_pause = 1; /* we force a pause when starting an RTSP stream */ + ap->width = frame_width; + ap->height= frame_height; + ap->time_base= (AVRational){1, 25}; + ap->pix_fmt = frame_pix_fmt; + err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap); if (err < 0) { print_error(is->filename, err); @@ -1809,7 +1894,7 @@ static int decode_thread(void *arg) goto fail; } is->ic = ic; -#ifdef CONFIG_NETWORK +#ifdef CONFIG_RTSP_DEMUXER use_play = (ic->iformat == &rtsp_demuxer); #else use_play = 0; @@ -1825,7 +1910,7 @@ static int decode_thread(void *arg) ret = -1; goto fail; } - ic->pb.eof_reached= 0; //FIXME hack, ffplay maybe shouldnt use url_feof() to test for the end + ic->pb.eof_reached= 0; //FIXME hack, ffplay maybe should not use url_feof() to test for the end } /* if seeking requested, we execute it */ @@ -1859,7 +1944,7 @@ static int decode_thread(void *arg) AVCodecContext *enc = ic->streams[i]->codec; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: - if (audio_index < 0 && !audio_disable) + if ((audio_index < 0 || wanted_audio_stream-- > 0) && !audio_disable) audio_index = i; break; case CODEC_TYPE_VIDEO: @@ -1896,7 +1981,6 @@ 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 (is->paused) @@ -1904,6 +1988,7 @@ static int decode_thread(void *arg) else av_read_play(ic); } +#ifdef CONFIG_RTSP_DEMUXER if (is->paused && ic->iformat == &rtsp_demuxer) { /* wait 10 ms to avoid trying to get another packet */ /* XXX: horrible */ @@ -1912,28 +1997,34 @@ static int decode_thread(void *arg) } #endif if (is->seek_req) { - /* XXX: must lock decoder threads */ - SDL_LockMutex(is->video_decoder_mutex); - SDL_LockMutex(is->audio_decoder_mutex); - SDL_LockMutex(is->subtitle_decoder_mutex); - ret = av_seek_frame(is->ic, -1, is->seek_pos, is->seek_flags); + int stream_index= -1; + int64_t seek_target= is->seek_pos; + + if (is-> video_stream >= 0) stream_index= is-> video_stream; + else if(is-> audio_stream >= 0) stream_index= is-> audio_stream; + else if(is->subtitle_stream >= 0) stream_index= is->subtitle_stream; + + if(stream_index>=0){ + seek_target= av_rescale_q(seek_target, AV_TIME_BASE_Q, ic->streams[stream_index]->time_base); + } + + ret = av_seek_frame(is->ic, stream_index, seek_target, 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); + packet_queue_put(&is->audioq, &flush_pkt); } if (is->subtitle_stream >= 0) { packet_queue_flush(&is->subtitleq); + packet_queue_put(&is->subtitleq, &flush_pkt); } if (is->video_stream >= 0) { packet_queue_flush(&is->videoq); - avcodec_flush_buffers(ic->streams[video_index]->codec); + packet_queue_put(&is->videoq, &flush_pkt); } } - SDL_UnlockMutex(is->subtitle_decoder_mutex); - SDL_UnlockMutex(is->audio_decoder_mutex); - SDL_UnlockMutex(is->video_decoder_mutex); is->seek_req = 0; } @@ -2004,12 +2095,8 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat) is = av_mallocz(sizeof(VideoState)); if (!is) return NULL; - pstrcpy(is->filename, sizeof(is->filename), filename); + av_strlcpy(is->filename, filename, sizeof(is->filename)); is->iformat = iformat; - if (screen) { - is->width = screen->w; - is->height = screen->h; - } is->ytop = 0; is->xleft = 0; @@ -2020,10 +2107,6 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat) is->subpq_mutex = SDL_CreateMutex(); is->subpq_cond = SDL_CreateCond(); - is->subtitle_decoder_mutex = SDL_CreateMutex(); - is->audio_decoder_mutex = SDL_CreateMutex(); - is->video_decoder_mutex = SDL_CreateMutex(); - /* add the refresh timer to draw the picture */ schedule_refresh(is, 40); @@ -2056,9 +2139,6 @@ static void stream_close(VideoState *is) SDL_DestroyCond(is->pictq_cond); SDL_DestroyMutex(is->subpq_mutex); SDL_DestroyCond(is->subpq_cond); - SDL_DestroyMutex(is->subtitle_decoder_mutex); - SDL_DestroyMutex(is->audio_decoder_mutex); - SDL_DestroyMutex(is->video_decoder_mutex); } static void stream_cycle_channel(VideoState *is, int codec_type) @@ -2113,27 +2193,12 @@ static void stream_cycle_channel(VideoState *is, int codec_type) static void toggle_full_screen(void) { - int w, h, flags; is_full_screen = !is_full_screen; if (!fs_screen_width) { /* use default SDL method */ - SDL_WM_ToggleFullScreen(screen); - } else { - /* use the recorded resolution */ - flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; - if (is_full_screen) { - 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); - cur_stream->width = w; - cur_stream->height = h; +// SDL_WM_ToggleFullScreen(screen); } + video_open(cur_stream); } static void toggle_pause(void) @@ -2266,8 +2331,8 @@ static void event_loop(void) if (cur_stream) { screen = SDL_SetVideoMode(event.resize.w, event.resize.h, 0, SDL_HWSURFACE|SDL_RESIZABLE|SDL_ASYNCBLIT|SDL_HWACCEL); - cur_stream->width = event.resize.w; - cur_stream->height = event.resize.h; + screen_width = cur_stream->width = event.resize.w; + screen_height= cur_stream->height= event.resize.h; } break; case SDL_QUIT: @@ -2275,6 +2340,7 @@ static void event_loop(void) do_exit(); break; case FF_ALLOC_EVENT: + video_open(event.user.data1); alloc_picture(event.user.data1); break; case FF_REFRESH_EVENT: @@ -2286,14 +2352,34 @@ static void event_loop(void) } } -void opt_width(const char *arg) +static void opt_frame_size(const char *arg) +{ + if (av_parse_video_frame_size(&frame_width, &frame_height, arg) < 0) { + fprintf(stderr, "Incorrect frame size\n"); + exit(1); + } + if ((frame_width % 2) != 0 || (frame_height % 2) != 0) { + fprintf(stderr, "Frame size must be a multiple of 2\n"); + exit(1); + } +} + +static void opt_width(const char *arg) { screen_width = atoi(arg); + if(screen_width<=0){ + fprintf(stderr, "invalid width\n"); + exit(1); + } } -void opt_height(const char *arg) +static void opt_height(const char *arg) { screen_height = atoi(arg); + if(screen_height<=0){ + fprintf(stderr, "invalid height\n"); + exit(1); + } } static void opt_format(const char *arg) @@ -2305,15 +2391,20 @@ static void opt_format(const char *arg) } } -#ifdef CONFIG_NETWORK -void opt_rtp_tcp(void) +static void opt_frame_pix_fmt(const char *arg) +{ + frame_pix_fmt = avcodec_get_pix_fmt(arg); +} + +#ifdef CONFIG_RTSP_DEMUXER +static void opt_rtp_tcp(void) { /* only tcp protocol */ rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP); } #endif -void opt_sync(const char *arg) +static void opt_sync(const char *arg) { if (!strcmp(arg, "audio")) av_sync_type = AV_SYNC_AUDIO_MASTER; @@ -2325,14 +2416,14 @@ void opt_sync(const char *arg) show_help(); } -void opt_seek(const char *arg) +static void opt_seek(const char *arg) { start_time = parse_date(arg, 1); } static void opt_debug(const char *arg) { - av_log_set_level(99); + av_log_level = 99; debug = atoi(arg); } @@ -2353,19 +2444,23 @@ const OptionDef options[] = { { "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" }, + { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" }, { "fs", OPT_BOOL, {(void*)&is_full_screen}, "force full screen" }, { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" }, { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" }, + { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_audio_stream}, "", "" }, { "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" }, { "bytes", OPT_BOOL, {(void*)&seek_by_bytes}, "seek by bytes" }, { "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" }, { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" }, + { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format", "format" }, { "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", "" }, { "genpts", OPT_BOOL | OPT_EXPERT, {(void*)&genpts}, "generate pts", "" }, + { "drp", OPT_BOOL |OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts", ""}, { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" }, { "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_loop_filter}, "", "" }, { "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" }, @@ -2373,7 +2468,7 @@ const OptionDef options[] = { { "idct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&idct}, "set idct algo", "algo" }, { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_resilience}, "set error detection threshold (0-4)", "threshold" }, { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, -#ifdef CONFIG_NETWORK +#ifdef CONFIG_RTSP_DEMUXER { "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" }, @@ -2383,7 +2478,7 @@ const OptionDef options[] = { void show_help(void) { - printf("ffplay version " FFMPEG_VERSION ", Copyright (c) 2003-2006 Fabrice Bellard, et al.\n" + printf("ffplay version " FFMPEG_VERSION ", Copyright (c) 2003-2007 Fabrice Bellard, et al.\n" "usage: ffplay [options] input_file\n" "Simple media player\n"); printf("\n"); @@ -2416,19 +2511,11 @@ void parse_arg_file(const char *filename) /* Called from the main */ int main(int argc, char **argv) { - int flags, w, h; + int flags; /* 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) @@ -2452,27 +2539,6 @@ int main(int argc, char **argv) fs_screen_width = vi->current_w; fs_screen_height = vi->current_h; #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; - } -#ifndef CONFIG_DARWIN - screen = SDL_SetVideoMode(w, h, 0, flags); -#else - /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */ - screen = SDL_SetVideoMode(w, h, 24, flags); -#endif - 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); @@ -2480,6 +2546,9 @@ int main(int argc, char **argv) SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); SDL_EventState(SDL_USEREVENT, SDL_IGNORE); + av_init_packet(&flush_pkt); + flush_pkt.data= "FLUSH"; + cur_stream = stream_open(input_filename, file_iformat); event_loop();