opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-29 04:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make ffplay pass the packet.pos information to the filterchain, get it

Browse Source 
again from the filterchain and pass it back to output_picture2().

Originally committed as revision 22507 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-03-13 11:27:07 +00:00
parent 5bb5c1dc86
commit bb4095133f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@ -1594,6 +1594,7 @@ static int input_request_frame(AVFilterLink *link)
av_free_packet(&pkt); av_free_packet(&pkt);
picref->pts = pts; picref->pts = pts;
picref->pos = pkt.pos;
picref->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio; picref->pixel_aspect = priv->is->video_st->codec->sample_aspect_ratio;
avfilter_start_frame(link, avfilter_ref_pic(picref, ~0)); avfilter_start_frame(link, avfilter_ref_pic(picref, ~0));
avfilter_draw_slice(link, 0, link->h, 1); avfilter_draw_slice(link, 0, link->h, 1);
@ -1657,7 +1658,7 @@ static int output_query_formats(AVFilterContext *ctx)
} }
static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
int64_t *pts) int64_t *pts, int64_t *pos)
{ {
AVFilterPicRef *pic; AVFilterPicRef *pic;
@ -1669,6 +1670,7 @@ static int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame,
frame->opaque = pic; frame->opaque = pic;
*pts = pic->pts; *pts = pic->pts;
*pos = pic->pos;
memcpy(frame->data, pic->data, sizeof(frame->data)); memcpy(frame->data, pic->data, sizeof(frame->data));
memcpy(frame->linesize, pic->linesize, sizeof(frame->linesize)); memcpy(frame->linesize, pic->linesize, sizeof(frame->linesize));
@ -1695,7 +1697,7 @@ static int video_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFrame *frame= avcodec_alloc_frame(); AVFrame *frame= avcodec_alloc_frame();
int64_t pts_int; int64_t pts_int, pos;
double pts; double pts;
int ret; int ret;
@ -1748,7 +1750,7 @@ static int video_thread(void *arg)
while (is->paused && !is->videoq.abort_request) while (is->paused && !is->videoq.abort_request)
SDL_Delay(10); SDL_Delay(10);
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
ret = get_filtered_video_frame(filt_out, frame, &pts_int); ret = get_filtered_video_frame(filt_out, frame, &pts_int, &pos);
#else #else
ret = get_video_frame(is, frame, &pts_int, &pkt); ret = get_video_frame(is, frame, &pts_int, &pkt);
#endif #endif
@ -1761,7 +1763,7 @@ static int video_thread(void *arg)
pts = pts_int*av_q2d(is->video_st->time_base); pts = pts_int*av_q2d(is->video_st->time_base);
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
ret = output_picture2(is, frame, pts, -1); /* fixme: unknown pos */ ret = output_picture2(is, frame, pts, pos);
#else #else
ret = output_picture2(is, frame, pts, pkt.pos); ret = output_picture2(is, frame, pts, pkt.pos);
av_free_packet(&pkt); av_free_packet(&pkt);