X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffplay.c;h=df15f4890ebfdef9eaaafddc1898fce3b191853f;hb=feb2440c38c7bde97b04e3ad32575e50cb85c826;hp=129cd28871030550da3febc9c5c820341a097c87;hpb=867ab7fb0a7010559dca4e122130b5198bad06e0;p=ffmpeg diff --git a/ffplay.c b/ffplay.c index 129cd288710..df15f4890eb 100644 --- a/ffplay.c +++ b/ffplay.c @@ -19,17 +19,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _XOPEN_SOURCE 600 + #include "config.h" #include #include #include #include "libavutil/avstring.h" +#include "libavutil/colorspace.h" #include "libavutil/pixdesc.h" +#include "libavcore/imgutils.h" +#include "libavcore/parseutils.h" #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" #include "libavcodec/audioconvert.h" -#include "libavcodec/colorspace.h" #include "libavcodec/opt.h" #include "libavcodec/avfft.h" @@ -104,7 +108,7 @@ typedef struct VideoPicture { enum PixelFormat pix_fmt; #if CONFIG_AVFILTER - AVFilterPicRef *picref; + AVFilterBufferRef *picref; #endif } VideoPicture; @@ -168,6 +172,7 @@ typedef struct VideoState { int last_i_start; RDFTContext *rdft; int rdft_bits; + FFTSample *rdft_data; int xpos; SDL_Thread *subtitle_tid; @@ -202,10 +207,7 @@ typedef struct VideoState { char filename[1024]; int width, height, xleft, ytop; - int64_t faulty_pts; - int64_t faulty_dts; - int64_t last_dts_for_fault_detection; - int64_t last_pts_for_fault_detection; + PtsCorrectionContext pts_ctx; #if CONFIG_AVFILTER AVFilterContext *out_video_filter; ///sub.num_rects; i++) - { - av_freep(&sp->sub.rects[i]->pict.data[0]); - av_freep(&sp->sub.rects[i]->pict.data[1]); - av_freep(&sp->sub.rects[i]); - } - - av_free(sp->sub.rects); - - memset(&sp->sub, 0, sizeof(AVSubtitle)); + avsubtitle_free(&sp->sub); } static void video_image_display(VideoState *is) @@ -701,10 +694,10 @@ static void video_image_display(VideoState *is) vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { #if CONFIG_AVFILTER - if (vp->picref->pixel_aspect.num == 0) + if (vp->picref->video->pixel_aspect.num == 0) aspect_ratio = 0; else - aspect_ratio = av_q2d(vp->picref->pixel_aspect); + aspect_ratio = av_q2d(vp->picref->video->pixel_aspect); #else /* XXX: use variable in the frame */ @@ -917,12 +910,15 @@ static void video_audio_display(VideoState *s) nb_display_channels= FFMIN(nb_display_channels, 2); if(rdft_bits != s->rdft_bits){ av_rdft_end(s->rdft); + av_free(s->rdft_data); s->rdft = av_rdft_init(rdft_bits, DFT_R2C); s->rdft_bits= rdft_bits; + s->rdft_data= av_malloc(4*nb_freq*sizeof(*s->rdft_data)); } { - FFTSample data[2][2*nb_freq]; + FFTSample *data[2]; for(ch = 0;ch < nb_display_channels; ch++) { + data[ch] = s->rdft_data + 2*nb_freq*ch; i = i_start + ch; for(x = 0; x < 2*nb_freq; x++) { double w= (x-nb_freq)*(1.0/nb_freq); @@ -937,7 +933,8 @@ static void video_audio_display(VideoState *s) for(y=0; yheight; y++){ double w= 1/sqrt(nb_freq); int a= sqrt(w*sqrt(data[0][2*y+0]*data[0][2*y+0] + data[0][2*y+1]*data[0][2*y+1])); - int b= sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0] + data[1][2*y+1]*data[1][2*y+1])); + int b= (nb_display_channels == 2 ) ? sqrt(w*sqrt(data[1][2*y+0]*data[1][2*y+0] + + data[1][2*y+1]*data[1][2*y+1])) : a; a= FFMIN(a,255); b= FFMIN(b,255); fgcolor = SDL_MapRGB(screen->format, a, b, (a+b)/2); @@ -1286,13 +1283,64 @@ retry: if (is->audio_st && is->video_st) av_diff = get_audio_clock(is) - get_video_clock(is); printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64" \r", - get_master_clock(is), av_diff, FFMAX(is->skip_frames-1, 0), aqsize / 1024, vqsize / 1024, sqsize, is->faulty_dts, is->faulty_pts); + get_master_clock(is), av_diff, FFMAX(is->skip_frames-1, 0), aqsize / 1024, vqsize / 1024, sqsize, is->pts_ctx.num_faulty_dts, is->pts_ctx.num_faulty_pts); fflush(stdout); last_time = cur_time; } } } +static void stream_close(VideoState *is) +{ + VideoPicture *vp; + int i; + /* XXX: use a special url_shutdown call to abort parse cleanly */ + is->abort_request = 1; + SDL_WaitThread(is->parse_tid, NULL); + SDL_WaitThread(is->refresh_tid, NULL); + + /* free all pictures */ + for(i=0;ipictq[i]; +#if CONFIG_AVFILTER + if (vp->picref) { + avfilter_unref_buffer(vp->picref); + vp->picref = NULL; + } +#endif + if (vp->bmp) { + SDL_FreeYUVOverlay(vp->bmp); + vp->bmp = NULL; + } + } + SDL_DestroyMutex(is->pictq_mutex); + SDL_DestroyCond(is->pictq_cond); + SDL_DestroyMutex(is->subpq_mutex); + SDL_DestroyCond(is->subpq_cond); +#if !CONFIG_AVFILTER + if (is->img_convert_ctx) + sws_freeContext(is->img_convert_ctx); +#endif + av_free(is); +} + +static void do_exit(void) +{ + if (cur_stream) { + stream_close(cur_stream); + cur_stream = NULL; + } + uninit_opts(); +#if CONFIG_AVFILTER + avfilter_uninit(); +#endif + if (show_status) + printf("\n"); + SDL_Quit(); + av_log(NULL, AV_LOG_QUIET, ""); + exit(0); +} + /* allocate a picture (needs to do that in main thread to avoid potential locking problems */ static void alloc_picture(void *opaque) @@ -1307,7 +1355,7 @@ static void alloc_picture(void *opaque) #if CONFIG_AVFILTER if (vp->picref) - avfilter_unref_pic(vp->picref); + avfilter_unref_buffer(vp->picref); vp->picref = NULL; vp->width = is->out_video_filter->inputs[0]->w; @@ -1322,6 +1370,14 @@ static void alloc_picture(void *opaque) vp->bmp = SDL_CreateYUVOverlay(vp->width, vp->height, SDL_YV12_OVERLAY, screen); + if (!vp->bmp || vp->bmp->pitches[0] < vp->width) { + /* SDL allocates a buffer smaller than requested if the video + * overlay hardware is unable to support the requested size. */ + fprintf(stderr, "Error: the video system does not support an image\n" + "size of %dx%d pixels. Try using -lowres or -vf \"scale=w:h\"\n" + "to reduce the image size.\n", vp->width, vp->height ); + do_exit(); + } SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; @@ -1392,7 +1448,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t AVPicture pict; #if CONFIG_AVFILTER if(vp->picref) - avfilter_unref_pic(vp->picref); + avfilter_unref_buffer(vp->picref); vp->picref = src_frame->opaque; #endif @@ -1502,8 +1558,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke is->video_current_pos= -1; SDL_UnlockMutex(is->pictq_mutex); - is->last_dts_for_fault_detection= - is->last_pts_for_fault_detection= INT64_MIN; + init_pts_correction(&is->pts_ctx); is->frame_last_pts= AV_NOPTS_VALUE; is->frame_last_delay = 0; is->frame_timer = (double)av_gettime() / 1000000.0; @@ -1520,26 +1575,19 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke pkt); if (got_picture) { - if(pkt->dts != AV_NOPTS_VALUE){ - is->faulty_dts += pkt->dts <= is->last_dts_for_fault_detection; - is->last_dts_for_fault_detection= pkt->dts; + if (decoder_reorder_pts == -1) { + *pts = guess_correct_pts(&is->pts_ctx, frame->reordered_opaque, pkt->dts); + } else if (decoder_reorder_pts) { + *pts = frame->reordered_opaque; + } else { + *pts = pkt->dts; } - if(frame->reordered_opaque != AV_NOPTS_VALUE){ - is->faulty_pts += frame->reordered_opaque <= is->last_pts_for_fault_detection; - is->last_pts_for_fault_detection= frame->reordered_opaque; + + if (*pts == AV_NOPTS_VALUE) { + *pts = 0; } } - if( ( decoder_reorder_pts==1 - || (decoder_reorder_pts && is->faulty_ptsfaulty_dts) - || 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; - // if (len1 < 0) // break; if (got_picture){ @@ -1563,7 +1611,7 @@ typedef struct { static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) { AVFilterContext *ctx = codec->opaque; - AVFilterPicRef *ref; + AVFilterBufferRef *ref; int perms = AV_PERM_WRITE; int i, w, h, stride[4]; unsigned edge; @@ -1585,11 +1633,11 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h))) return -1; - ref->w = codec->width; - ref->h = codec->height; - for(i = 0; i < 3; i ++) { - unsigned hshift = i == 0 ? 0 : av_pix_fmt_descriptors[ref->pic->format].log2_chroma_w; - unsigned vshift = i == 0 ? 0 : av_pix_fmt_descriptors[ref->pic->format].log2_chroma_h; + ref->video->w = codec->width; + ref->video->h = codec->height; + for(i = 0; i < 4; i ++) { + unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0; + unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0; if (ref->data[i]) { ref->data[i] += (edge >> hshift) + ((edge * ref->linesize[i]) >> vshift); @@ -1607,20 +1655,20 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) static void input_release_buffer(AVCodecContext *codec, AVFrame *pic) { memset(pic->data, 0, sizeof(pic->data)); - avfilter_unref_pic(pic->opaque); + avfilter_unref_buffer(pic->opaque); } static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic) { - AVFilterPicRef *ref = pic->opaque; + AVFilterBufferRef *ref = pic->opaque; if (pic->data[0] == NULL) { pic->buffer_hints |= FF_BUFFER_HINTS_READABLE; return codec->get_buffer(codec, pic); } - if ((codec->width != ref->w) || (codec->height != ref->h) || - (codec->pix_fmt != ref->pic->format)) { + if ((codec->width != ref->video->w) || (codec->height != ref->video->h) || + (codec->pix_fmt != ref->format)) { av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n"); return -1; } @@ -1659,7 +1707,7 @@ static void input_uninit(AVFilterContext *ctx) static int input_request_frame(AVFilterLink *link) { FilterPriv *priv = link->src->priv; - AVFilterPicRef *picref; + AVFilterBufferRef *picref; int64_t pts = 0; AVPacket pkt; int ret; @@ -1670,17 +1718,18 @@ static int input_request_frame(AVFilterLink *link) return -1; if(priv->use_dr1) { - picref = avfilter_ref_pic(priv->frame->opaque, ~0); + picref = avfilter_ref_buffer(priv->frame->opaque, ~0); } else { picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); - av_picture_copy((AVPicture *)&picref->data, (AVPicture *)priv->frame, - picref->pic->format, link->w, link->h); + av_image_copy(picref->data, picref->linesize, + priv->frame->data, priv->frame->linesize, + picref->format, link->w, link->h); } av_free_packet(&pkt); picref->pts = pts; picref->pos = pkt.pos; - picref->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio; + picref->video->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio; avfilter_start_frame(link, picref); avfilter_draw_slice(link, 0, link->h, 1); avfilter_end_frame(link); @@ -1744,13 +1793,13 @@ static int output_query_formats(AVFilterContext *ctx) static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, int64_t *pts, int64_t *pos) { - AVFilterPicRef *pic; + AVFilterBufferRef *pic; if(avfilter_request_frame(ctx->inputs[0])) return -1; - if(!(pic = ctx->inputs[0]->cur_pic)) + if(!(pic = ctx->inputs[0]->cur_buf)) return -1; - ctx->inputs[0]->cur_pic = NULL; + ctx->inputs[0]->cur_buf = NULL; frame->opaque = pic; *pts = pic->pts; @@ -1793,8 +1842,8 @@ static int video_thread(void *arg) snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); graph->scale_sws_opts = av_strdup(sws_flags_str); - if(!(filt_src = avfilter_open(&input_filter, "src"))) goto the_end; - if(!(filt_out = avfilter_open(&output_filter, "out"))) goto the_end; + if (avfilter_open(&filt_src, &input_filter, "src") < 0) goto the_end; + if (avfilter_open(&filt_out, &output_filter, "out") < 0) goto the_end; if(avfilter_init_filter(filt_src, NULL, is)) goto the_end; if(avfilter_init_filter(filt_out, NULL, frame)) goto the_end; @@ -2227,7 +2276,7 @@ static int stream_component_open(VideoState *is, int stream_index) avctx->error_concealment= error_concealment; avcodec_thread_init(avctx, thread_count); - set_context_opts(avctx, avcodec_opts[avctx->codec_type], 0); + set_context_opts(avctx, avcodec_opts[avctx->codec_type], 0, codec); if (!codec || avcodec_open(avctx, codec) < 0) @@ -2405,7 +2454,7 @@ static int decode_thread(void *arg) ap->time_base= (AVRational){1, 25}; ap->pix_fmt = frame_pix_fmt; - set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM); + set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM, NULL); err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap); if (err < 0) { @@ -2661,40 +2710,6 @@ static VideoState *stream_open(const char *filename, AVInputFormat *iformat) return is; } -static void stream_close(VideoState *is) -{ - VideoPicture *vp; - int i; - /* XXX: use a special url_shutdown call to abort parse cleanly */ - is->abort_request = 1; - SDL_WaitThread(is->parse_tid, NULL); - SDL_WaitThread(is->refresh_tid, NULL); - - /* free all pictures */ - for(i=0;ipictq[i]; -#if CONFIG_AVFILTER - if (vp->picref) { - avfilter_unref_pic(vp->picref); - vp->picref = NULL; - } -#endif - if (vp->bmp) { - SDL_FreeYUVOverlay(vp->bmp); - vp->bmp = NULL; - } - } - SDL_DestroyMutex(is->pictq_mutex); - SDL_DestroyCond(is->pictq_cond); - SDL_DestroyMutex(is->subpq_mutex); - SDL_DestroyCond(is->subpq_cond); -#if !CONFIG_AVFILTER - if (is->img_convert_ctx) - sws_freeContext(is->img_convert_ctx); -#endif - av_free(is); -} - static void stream_cycle_channel(VideoState *is, int codec_type) { AVFormatContext *ic = is->ic; @@ -2772,26 +2787,6 @@ static void step_to_next_frame(void) step = 1; } -static void do_exit(void) -{ - int i; - if (cur_stream) { - stream_close(cur_stream); - cur_stream = NULL; - } - for (i = 0; i < AVMEDIA_TYPE_NB; i++) - av_free(avcodec_opts[i]); - av_free(avformat_opts); - av_free(sws_opts); -#if CONFIG_AVFILTER - avfilter_uninit(); -#endif - if (show_status) - printf("\n"); - SDL_Quit(); - exit(0); -} - static void toggle_audio_display(void) { if (cur_stream) { @@ -2815,6 +2810,10 @@ static void event_loop(void) SDL_WaitEvent(&event); switch(event.type) { case SDL_KEYDOWN: + if (exit_on_keydown) { + do_exit(); + break; + } switch(event.key.keysym.sym) { case SDLK_ESCAPE: case SDLK_q: @@ -2883,6 +2882,10 @@ static void event_loop(void) } break; case SDL_MOUSEBUTTONDOWN: + if (exit_on_mousedown) { + do_exit(); + break; + } case SDL_MOUSEMOTION: if(event.type ==SDL_MOUSEBUTTONDOWN){ x= event.button.x; @@ -2945,7 +2948,7 @@ static void event_loop(void) static void opt_frame_size(const char *arg) { - if (av_parse_video_frame_size(&frame_width, &frame_height, arg) < 0) { + if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) { fprintf(stderr, "Incorrect frame size\n"); exit(1); } @@ -3064,6 +3067,8 @@ static const OptionDef options[] = { { "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" }, { "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" }, + { "exitonkeydown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_keydown}, "exit on key down", "" }, + { "exitonmousedown", OPT_BOOL | OPT_EXPERT, {(void*)&exit_on_mousedown}, "exit on mouse down", "" }, { "loop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&loop}, "set number of times the playback shall be looped", "loop count" }, { "framedrop", OPT_BOOL | OPT_EXPERT, {(void*)&framedrop}, "drop frames when cpu is too slow", "" }, { "window_title", OPT_STRING | HAS_ARG, {(void*)&window_title}, "set window title", "window title" }, @@ -3084,11 +3089,23 @@ static void show_usage(void) static void show_help(void) { + av_log_set_callback(log_callback_help); show_usage(); show_help_options(options, "Main options:\n", OPT_EXPERT, 0); show_help_options(options, "\nAdvanced options:\n", OPT_EXPERT, OPT_EXPERT); + printf("\n"); + av_opt_show2(avcodec_opts[0], NULL, + AV_OPT_FLAG_DECODING_PARAM, 0); + printf("\n"); + av_opt_show2(avformat_opts, NULL, + AV_OPT_FLAG_DECODING_PARAM, 0); +#if !CONFIG_AVFILTER + printf("\n"); + av_opt_show2(sws_opts, NULL, + AV_OPT_FLAG_ENCODING_PARAM, 0); +#endif printf("\nWhile playing:\n" "q, ESC quit\n" "f toggle full screen\n" @@ -3119,7 +3136,9 @@ static void opt_input_file(const char *filename) /* Called from the main */ int main(int argc, char **argv) { - int flags, i; + int flags; + + av_log_set_flags(AV_LOG_SKIP_REPEATED); /* register all codecs, demux and protocols */ avcodec_register_all(); @@ -3131,13 +3150,7 @@ int main(int argc, char **argv) #endif av_register_all(); - for(i=0; i