X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffplay.c;h=706ee25d65a56b334a59b7fb9088ec05c47d88d9;hb=9b576e4d124474272c2abeb322df3fd5602f00b8;hp=c85c9ddc1a8b473f507ca198362a9028b1938bff;hpb=4afbcf46c91ebba9bb06d8e8a33a4201c5131bce;p=ffmpeg diff --git a/ffplay.c b/ffplay.c index c85c9ddc1a8..706ee25d65a 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1,46 +1,46 @@ /* - * FFplay : Simple Media Player based on the FFmpeg libraries + * ffplay : Simple Media Player based on the Libav libraries * Copyright (c) 2003 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * 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/mathematics.h" #include "libavutil/pixdesc.h" -#include "libavcore/imgutils.h" -#include "libavcore/parseutils.h" +#include "libavutil/imgutils.h" +#include "libavutil/dict.h" +#include "libavutil/parseutils.h" +#include "libavutil/samplefmt.h" #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" #include "libavcodec/audioconvert.h" -#include "libavcodec/opt.h" +#include "libavutil/opt.h" #include "libavcodec/avfft.h" #if CONFIG_AVFILTER # include "libavfilter/avfilter.h" # include "libavfilter/avfiltergraph.h" -# include "libavfilter/graphparser.h" #endif #include "cmdutils.h" @@ -55,11 +55,9 @@ #include #include -const char program_name[] = "FFplay"; +const char program_name[] = "ffplay"; const int program_birth_year = 2003; -//#define DEBUG_SYNC - #define MAX_QUEUE_SIZE (15 * 1024 * 1024) #define MIN_AUDIOQ_SIZE (20 * 16 * 1024) #define MIN_FRAMES 5 @@ -163,7 +161,7 @@ typedef struct VideoState { int audio_buf_index; /* in bytes */ AVPacket audio_pkt_temp; AVPacket audio_pkt; - enum SampleFormat audio_src_fmt; + enum AVSampleFormat audio_src_fmt; AVAudioConvert *reformat_ctx; int show_audio; /* if true, display audio samples */ @@ -207,10 +205,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; ///width - (x + w); - if (w2 < 0) - w2 = 0; - h1 = y; - if (h1 < 0) - h1 = 0; - h2 = s->height - (y + h); - if (h2 < 0) - h2 = 0; - fill_rectangle(screen, - s->xleft, s->ytop, - w1, s->height, - color); - fill_rectangle(screen, - s->xleft + s->width - w2, s->ytop, - w2, s->height, - color); - fill_rectangle(screen, - s->xleft + w1, s->ytop, - s->width - w1 - w2, h1, - color); - fill_rectangle(screen, - s->xleft + w1, s->ytop + s->height - h2, - s->width - w1 - w2, h2, - color); -} -#endif - #define ALPHA_BLEND(a, oldp, newp, s)\ ((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s)) @@ -714,40 +670,6 @@ static void video_image_display(VideoState *is) if (aspect_ratio <= 0.0) aspect_ratio = 1.0; aspect_ratio *= (float)vp->width / (float)vp->height; - /* if an active format is indicated, then it overrides the - mpeg format */ -#if 0 - if (is->video_st->codec->dtg_active_format != is->dtg_active_format) { - is->dtg_active_format = is->video_st->codec->dtg_active_format; - printf("dtg_active_format=%d\n", is->dtg_active_format); - } -#endif -#if 0 - switch(is->video_st->codec->dtg_active_format) { - case FF_DTG_AFD_SAME: - default: - /* nothing to do */ - break; - case FF_DTG_AFD_4_3: - aspect_ratio = 4.0 / 3.0; - break; - case FF_DTG_AFD_16_9: - aspect_ratio = 16.0 / 9.0; - break; - case FF_DTG_AFD_14_9: - aspect_ratio = 14.0 / 9.0; - break; - case FF_DTG_AFD_4_3_SP_14_9: - aspect_ratio = 14.0 / 9.0; - break; - case FF_DTG_AFD_16_9_SP_14_9: - aspect_ratio = 14.0 / 9.0; - break; - case FF_DTG_AFD_SP_4_3: - aspect_ratio = 4.0 / 3.0; - break; - } -#endif if (is->subtitle_st) { @@ -786,26 +708,22 @@ static void video_image_display(VideoState *is) } x = (is->width - width) / 2; y = (is->height - height) / 2; - if (!is->no_background) { - /* fill the background */ - // fill_border(is, x, y, width, height, QERGB(0x00, 0x00, 0x00)); - } else { - is->no_background = 0; - } + is->no_background = 0; rect.x = is->xleft + x; rect.y = is->ytop + y; rect.w = width; rect.h = height; SDL_DisplayYUVOverlay(vp->bmp, &rect); - } else { -#if 0 - fill_rectangle(screen, - is->xleft, is->ytop, is->width, is->height, - QERGB(0x00, 0x00, 0x00)); -#endif } } +/* 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) +{ + return is->audio_buf_size - is->audio_buf_index; +} + static inline int compute_mod(int a, int b) { a = a % b; @@ -1019,12 +937,12 @@ static int refresh_thread(void *opaque) { VideoState *is= opaque; while(!is->abort_request){ - SDL_Event event; - event.type = FF_REFRESH_EVENT; - event.user.data1 = opaque; + SDL_Event event; + event.type = FF_REFRESH_EVENT; + event.user.data1 = opaque; if(!is->refresh){ is->refresh=1; - SDL_PushEvent(&event); + SDL_PushEvent(&event); } usleep(is->audio_st && is->show_audio ? rdftspeed*1000 : 5000); //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly } @@ -1146,10 +1064,9 @@ static double compute_target_time(double frame_current_pts, VideoState *is) } } is->frame_timer += delay; -#if defined(DEBUG_SYNC) - printf("video: delay=%0.3f actual_delay=%0.3f pts=%0.3f A-V=%f\n", - delay, actual_delay, frame_current_pts, -diff); -#endif + + av_dlog(NULL, "video: delay=%0.3f pts=%0.3f A-V=%f\n", + delay, frame_current_pts, -diff); return is->frame_timer; } @@ -1245,7 +1162,8 @@ retry: } /* display picture */ - video_display(is); + if (!display_disable) + video_display(is); /* update queue size and signal for next picture */ if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE) @@ -1263,7 +1181,8 @@ retry: than nothing, just to test the implementation */ /* display picture */ - video_display(is); + if (!display_disable) + video_display(is); } if (show_status) { static int64_t last_time; @@ -1286,7 +1205,7 @@ 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; } @@ -1329,21 +1248,18 @@ static void stream_close(VideoState *is) 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); + uninit_opts(); #if CONFIG_AVFILTER avfilter_uninit(); #endif if (show_status) printf("\n"); SDL_Quit(); + av_log(NULL, AV_LOG_QUIET, ""); exit(0); } @@ -1398,9 +1314,10 @@ static void alloc_picture(void *opaque) static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t pos) { VideoPicture *vp; - int dst_pix_fmt; #if CONFIG_AVFILTER AVPicture pict_src; +#else + int dst_pix_fmt = PIX_FMT_YUV420P; #endif /* wait until we have space to put a new picture */ SDL_LockMutex(is->pictq_mutex); @@ -1461,7 +1378,6 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t /* get a pointer on the bitmap */ SDL_LockYUVOverlay (vp->bmp); - dst_pix_fmt = PIX_FMT_YUV420P; memset(&pict,0,sizeof(AVPicture)); pict.data[0] = vp->bmp->pixels[0]; pict.data[1] = vp->bmp->pixels[2]; @@ -1536,10 +1452,6 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6 frame_delay += src_frame->repeat_pict * (frame_delay * 0.5); is->video_clock += frame_delay; -#if defined(DEBUG_SYNC) && 0 - printf("frame_type=%c clock=%0.3f pts=%0.3f\n", - av_get_pict_type_char(src_frame->pict_type), pts, pts1); -#endif return queue_picture(is, src_frame, pts, pos); } @@ -1547,64 +1459,49 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke { int len1, got_picture, i; - if (packet_queue_get(&is->videoq, pkt, 1) < 0) - return -1; + if (packet_queue_get(&is->videoq, pkt, 1) < 0) + return -1; - if(pkt->data == flush_pkt.data){ - avcodec_flush_buffers(is->video_st->codec); + if (pkt->data == flush_pkt.data) { + avcodec_flush_buffers(is->video_st->codec); - SDL_LockMutex(is->pictq_mutex); - //Make sure there are no long delay timers (ideally we should just flush the que but thats harder) - for(i=0; ipictq[i].target_clock= 0; - } - while (is->pictq_size && !is->videoq.abort_request) { - SDL_CondWait(is->pictq_cond, is->pictq_mutex); - } - is->video_current_pos= -1; - SDL_UnlockMutex(is->pictq_mutex); - - is->last_dts_for_fault_detection= - is->last_pts_for_fault_detection= INT64_MIN; - is->frame_last_pts= AV_NOPTS_VALUE; - is->frame_last_delay = 0; - is->frame_timer = (double)av_gettime() / 1000000.0; - is->skip_frames= 1; - is->skip_frames_index= 0; - return 0; + SDL_LockMutex(is->pictq_mutex); + //Make sure there are no long delay timers (ideally we should just flush the que but thats harder) + for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) { + is->pictq[i].target_clock= 0; + } + while (is->pictq_size && !is->videoq.abort_request) { + SDL_CondWait(is->pictq_cond, is->pictq_mutex); } + is->video_current_pos = -1; + SDL_UnlockMutex(is->pictq_mutex); - /* NOTE: ipts is the PTS of the _first_ picture beginning in - this packet, if any */ - is->video_st->codec->reordered_opaque= pkt->pts; - len1 = avcodec_decode_video2(is->video_st->codec, - frame, &got_picture, - pkt); + 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; + is->skip_frames = 1; + is->skip_frames_index = 0; + return 0; + } - 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(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; - } + len1 = avcodec_decode_video2(is->video_st->codec, + frame, &got_picture, + pkt); + + if (got_picture) { + if (decoder_reorder_pts == -1) { + *pts = guess_correct_pts(&is->pts_ctx, frame->pkt_pts, frame->pkt_dts); + } else if (decoder_reorder_pts) { + *pts = frame->pkt_pts; + } else { + *pts = frame->pkt_dts; } - 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 (*pts == AV_NOPTS_VALUE) { + *pts = 0; + } -// if (len1 < 0) -// break; - if (got_picture){ is->skip_frames_index += 1; if(is->skip_frames_index >= is->skip_frames){ is->skip_frames_index -= FFMAX(is->skip_frames, 1.0); @@ -1629,6 +1526,10 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) int perms = AV_PERM_WRITE; int i, w, h, stride[4]; unsigned edge; + int pixel_size; + + if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES) + perms |= AV_PERM_NEG_LINESIZES; if(pic->buffer_hints & FF_BUFFER_HINTS_VALID) { if(pic->buffer_hints & FF_BUFFER_HINTS_READABLE) perms |= AV_PERM_READ; @@ -1647,6 +1548,7 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h))) return -1; + pixel_size = av_pix_fmt_descriptors[ref->format].comp[0].step_minus1+1; ref->video->w = codec->width; ref->video->h = codec->height; for(i = 0; i < 4; i ++) { @@ -1654,7 +1556,7 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) 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); + ref->data[i] += ((edge * pixel_size) >> hshift) + ((edge * ref->linesize[i]) >> vshift); } pic->data[i] = ref->data[i]; pic->linesize[i] = ref->linesize[i]; @@ -1663,6 +1565,8 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) pic->age = INT_MAX; pic->type = FF_BUFFER_TYPE_USER; pic->reordered_opaque = codec->reordered_opaque; + if(codec->pkt) pic->pkt_pts = codec->pkt->pts; + else pic->pkt_pts = AV_NOPTS_VALUE; return 0; } @@ -1688,6 +1592,8 @@ static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic) } pic->reordered_opaque = codec->reordered_opaque; + if(codec->pkt) pic->pkt_pts = codec->pkt->pts; + else pic->pkt_pts = AV_NOPTS_VALUE; return 0; } @@ -1705,6 +1611,7 @@ static int input_init(AVFilterContext *ctx, const char *args, void *opaque) codec->get_buffer = input_get_buffer; codec->release_buffer = input_release_buffer; codec->reget_buffer = input_reget_buffer; + codec->thread_safe_callbacks = 1; } priv->frame = avcodec_alloc_frame(); @@ -1769,6 +1676,7 @@ static int input_config_props(AVFilterLink *link) link->w = c->width; link->h = c->height; + link->time_base = priv->is->video_st->time_base; return 0; } @@ -1792,115 +1700,97 @@ static AVFilter input_filter = { .name = NULL }}, }; -static void output_end_frame(AVFilterLink *link) -{ -} - -static int output_query_formats(AVFilterContext *ctx) -{ - enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE }; - - avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); - return 0; -} - -static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, - int64_t *pts, int64_t *pos) -{ - AVFilterBufferRef *pic; - - if(avfilter_request_frame(ctx->inputs[0])) - return -1; - if(!(pic = ctx->inputs[0]->cur_buf)) - return -1; - ctx->inputs[0]->cur_buf = NULL; - - frame->opaque = pic; - *pts = pic->pts; - *pos = pic->pos; - - memcpy(frame->data, pic->data, sizeof(frame->data)); - memcpy(frame->linesize, pic->linesize, sizeof(frame->linesize)); - - return 1; -} - -static AVFilter output_filter = -{ - .name = "ffplay_output", - - .query_formats = output_query_formats, - - .inputs = (AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .end_frame = output_end_frame, - .min_perms = AV_PERM_READ, }, - { .name = NULL }}, - .outputs = (AVFilterPad[]) {{ .name = NULL }}, -}; -#endif /* CONFIG_AVFILTER */ - -static int video_thread(void *arg) +static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const char *vfilters) { - VideoState *is = arg; - AVFrame *frame= avcodec_alloc_frame(); - int64_t pts_int; - double pts; - int ret; - -#if CONFIG_AVFILTER - int64_t pos; char sws_flags_str[128]; + int ret; + FFSinkContext ffsink_ctx = { .pix_fmt = PIX_FMT_YUV420P }; AVFilterContext *filt_src = NULL, *filt_out = NULL; - AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); graph->scale_sws_opts = av_strdup(sws_flags_str); - 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; - + if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src", + NULL, is, graph)) < 0) + goto the_end; + if ((ret = avfilter_graph_create_filter(&filt_out, &ffsink, "out", + NULL, &ffsink_ctx, graph)) < 0) + goto the_end; if(vfilters) { AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut)); outputs->name = av_strdup("in"); - outputs->filter = filt_src; + outputs->filter_ctx = filt_src; outputs->pad_idx = 0; outputs->next = NULL; inputs->name = av_strdup("out"); - inputs->filter = filt_out; + inputs->filter_ctx = filt_out; inputs->pad_idx = 0; inputs->next = NULL; - if (avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL) < 0) + if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0) goto the_end; av_freep(&vfilters); } else { - if(avfilter_link(filt_src, 0, filt_out, 0) < 0) goto the_end; + if ((ret = avfilter_link(filt_src, 0, filt_out, 0)) < 0) + goto the_end; } - avfilter_graph_add_filter(graph, filt_src); - avfilter_graph_add_filter(graph, filt_out); - if(avfilter_graph_check_validity(graph, NULL)) goto the_end; - if(avfilter_graph_config_formats(graph, NULL)) goto the_end; - if(avfilter_graph_config_links(graph, NULL)) goto the_end; + if ((ret = avfilter_graph_config(graph, NULL)) < 0) + goto the_end; is->out_video_filter = filt_out; +the_end: + return ret; +} + +#endif /* CONFIG_AVFILTER */ + +static int video_thread(void *arg) +{ + VideoState *is = arg; + AVFrame *frame= avcodec_alloc_frame(); + int64_t pts_int; + double pts; + int ret; + +#if CONFIG_AVFILTER + AVFilterGraph *graph = avfilter_graph_alloc(); + AVFilterContext *filt_out = NULL; + int64_t pos; + + if ((ret = configure_video_filters(graph, is, vfilters)) < 0) + goto the_end; + filt_out = is->out_video_filter; #endif for(;;) { #if !CONFIG_AVFILTER AVPacket pkt; +#else + AVFilterBufferRef *picref; + AVRational tb; #endif while (is->paused && !is->videoq.abort_request) SDL_Delay(10); #if CONFIG_AVFILTER - ret = get_filtered_video_frame(filt_out, frame, &pts_int, &pos); + ret = get_filtered_video_frame(filt_out, frame, &picref, &tb); + if (picref) { + pts_int = picref->pts; + pos = picref->pos; + frame->opaque = picref; + } + + if (av_cmp_q(tb, is->video_st->time_base)) { + av_unused int64_t pts1 = pts_int; + pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base); + av_dlog(NULL, "video_thread(): " + "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n", + tb.num, tb.den, pts1, + is->video_st->time_base.num, is->video_st->time_base.den, pts_int); + } #else ret = get_video_frame(is, frame, &pts_int, &pkt); #endif @@ -1927,8 +1817,7 @@ static int video_thread(void *arg) } the_end: #if CONFIG_AVFILTER - avfilter_graph_destroy(graph); - av_freep(&graph); + avfilter_graph_free(&graph); #endif av_free(frame); return 0; @@ -1976,8 +1865,6 @@ static int subtitle_thread(void *arg) len1 = avcodec_decode_subtitle2(is->subtitle_st->codec, &sp->sub, &got_subtitle, pkt); -// if (len1 < 0) -// break; if (got_subtitle && sp->sub.format == 0) { sp->pts = pts; @@ -2001,9 +1888,6 @@ static int subtitle_thread(void *arg) SDL_UnlockMutex(is->subpq_mutex); } av_free_packet(pkt); -// if (step) -// if (cur_stream) -// stream_pause(cur_stream); } the_end: return 0; @@ -2012,9 +1896,7 @@ static int subtitle_thread(void *arg) /* copy samples for viewing in editor window */ static void update_sample_display(VideoState *is, short *samples, int samples_size) { - int size, len, channels; - - channels = is->audio_st->codec->channels; + int size, len; size = samples_size / sizeof(short); while (size > 0) { @@ -2090,11 +1972,9 @@ static int synchronize_audio(VideoState *is, short *samples, 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 + av_dlog(NULL, "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); } } else { /* too big difference : may be initial PTS errors, so @@ -2137,12 +2017,12 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) 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, + is->reformat_ctx= av_audio_convert_alloc(AV_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)); + av_get_sample_fmt_name(dec->sample_fmt), + av_get_sample_fmt_name(AV_SAMPLE_FMT_S16)); break; } is->audio_src_fmt= dec->sample_fmt; @@ -2151,7 +2031,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) 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 istride[6]= {av_get_bytes_per_sample(dec->sample_fmt)}; int ostride[6]= {2}; int len= data_size/istride[0]; if (av_audio_convert(is->reformat_ctx, obuf, ostride, ibuf, istride, len)<0) { @@ -2172,7 +2052,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) n = 2 * dec->channels; is->audio_clock += (double)data_size / (double)(n * dec->sample_rate); -#if defined(DEBUG_SYNC) +#ifdef DEBUG { static double last_clock; printf("audio: delay=%0.3f clock=%0.3f pts=%0.3f\n", @@ -2210,14 +2090,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) } } -/* 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) -{ - return is->audio_buf_size - is->audio_buf_index; -} - - /* prepare a new audio buffer */ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len) { @@ -2288,9 +2160,9 @@ static int stream_component_open(VideoState *is, int stream_index) avctx->skip_loop_filter= skip_loop_filter; avctx->error_recognition= error_recognition; avctx->error_concealment= error_concealment; - avcodec_thread_init(avctx, thread_count); + avctx->thread_count= 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) @@ -2310,7 +2182,7 @@ static int stream_component_open(VideoState *is, int stream_index) return -1; } is->audio_hw_buf_size = spec.size; - is->audio_src_fmt= SAMPLE_FMT_S16; + is->audio_src_fmt= AV_SAMPLE_FMT_S16; } ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; @@ -2336,8 +2208,6 @@ static int stream_component_open(VideoState *is, int stream_index) is->video_stream = stream_index; is->video_st = ic->streams[stream_index]; -// is->video_current_pts_time = av_gettime(); - packet_queue_init(&is->videoq); is->video_tid = SDL_CreateThread(video_thread, is); break; @@ -2439,48 +2309,55 @@ static int decode_interrupt_cb(void) static int decode_thread(void *arg) { VideoState *is = arg; - AVFormatContext *ic; + AVFormatContext *ic = NULL; int err, i, ret; int st_index[AVMEDIA_TYPE_NB]; - int st_count[AVMEDIA_TYPE_NB]={0}; - int st_best_packet_count[AVMEDIA_TYPE_NB]; AVPacket pkt1, *pkt = &pkt1; - AVFormatParameters params, *ap = ¶ms; int eof=0; int pkt_in_play_range = 0; - - ic = avformat_alloc_context(); + AVDictionaryEntry *t; memset(st_index, -1, sizeof(st_index)); - memset(st_best_packet_count, -1, sizeof(st_best_packet_count)); is->video_stream = -1; is->audio_stream = -1; is->subtitle_stream = -1; global_video_state = is; - url_set_interrupt_cb(decode_interrupt_cb); - - memset(ap, 0, sizeof(*ap)); + avio_set_interrupt_cb(decode_interrupt_cb); - ap->prealloced_context = 1; - ap->width = frame_width; - ap->height= frame_height; - ap->time_base= (AVRational){1, 25}; - ap->pix_fmt = frame_pix_fmt; - - set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM); - - err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap); + err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts); if (err < 0) { print_error(is->filename, err); ret = -1; goto fail; } + if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) { + av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key); + ret = AVERROR_OPTION_NOT_FOUND; + goto fail; + } is->ic = ic; if(genpts) ic->flags |= AVFMT_FLAG_GENPTS; + /* Set AVCodecContext options so they will be seen by av_find_stream_info() */ + for (i = 0; i < ic->nb_streams; i++) { + AVCodecContext *dec = ic->streams[i]->codec; + switch (dec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_AUDIO], + AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM, + NULL); + break; + case AVMEDIA_TYPE_VIDEO: + set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_VIDEO], + AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM, + NULL); + break; + } + } + err = av_find_stream_info(ic); if (err < 0) { fprintf(stderr, "%s: could not find codec parameters\n", is->filename); @@ -2508,35 +2385,28 @@ static int decode_thread(void *arg) } } - for(i = 0; i < ic->nb_streams; i++) { - AVStream *st= ic->streams[i]; - AVCodecContext *avctx = st->codec; + for (i = 0; i < ic->nb_streams; i++) ic->streams[i]->discard = AVDISCARD_ALL; - if(avctx->codec_type >= (unsigned)AVMEDIA_TYPE_NB) - continue; - if(st_count[avctx->codec_type]++ != wanted_stream[avctx->codec_type] && wanted_stream[avctx->codec_type] >= 0) - continue; - - if(st_best_packet_count[avctx->codec_type] >= st->codec_info_nb_frames) - continue; - st_best_packet_count[avctx->codec_type]= st->codec_info_nb_frames; - - switch(avctx->codec_type) { - case AVMEDIA_TYPE_AUDIO: - if (!audio_disable) - st_index[AVMEDIA_TYPE_AUDIO] = i; - break; - case AVMEDIA_TYPE_VIDEO: - case AVMEDIA_TYPE_SUBTITLE: - if (!video_disable) - st_index[avctx->codec_type] = i; - break; - default: - break; - } - } + if (!video_disable) + st_index[AVMEDIA_TYPE_VIDEO] = + av_find_best_stream(ic, AVMEDIA_TYPE_VIDEO, + wanted_stream[AVMEDIA_TYPE_VIDEO], -1, NULL, 0); + if (!audio_disable) + st_index[AVMEDIA_TYPE_AUDIO] = + av_find_best_stream(ic, AVMEDIA_TYPE_AUDIO, + wanted_stream[AVMEDIA_TYPE_AUDIO], + st_index[AVMEDIA_TYPE_VIDEO], + NULL, 0); + if (!video_disable) + st_index[AVMEDIA_TYPE_SUBTITLE] = + av_find_best_stream(ic, AVMEDIA_TYPE_SUBTITLE, + wanted_stream[AVMEDIA_TYPE_SUBTITLE], + (st_index[AVMEDIA_TYPE_AUDIO] >= 0 ? + st_index[AVMEDIA_TYPE_AUDIO] : + st_index[AVMEDIA_TYPE_VIDEO]), + NULL, 0); if (show_status) { - dump_format(ic, 0, is->filename, 0); + av_dump_format(ic, 0, is->filename, 0); } /* open the streams */ @@ -2619,7 +2489,7 @@ static int decode_thread(void *arg) SDL_Delay(10); continue; } - if(url_feof(ic->pb) || eof) { + if(eof) { if(is->video_stream >= 0){ av_init_packet(pkt); pkt->data=NULL; @@ -2640,9 +2510,9 @@ static int decode_thread(void *arg) } ret = av_read_frame(ic, pkt); if (ret < 0) { - if (ret == AVERROR_EOF) + if (ret == AVERROR_EOF || (ic->pb && ic->pb->eof_reached)) eof=1; - if (url_ferror(ic->pb)) + if (ic->pb && ic->pb->error) break; SDL_Delay(100); /* wait for user event */ continue; @@ -2684,7 +2554,7 @@ static int decode_thread(void *arg) av_close_input_file(is->ic); is->ic = NULL; /* safety */ } - url_set_interrupt_cb(NULL); + avio_set_interrupt_cb(NULL); if (ret != 0) { SDL_Event event; @@ -2777,10 +2647,6 @@ static void stream_cycle_channel(VideoState *is, int codec_type) static void toggle_full_screen(void) { is_full_screen = !is_full_screen; - if (!fs_screen_width) { - /* use default SDL method */ -// SDL_WM_ToggleFullScreen(screen); - } video_open(cur_stream); } @@ -2877,7 +2743,7 @@ static void event_loop(void) }else if(cur_stream->audio_stream >= 0 && cur_stream->audio_pkt.pos>=0){ pos= cur_stream->audio_pkt.pos; }else - pos = url_ftell(cur_stream->ic->pb); + pos = avio_tell(cur_stream->ic->pb); if (cur_stream->ic->bit_rate) incr *= cur_stream->ic->bit_rate / 8.0; else @@ -2910,7 +2776,7 @@ static void event_loop(void) } if (cur_stream) { if(seek_by_bytes || cur_stream->ic->duration<=0){ - uint64_t size= url_fsize(cur_stream->ic->pb); + uint64_t size= avio_size(cur_stream->ic->pb); stream_seek(cur_stream, size*x/cur_stream->width, 0, 1); }else{ int64_t ts; @@ -2960,16 +2826,17 @@ static void event_loop(void) } } -static void opt_frame_size(const char *arg) +static int opt_frame_size(const char *opt, const char *arg) { if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) { fprintf(stderr, "Incorrect frame size\n"); - exit(1); + return AVERROR(EINVAL); } if ((frame_width % 2) != 0 || (frame_height % 2) != 0) { fprintf(stderr, "Frame size must be a multiple of 2\n"); - exit(1); + return AVERROR(EINVAL); } + return 0; } static int opt_width(const char *opt, const char *arg) @@ -2984,18 +2851,20 @@ static int opt_height(const char *opt, const char *arg) return 0; } -static void opt_format(const char *arg) +static int opt_format(const char *opt, const char *arg) { file_iformat = av_find_input_format(arg); if (!file_iformat) { fprintf(stderr, "Unknown input format: %s\n", arg); - exit(1); + return AVERROR(EINVAL); } + return 0; } -static void opt_frame_pix_fmt(const char *arg) +static int opt_frame_pix_fmt(const char *opt, const char *arg) { frame_pix_fmt = av_get_pix_fmt(arg); + return 0; } static int opt_sync(const char *opt, const char *arg) @@ -3049,8 +2918,8 @@ static int opt_thread_count(const char *opt, const char *arg) static const OptionDef options[] = { #include "cmdutils_common_opts.h" - { "x", HAS_ARG | OPT_FUNC2, {(void*)opt_width}, "force displayed width", "width" }, - { "y", HAS_ARG | OPT_FUNC2, {(void*)opt_height}, "force displayed height", "height" }, + { "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" }, @@ -3058,16 +2927,16 @@ static const OptionDef options[] = { { "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_AUDIO]}, "select desired audio stream", "stream_number" }, { "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_VIDEO]}, "select desired video stream", "stream_number" }, { "sst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_stream[AVMEDIA_TYPE_SUBTITLE]}, "select desired subtitle stream", "stream_number" }, - { "ss", HAS_ARG | OPT_FUNC2, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" }, - { "t", HAS_ARG | OPT_FUNC2, {(void*)&opt_duration}, "play \"duration\" seconds of audio/video", "duration" }, + { "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" }, + { "t", HAS_ARG, {(void*)&opt_duration}, "play \"duration\" seconds of audio/video", "duration" }, { "bytes", OPT_INT | HAS_ARG, {(void*)&seek_by_bytes}, "seek by bytes 0=off 1=on -1=auto", "val" }, { "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_FUNC2 | OPT_EXPERT, {(void*)opt_debug}, "print specific debug info", "" }, + { "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_FUNC2 | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" }, + { "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_INT | HAS_ARG | OPT_EXPERT, {(void*)&decoder_reorder_pts}, "let decoder reorder pts 0=off 1=on -1=auto", ""}, @@ -3078,8 +2947,8 @@ static 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_recognition}, "set error detection threshold (0-4)", "threshold" }, { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, - { "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" }, + { "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" }, { "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", "" }, @@ -3090,7 +2959,8 @@ static const OptionDef options[] = { { "vf", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, #endif { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" }, - { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, + { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, + { "i", 0, {NULL}, "ffmpeg compatibility dummy option", ""}, { NULL, }, }; @@ -3103,11 +2973,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" @@ -3138,7 +3020,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(); @@ -3150,13 +3034,7 @@ int main(int argc, char **argv) #endif av_register_all(); - for(i=0; i