X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffplay.c;h=32ae45c0aebee5828de846df0dfcf6d047c20718;hb=56d9b943d36aa026c300726e366761d8c1ff3a47;hp=1c3aa63e897820b54d38b3555ed57a9db939d2b0;hpb=ac50bcc834a3d2cee880813424072768f84c6229;p=ffmpeg diff --git a/ffplay.c b/ffplay.c index 1c3aa63e897..32ae45c0aeb 100644 --- a/ffplay.c +++ b/ffplay.c @@ -18,11 +18,17 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define HAVE_AV_CONFIG_H -#include "avformat.h" -#include "swscale.h" -#include "version.h" +#include +#include +#include "libavutil/avstring.h" +#include "libavformat/avformat.h" +#include "libavformat/rtsp.h" +#include "libavdevice/avdevice.h" +#include "libswscale/swscale.h" +#include "libavcodec/audioconvert.h" +#include "libavcodec/opt.h" + #include "cmdutils.h" #include @@ -32,22 +38,10 @@ #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); +#undef exit - // Change flag from VIO to PM: - if (pib->pib_ultype==2) pib->pib_ultype = 3; - } -#endif +const char program_name[] = "FFplay"; +const int program_birth_year = 2003; //#define DEBUG_SYNC @@ -135,12 +129,16 @@ typedef struct VideoState { int audio_hw_buf_size; /* samples output by the codec. we reserve more space for avsync compensation */ - DECLARE_ALIGNED(16,uint8_t,audio_buf[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]); + DECLARE_ALIGNED(16,uint8_t,audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]); + DECLARE_ALIGNED(16,uint8_t,audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2]); + uint8_t *audio_buf; 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; + enum SampleFormat audio_src_fmt; + AVAudioConvert *reformat_ctx; int show_audio; /* if true, display audio samples */ int16_t sample_array[SAMPLE_ARRAY_SIZE]; @@ -176,7 +174,7 @@ typedef struct VideoState { int width, height, xleft, ytop; } VideoState; -void show_help(void); +static void show_help(void); static int audio_write_get_buf_size(VideoState *is); /* options specified by the user */ @@ -186,9 +184,13 @@ static int fs_screen_width; static int fs_screen_height; 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 wanted_video_stream= 0; static int seek_by_bytes; static int display_disable; static int show_status; @@ -206,8 +208,9 @@ static int idct = FF_IDCT_AUTO; static enum AVDiscard skip_frame= AVDISCARD_DEFAULT; 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_recognition = FF_ER_CAREFUL; static int error_concealment = 3; +static int decoder_reorder_pts= 0; /* current context */ static int is_full_screen; @@ -414,7 +417,7 @@ void fill_border(VideoState *s, int x, int y, int w, int h, int color) #define YUVA_IN(y, u, v, a, s, pal)\ {\ - unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)s];\ + unsigned int val = ((const uint32_t *)(pal))[*(const uint8_t*)(s)];\ a = (val >> 24) & 0xff;\ y = (val >> 16) & 0xff;\ u = (val >> 8) & 0xff;\ @@ -429,31 +432,36 @@ void fill_border(VideoState *s, int x, int y, int w, int h, int color) #define BPP 1 -static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect) +static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw, int imgh) { int wrap, wrap3, width2, skip2; int y, u, v, a, u1, v1, a1, w, h; uint8_t *lum, *cb, *cr; const uint8_t *p; const uint32_t *pal; - - lum = dst->data[0] + rect->y * dst->linesize[0]; - cb = dst->data[1] + (rect->y >> 1) * dst->linesize[1]; - cr = dst->data[2] + (rect->y >> 1) * dst->linesize[2]; - - width2 = (rect->w + 1) >> 1; - skip2 = rect->x >> 1; + int dstx, dsty, dstw, dsth; + + dstx = FFMIN(FFMAX(rect->x, 0), imgw); + dstw = FFMIN(FFMAX(rect->w, 0), imgw - dstx); + dsty = FFMIN(FFMAX(rect->y, 0), imgh); + dsth = FFMIN(FFMAX(rect->h, 0), imgh - dsty); + lum = dst->data[0] + dsty * dst->linesize[0]; + cb = dst->data[1] + (dsty >> 1) * dst->linesize[1]; + cr = dst->data[2] + (dsty >> 1) * dst->linesize[2]; + + width2 = (dstw + 1) >> 1; + skip2 = dstx >> 1; wrap = dst->linesize[0]; wrap3 = rect->linesize; p = rect->bitmap; pal = rect->rgba_palette; /* Now in YCrCb! */ - if (rect->y & 1) { - lum += rect->x; + if (dsty & 1) { + lum += dstx; cb += skip2; cr += skip2; - if (rect->x & 1) { + if (dstx & 1) { YUVA_IN(y, u, v, a, p, pal); lum[0] = ALPHA_BLEND(a, lum[0], y, 0); cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0); @@ -463,7 +471,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect) lum++; p += BPP; } - for(w = rect->w - (rect->x & 1); w >= 2; w -= 2) { + for(w = dstw - (dstx & 1); w >= 2; w -= 2) { YUVA_IN(y, u, v, a, p, pal); u1 = u; v1 = v; @@ -488,17 +496,17 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect) cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0); cr[0] = ALPHA_BLEND(a >> 2, cr[0], v, 0); } - p += wrap3 + (wrap3 - rect->w * BPP); - lum += wrap + (wrap - rect->w - rect->x); + p += wrap3 + (wrap3 - dstw * BPP); + lum += wrap + (wrap - dstw - dstx); cb += dst->linesize[1] - width2 - skip2; cr += dst->linesize[2] - width2 - skip2; } - for(h = rect->h - (rect->y & 1); h >= 2; h -= 2) { - lum += rect->x; + for(h = dsth - (dsty & 1); h >= 2; h -= 2) { + lum += dstx; cb += skip2; cr += skip2; - if (rect->x & 1) { + if (dstx & 1) { YUVA_IN(y, u, v, a, p, pal); u1 = u; v1 = v; @@ -518,7 +526,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect) p += -wrap3 + BPP; lum += -wrap + 1; } - for(w = rect->w - (rect->x & 1); w >= 2; w -= 2) { + for(w = dstw - (dstx & 1); w >= 2; w -= 2) { YUVA_IN(y, u, v, a, p, pal); u1 = u; v1 = v; @@ -573,18 +581,18 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect) p += -wrap3 + BPP; lum += -wrap + 1; } - p += wrap3 + (wrap3 - rect->w * BPP); - lum += wrap + (wrap - rect->w - rect->x); + p += wrap3 + (wrap3 - dstw * BPP); + lum += wrap + (wrap - dstw - dstx); cb += dst->linesize[1] - width2 - skip2; cr += dst->linesize[2] - width2 - skip2; } /* handle odd height */ if (h) { - lum += rect->x; + lum += dstx; cb += skip2; cr += skip2; - if (rect->x & 1) { + if (dstx & 1) { YUVA_IN(y, u, v, a, p, pal); lum[0] = ALPHA_BLEND(a, lum[0], y, 0); cb[0] = ALPHA_BLEND(a >> 2, cb[0], u, 0); @@ -594,7 +602,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect) lum++; p += BPP; } - for(w = rect->w - (rect->x & 1); w >= 2; w -= 2) { + for(w = dstw - (dstx & 1); w >= 2; w -= 2) { YUVA_IN(y, u, v, a, p, pal); u1 = u; v1 = v; @@ -650,14 +658,15 @@ static void video_image_display(VideoState *is) vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { /* XXX: use variable in the frame */ - if (is->video_st->codec->sample_aspect_ratio.num == 0) - aspect_ratio = 0; + if (is->video_st->sample_aspect_ratio.num) + aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio); + else if (is->video_st->codec->sample_aspect_ratio.num) + aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio); else - aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio) - * is->video_st->codec->width / is->video_st->codec->height;; + aspect_ratio = 0; if (aspect_ratio <= 0.0) - aspect_ratio = (float)is->video_st->codec->width / - (float)is->video_st->codec->height; + aspect_ratio = 1.0; + aspect_ratio *= (float)is->video_st->codec->width / is->video_st->codec->height; /* if an active format is indicated, then it overrides the mpeg format */ #if 0 @@ -712,7 +721,8 @@ static void video_image_display(VideoState *is) pict.linesize[2] = vp->bmp->pitches[1]; for (i = 0; i < sp->sub.num_rects; i++) - blend_subrect(&pict, &sp->sub.rects[i]); + blend_subrect(&pict, &sp->sub.rects[i], + vp->bmp->w, vp->bmp->h); SDL_UnlockYUVOverlay (vp->bmp); } @@ -722,10 +732,10 @@ static void video_image_display(VideoState *is) /* XXX: we suppose the screen has a 1.0 pixel ratio */ height = is->height; - width = ((int)rint(height * aspect_ratio)) & -3; + width = ((int)rint(height * aspect_ratio)) & ~1; if (width > is->width) { width = is->width; - height = ((int)rint(width / aspect_ratio)) & -3; + height = ((int)rint(width / aspect_ratio)) & ~1; } x = (is->width - width) / 2; y = (is->height - height) / 2; @@ -736,7 +746,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); @@ -866,7 +876,7 @@ static int video_open(VideoState *is){ w = 640; h = 480; } -#ifndef CONFIG_DARWIN +#ifndef __APPLE__ screen = SDL_SetVideoMode(w, h, 0, flags); #else /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */ @@ -907,6 +917,7 @@ static Uint32 sdl_refresh_timer_cb(Uint32 interval, void *opaque) /* schedule a video refresh in 'delay' ms */ static void schedule_refresh(VideoState *is, int delay) { + if(!delay) delay=1; //SDL seems to be buggy when the delay is 0 SDL_AddTimer(delay, sdl_refresh_timer_cb, is); } @@ -984,8 +995,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; } } @@ -1012,7 +1024,7 @@ static void video_refresh_timer(void *opaque) /* compute nominal delay */ delay = vp->pts - is->frame_last_pts; - if (delay <= 0 || delay >= 1.0) { + if (delay <= 0 || delay >= 2.0) { /* if incorrect delay, use previous one */ delay = is->frame_last_delay; } @@ -1030,9 +1042,7 @@ static void video_refresh_timer(void *opaque) /* 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; + sync_threshold = FFMAX(AV_SYNC_THRESHOLD, delay); if (fabs(diff) < AV_NOSYNC_THRESHOLD) { if (diff <= -sync_threshold) delay = 0; @@ -1173,7 +1183,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; @@ -1258,15 +1268,15 @@ 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]; + sws_flags = av_get_int(sws_opts, "sws_flags", NULL); + img_convert_ctx = sws_getCachedContext(img_convert_ctx, + is->video_st->codec->width, is->video_st->codec->height, + is->video_st->codec->pix_fmt, + is->video_st->codec->width, is->video_st->codec->height, + dst_pix_fmt, sws_flags, NULL, NULL, NULL); if (img_convert_ctx == NULL) { - img_convert_ctx = sws_getContext(is->video_st->codec->width, - is->video_st->codec->height, is->video_st->codec->pix_fmt, - is->video_st->codec->width, is->video_st->codec->height, - dst_pix_fmt, sws_flags, NULL, NULL, NULL); - if (img_convert_ctx == NULL) { - fprintf(stderr, "Cannot initialize the conversion context\n"); - exit(1); - } + fprintf(stderr, "Cannot initialize the conversion context\n"); + exit(1); } sws_scale(img_convert_ctx, src_frame->data, src_frame->linesize, 0, is->video_st->codec->height, pict.data, pict.linesize); @@ -1346,19 +1356,26 @@ static int video_thread(void *arg) /* 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; + is->video_st->codec->reordered_opaque= 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->reordered_opaque != AV_NOPTS_VALUE) + pts= frame->reordered_opaque; + else if(pkt->dts != AV_NOPTS_VALUE) + pts= pkt->dts; + else + pts= 0; + pts *= av_q2d(is->video_st->time_base); - len1 = avcodec_decode_video(is->video_st->codec, - frame, &got_picture, - pkt->data, pkt->size); // 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) @@ -1543,17 +1560,19 @@ 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, double *pts_ptr) { AVPacket *pkt = &is->audio_pkt; + AVCodecContext *dec= is->audio_st->codec; int n, len1, data_size; double pts; for(;;) { /* NOTE: the audio packet can contain several frames */ while (is->audio_pkt_size > 0) { - len1 = avcodec_decode_audio(is->audio_st->codec, - (int16_t *)audio_buf, &data_size, + data_size = sizeof(is->audio_buf1); + len1 = avcodec_decode_audio2(dec, + (int16_t *)is->audio_buf1, &data_size, is->audio_pkt_data, is->audio_pkt_size); if (len1 < 0) { /* if error, we skip the frame */ @@ -1565,12 +1584,45 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt is->audio_pkt_size -= len1; if (data_size <= 0) continue; + + if (dec->sample_fmt != is->audio_src_fmt) { + if (is->reformat_ctx) + av_audio_convert_free(is->reformat_ctx); + is->reformat_ctx= av_audio_convert_alloc(SAMPLE_FMT_S16, 1, + dec->sample_fmt, 1, NULL, 0); + if (!is->reformat_ctx) { + fprintf(stderr, "Cannot convert %s sample format to %s sample format\n", + avcodec_get_sample_fmt_name(dec->sample_fmt), + avcodec_get_sample_fmt_name(SAMPLE_FMT_S16)); + break; + } + is->audio_src_fmt= dec->sample_fmt; + } + + if (is->reformat_ctx) { + const void *ibuf[6]= {is->audio_buf1}; + void *obuf[6]= {is->audio_buf2}; + int istride[6]= {av_get_bits_per_sample_format(dec->sample_fmt)/8}; + int ostride[6]= {2}; + int len= data_size/istride[0]; + if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) { + printf("av_audio_convert() failed\n"); + break; + } + is->audio_buf= is->audio_buf2; + /* FIXME: existing code assume that data_size equals framesize*channels*2 + remove this legacy cruft */ + data_size= len*2; + }else{ + is->audio_buf= is->audio_buf1; + } + /* if no pts, then compute it */ pts = is->audio_clock; *pts_ptr = pts; - n = 2 * is->audio_st->codec->channels; + n = 2 * dec->channels; is->audio_clock += (double)data_size / - (double)(n * is->audio_st->codec->sample_rate); + (double)(n * dec->sample_rate); #if defined(DEBUG_SYNC) { static double last_clock; @@ -1595,7 +1647,7 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt if (packet_queue_get(&is->audioq, pkt, 1) < 0) return -1; if(pkt->data == flush_pkt.data){ - avcodec_flush_buffers(is->audio_st->codec); + avcodec_flush_buffers(dec); continue; } @@ -1613,12 +1665,12 @@ 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; } /* prepare a new audio buffer */ -void sdl_audio_callback(void *opaque, Uint8 *stream, int len) +static void sdl_audio_callback(void *opaque, Uint8 *stream, int len) { VideoState *is = opaque; int audio_size, len1; @@ -1628,7 +1680,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, &pts); if (audio_size < 0) { /* if error, just output silence */ is->audio_buf_size = 1024; @@ -1666,21 +1718,11 @@ static int stream_component_open(VideoState *is, int stream_index) /* 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 = SDL_AUDIO_BUFFER_SIZE; - wanted_spec.callback = sdl_audio_callback; - wanted_spec.userdata = is; - if (SDL_OpenAudio(&wanted_spec, &spec) < 0) { - fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError()); - return -1; + if (enc->channels > 0) { + enc->request_channels = FFMIN(2, enc->channels); + } else { + enc->request_channels = 2; } - is->audio_hw_buf_size = spec.size; } codec = avcodec_find_decoder(enc->codec_id); @@ -1694,16 +1736,36 @@ static int stream_component_open(VideoState *is, int stream_index) enc->skip_frame= skip_frame; enc->skip_idct= skip_idct; enc->skip_loop_filter= skip_loop_filter; - enc->error_resilience= error_resilience; + enc->error_recognition= error_recognition; enc->error_concealment= error_concealment; + + set_context_opts(enc, avctx_opts[enc->codec_type], 0); + if (!codec || avcodec_open(enc, codec) < 0) return -1; -#if defined(HAVE_THREADS) + + /* prepare audio output */ + if (enc->codec_type == CODEC_TYPE_AUDIO) { + wanted_spec.freq = enc->sample_rate; + wanted_spec.format = AUDIO_S16SYS; + wanted_spec.channels = enc->channels; + wanted_spec.silence = 0; + wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE; + wanted_spec.callback = sdl_audio_callback; + wanted_spec.userdata = is; + if (SDL_OpenAudio(&wanted_spec, &spec) < 0) { + fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError()); + return -1; + } + is->audio_hw_buf_size = spec.size; + is->audio_src_fmt= SAMPLE_FMT_S16; + } + if(thread_count>1) avcodec_thread_init(enc, thread_count); -#endif enc->thread_count= thread_count; + ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: is->audio_stream = stream_index; @@ -1762,6 +1824,8 @@ static void stream_component_close(VideoState *is, int stream_index) SDL_CloseAudio(); packet_queue_end(&is->audioq); + if (is->reformat_ctx) + av_audio_convert_free(is->reformat_ctx); break; case CODEC_TYPE_VIDEO: packet_queue_abort(&is->videoq); @@ -1795,6 +1859,7 @@ static void stream_component_close(VideoState *is, int stream_index) break; } + ic->streams[stream_index]->discard = AVDISCARD_ALL; avcodec_close(enc); switch(enc->codec_type) { case CODEC_TYPE_AUDIO: @@ -1848,7 +1913,7 @@ static int decode_thread(void *arg) { VideoState *is = arg; AVFormatContext *ic; - int err, i, ret, video_index, audio_index, use_play; + int err, i, ret, video_index, audio_index; AVPacket pkt1, *pkt = &pkt1; AVFormatParameters params, *ap = ¶ms; @@ -1862,8 +1927,11 @@ static int decode_thread(void *arg) url_set_interrupt_cb(decode_interrupt_cb); memset(ap, 0, sizeof(*ap)); - 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) { @@ -1872,24 +1940,18 @@ static int decode_thread(void *arg) goto fail; } is->ic = ic; -#ifdef CONFIG_NETWORK - use_play = (ic->iformat == &rtsp_demuxer); -#else - use_play = 0; -#endif if(genpts) ic->flags |= AVFMT_FLAG_GENPTS; - 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 + err = av_find_stream_info(ic); + if (err < 0) { + fprintf(stderr, "%s: could not find codec parameters\n", is->filename); + ret = -1; + goto fail; } + if(ic->pb) + 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 */ if (start_time != AV_NOPTS_VALUE) { @@ -1906,27 +1968,16 @@ static int decode_thread(void *arg) } } - /* 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; + ic->streams[i]->discard = AVDISCARD_ALL; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: if ((audio_index < 0 || wanted_audio_stream-- > 0) && !audio_disable) audio_index = i; break; case CODEC_TYPE_VIDEO: - if (video_index < 0 && !video_disable) + if ((video_index < 0 || wanted_video_stream-- > 0) && !video_disable) video_index = i; break; default: @@ -1959,7 +2010,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) @@ -1967,7 +2017,10 @@ static int decode_thread(void *arg) else av_read_play(ic); } - if (is->paused && ic->iformat == &rtsp_demuxer) { +#if defined(CONFIG_RTSP_DEMUXER) || defined(CONFIG_MMSH_PROTOCOL) + if (is->paused && + (!strcmp(ic->iformat->name, "rtsp") || + (ic->pb && !strcmp(url_fileno(ic->pb)->prot->name, "mmsh")))) { /* wait 10 ms to avoid trying to get another packet */ /* XXX: horrible */ SDL_Delay(10); @@ -2010,14 +2063,14 @@ static int decode_thread(void *arg) if (is->audioq.size > MAX_AUDIOQ_SIZE || is->videoq.size > MAX_VIDEOQ_SIZE || is->subtitleq.size > MAX_SUBTITLEQ_SIZE || - url_feof(&ic->pb)) { + url_feof(ic->pb)) { /* wait 10 ms */ SDL_Delay(10); continue; } ret = av_read_frame(ic, pkt); if (ret < 0) { - if (url_ferror(&ic->pb) == 0) { + if (url_ferror(ic->pb) == 0) { SDL_Delay(100); /* wait for user event */ continue; } else @@ -2073,7 +2126,7 @@ 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; is->ytop = 0; is->xleft = 0; @@ -2189,9 +2242,9 @@ static void toggle_pause(void) static void step_to_next_frame(void) { if (cur_stream) { + /* if the stream is paused unpause it, then step */ if (cur_stream->paused) - cur_stream->paused=0; - cur_stream->video_current_pts = get_video_clock(cur_stream); + stream_pause(cur_stream); } step = 1; } @@ -2269,7 +2322,7 @@ static void event_loop(void) do_seek: if (cur_stream) { if (seek_by_bytes) { - pos = url_ftell(&cur_stream->ic->pb); + pos = url_ftell(cur_stream->ic->pb); if (cur_stream->ic->bit_rate) incr *= cur_stream->ic->bit_rate / 60.0; else @@ -2330,22 +2383,28 @@ static void event_loop(void) } } -void opt_width(const char *arg) +static void opt_frame_size(const char *arg) { - screen_width = atoi(arg); - if(screen_width<=0){ - fprintf(stderr, "invalid width\n"); + 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); } } -void opt_height(const char *arg) +static int opt_width(const char *opt, const char *arg) { - screen_height = atoi(arg); - if(screen_height<=0){ - fprintf(stderr, "invalid height\n"); - exit(1); - } + screen_width = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX); + return 0; +} + +static int opt_height(const char *opt, const char *arg) +{ + screen_height = parse_number_or_die(opt, arg, OPT_INT64, 1, INT_MAX); + return 0; } static void opt_format(const char *arg) @@ -2357,15 +2416,12 @@ static void opt_format(const char *arg) } } -#ifdef CONFIG_NETWORK -void opt_rtp_tcp(void) +static void opt_frame_pix_fmt(const char *arg) { - /* only tcp protocol */ - rtsp_default_protocols = (1 << RTSP_PROTOCOL_RTP_TCP); + frame_pix_fmt = avcodec_get_pix_fmt(arg); } -#endif -void opt_sync(const char *arg) +static int opt_sync(const char *opt, const char *arg) { if (!strcmp(arg, "audio")) av_sync_type = AV_SYNC_AUDIO_MASTER; @@ -2373,71 +2429,82 @@ void opt_sync(const char *arg) av_sync_type = AV_SYNC_VIDEO_MASTER; else if (!strcmp(arg, "ext")) av_sync_type = AV_SYNC_EXTERNAL_CLOCK; - else - show_help(); + else { + fprintf(stderr, "Unknown value for %s: %s\n", opt, arg); + exit(1); + } + return 0; } -void opt_seek(const char *arg) +static int opt_seek(const char *opt, const char *arg) { - start_time = parse_date(arg, 1); + start_time = parse_time_or_die(opt, arg, 1); + return 0; } -static void opt_debug(const char *arg) +static int opt_debug(const char *opt, const char *arg) { av_log_set_level(99); - debug = atoi(arg); + debug = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); + return 0; } -static void opt_vismv(const char *arg) +static int opt_vismv(const char *opt, const char *arg) { - debug_mv = atoi(arg); + debug_mv = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX); + return 0; } -static void opt_thread_count(const char *arg) +static int opt_thread_count(const char *opt, const char *arg) { - thread_count= atoi(arg); + thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); #if !defined(HAVE_THREADS) fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); #endif + return 0; } -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" }, +static const OptionDef options[] = { + { "h", OPT_EXIT, {(void*)show_help}, "show help" }, + { "version", OPT_EXIT, {(void*)show_version}, "show version" }, + { "L", OPT_EXIT, {(void*)show_license}, "show license" }, + { "formats", OPT_EXIT, {(void*)show_formats}, "show available formats, codecs, protocols, ..." }, + { "x", HAS_ARG | OPT_FUNC2, {(void*)opt_width}, "force displayed width", "width" }, + { "y", HAS_ARG | OPT_FUNC2, {(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" }, + { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_video_stream}, "", "" }, + { "ss", HAS_ARG | OPT_FUNC2, {(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", "" }, + { "debug", HAS_ARG | OPT_FUNC2 | 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", "" }, + { "vismv", HAS_ARG | OPT_FUNC2 | 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}, "", "" }, { "skipidct", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_idct}, "", "" }, { "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" }, + { "er", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_recognition}, "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 - { "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" }, + { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, + { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, + { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -void show_help(void) +static void show_help(void) { - printf("ffplay version " FFMPEG_VERSION ", Copyright (c) 2003-2006 Fabrice Bellard, et al.\n" - "usage: ffplay [options] input_file\n" + printf("usage: ffplay [options] input_file\n" "Simple media player\n"); printf("\n"); show_help_options(options, "Main options:\n", @@ -2456,43 +2523,46 @@ void show_help(void) "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) +static void opt_input_file(const char *filename) { if (!strcmp(filename, "-")) - filename = "pipe:"; + filename = "pipe:"; input_filename = filename; } /* Called from the main */ int main(int argc, char **argv) { - int flags; + int flags, i; /* register all codecs, demux and protocols */ + avcodec_register_all(); + avdevice_register_all(); av_register_all(); - #ifdef CONFIG_OS2 - MorphToPM(); // Morph the VIO application to a PM one to be able to use Win* functions + for(i=0; i