X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffplay.c;h=2a2e8239e3a72e9c24f9081e902091e8581ee123;hb=09a5c2452cab8931f70ecb51705114682c962f98;hp=f3a076b98ff4bbd4b1294b2aa4cee674559a15c5;hpb=72415b2adb2c25f95ceede49001bb97ed9247dbb;p=ffmpeg diff --git a/ffplay.c b/ffplay.c index f3a076b98ff..2a2e8239e3a 100644 --- a/ffplay.c +++ b/ffplay.c @@ -19,24 +19,28 @@ * 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 "libavcore/samplefmt.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" #if CONFIG_AVFILTER # include "libavfilter/avfilter.h" # include "libavfilter/avfiltergraph.h" -# include "libavfilter/graphparser.h" #endif #include "cmdutils.h" @@ -80,9 +84,7 @@ const int program_birth_year = 2003; /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */ #define SAMPLE_ARRAY_SIZE (2*65536) -#if !CONFIG_AVFILTER static int sws_flags = SWS_BICUBIC; -#endif typedef struct PacketQueue { AVPacketList *first_pkt, *last_pkt; @@ -106,7 +108,7 @@ typedef struct VideoPicture { enum PixelFormat pix_fmt; #if CONFIG_AVFILTER - AVFilterPicRef *picref; + AVFilterBufferRef *picref; #endif } VideoPicture; @@ -161,7 +163,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 */ @@ -170,6 +172,7 @@ typedef struct VideoState { int last_i_start; RDFTContext *rdft; int rdft_bits; + FFTSample *rdft_data; int xpos; SDL_Thread *subtitle_tid; @@ -204,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) @@ -702,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 */ @@ -918,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); @@ -938,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); @@ -1020,12 +1016,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 } @@ -1246,7 +1242,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) @@ -1264,7 +1261,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; @@ -1287,13 +1285,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) @@ -1308,7 +1357,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; @@ -1323,6 +1372,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; @@ -1393,7 +1450,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 @@ -1486,64 +1543,52 @@ 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(pkt->data == flush_pkt.data){ - avcodec_flush_buffers(is->video_st->codec); + if (packet_queue_get(&is->videoq, pkt, 1) < 0) + return -1; - 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); + if (pkt->data == flush_pkt.data) { + avcodec_flush_buffers(is->video_st->codec); - 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; - } + /* 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); + + if (got_picture) { + 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( ( 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); @@ -1558,14 +1603,101 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke typedef struct { VideoState *is; AVFrame *frame; + int use_dr1; } FilterPriv; +static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) +{ + AVFilterContext *ctx = codec->opaque; + AVFilterBufferRef *ref; + int perms = AV_PERM_WRITE; + int i, w, h, stride[4]; + unsigned edge; + + 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; + if(pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE) perms |= AV_PERM_PRESERVE; + if(pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) perms |= AV_PERM_REUSE2; + } + if(pic->reference) perms |= AV_PERM_READ | AV_PERM_PRESERVE; + + w = codec->width; + h = codec->height; + avcodec_align_dimensions2(codec, &w, &h, stride); + edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width(); + w += edge << 1; + h += edge << 1; + + if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h))) + return -1; + + 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); + } + pic->data[i] = ref->data[i]; + pic->linesize[i] = ref->linesize[i]; + } + pic->opaque = ref; + 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; +} + +static void input_release_buffer(AVCodecContext *codec, AVFrame *pic) +{ + memset(pic->data, 0, sizeof(pic->data)); + avfilter_unref_buffer(pic->opaque); +} + +static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic) +{ + 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->video->w) || (codec->height != ref->video->h) || + (codec->pix_fmt != ref->format)) { + av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n"); + return -1; + } + + pic->reordered_opaque = codec->reordered_opaque; + if(codec->pkt) pic->pkt_pts = codec->pkt->pts; + else pic->pkt_pts = AV_NOPTS_VALUE; + return 0; +} + static int input_init(AVFilterContext *ctx, const char *args, void *opaque) { FilterPriv *priv = ctx->priv; + AVCodecContext *codec; if(!opaque) return -1; priv->is = opaque; + codec = priv->is->video_st->codec; + codec->opaque = ctx; + if(codec->codec->capabilities & CODEC_CAP_DR1) { + priv->use_dr1 = 1; + codec->get_buffer = input_get_buffer; + codec->release_buffer = input_release_buffer; + codec->reget_buffer = input_reget_buffer; + } + priv->frame = avcodec_alloc_frame(); return 0; @@ -1580,7 +1712,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; @@ -1590,20 +1722,22 @@ static int input_request_frame(AVFilterLink *link) if (ret < 0) return -1; - /* FIXME: until I figure out how to hook everything up to the codec - * right, we're just copying the entire frame. */ - 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); + if(priv->use_dr1) { + picref = avfilter_ref_buffer(priv->frame->opaque, ~0); + } else { + picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, 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; - avfilter_start_frame(link, avfilter_ref_pic(picref, ~0)); + 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); - avfilter_unref_pic(picref); return 0; } @@ -1626,6 +1760,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; } @@ -1649,52 +1784,6 @@ 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) -{ - AVFilterPicRef *pic; - - if(avfilter_request_frame(ctx->inputs[0])) - return -1; - if(!(pic = ctx->inputs[0]->cur_pic)) - return -1; - ctx->inputs[0]->cur_pic = 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) @@ -1707,28 +1796,31 @@ static int video_thread(void *arg) #if CONFIG_AVFILTER int64_t pos; + char sws_flags_str[128]; + FFSinkContext ffsink_ctx = { .pix_fmt = PIX_FMT_YUV420P }; AVFilterContext *filt_src = NULL, *filt_out = NULL; - AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); - graph->scale_sws_opts = av_strdup("sws_flags=bilinear"); - - if(!(filt_src = avfilter_open(&input_filter, "src"))) goto the_end; - if(!(filt_out = avfilter_open(&output_filter, "out"))) 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; + AVFilterGraph *graph = avfilter_graph_alloc(); + snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); + graph->scale_sws_opts = av_strdup(sws_flags_str); + if (avfilter_graph_create_filter(&filt_src, &input_filter, "src", + NULL, is, graph) < 0) + goto the_end; + if (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; @@ -1738,12 +1830,9 @@ static int video_thread(void *arg) } else { if(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 (avfilter_graph_config(graph, NULL) < 0) + goto the_end; is->out_video_filter = filt_out; #endif @@ -1751,11 +1840,28 @@ static int video_thread(void *arg) 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)) { + int64_t pts1 = pts_int; + pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base); + av_log(NULL, AV_LOG_DEBUG, "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 @@ -1782,7 +1888,7 @@ static int video_thread(void *arg) } the_end: #if CONFIG_AVFILTER - avfilter_graph_destroy(graph); + avfilter_graph_free(graph); av_freep(&graph); #endif av_free(frame); @@ -1992,12 +2098,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; @@ -2006,7 +2112,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_bits_per_sample_fmt(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) { @@ -2145,7 +2251,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) @@ -2165,7 +2271,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; @@ -2297,16 +2403,14 @@ static int decode_thread(void *arg) AVFormatContext *ic; 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(); 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; @@ -2322,7 +2426,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) { @@ -2362,33 +2466,26 @@ 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); } @@ -2473,7 +2570,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; @@ -2494,18 +2591,24 @@ static int decode_thread(void *arg) } ret = av_read_frame(ic, pkt); if (ret < 0) { - if (ret == AVERROR_EOF) + if (ret == AVERROR_EOF || url_feof(ic->pb)) eof=1; if (url_ferror(ic->pb)) break; SDL_Delay(100); /* wait for user event */ continue; } - if (pkt->stream_index == is->audio_stream) { + /* check if packet is in play range specified by user, then queue, otherwise discard */ + pkt_in_play_range = duration == AV_NOPTS_VALUE || + (pkt->pts - ic->streams[pkt->stream_index]->start_time) * + av_q2d(ic->streams[pkt->stream_index]->time_base) - + (double)(start_time != AV_NOPTS_VALUE ? start_time : 0)/1000000 + <= ((double)duration/1000000); + if (pkt->stream_index == is->audio_stream && pkt_in_play_range) { packet_queue_put(&is->audioq, pkt); - } else if (pkt->stream_index == is->video_stream) { + } else if (pkt->stream_index == is->video_stream && pkt_in_play_range) { packet_queue_put(&is->videoq, pkt); - } else if (pkt->stream_index == is->subtitle_stream) { + } else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) { packet_queue_put(&is->subtitleq, pkt); } else { av_free_packet(pkt); @@ -2572,40 +2675,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; @@ -2683,26 +2752,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) { @@ -2726,6 +2775,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: @@ -2794,6 +2847,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; @@ -2856,7 +2913,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); } @@ -2913,6 +2970,12 @@ static int opt_seek(const char *opt, const char *arg) return 0; } +static int opt_duration(const char *opt, const char *arg) +{ + duration = parse_time_or_die(opt, arg, 1); + return 0; +} + static int opt_debug(const char *opt, const char *arg) { av_log_set_level(99); @@ -2947,6 +3010,7 @@ static const OptionDef options[] = { { "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" }, { "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" }, @@ -2968,11 +3032,13 @@ 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" }, #if CONFIG_AVFILTER - { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, + { "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", "" }, @@ -2988,11 +3054,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" @@ -3001,6 +3079,7 @@ static void show_help(void) "v cycle video channel\n" "t cycle subtitle channel\n" "w show audio waves\n" + "s activate frame-step mode\n" "left/right seek backward/forward 10 seconds\n" "down/up seek backward/forward 1 minute\n" "mouse click seek to percentage in file corresponding to fraction of width\n" @@ -3022,23 +3101,21 @@ 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(); +#if CONFIG_AVDEVICE avdevice_register_all(); +#endif #if CONFIG_AVFILTER avfilter_register_all(); #endif av_register_all(); - for(i=0; i