virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

ffplay: simplify aspect ratio calculation

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2013-04-20 18:32:09 +02:00
parent 0dd25e4699
commit 40693ba3ac
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ffplay.c
+2 -5
View File
@@ -1556,11 +1556,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
vp = &is->pictq[is->pictq_windex]; vp = &is->pictq[is->pictq_windex];
#if CONFIG_AVFILTER
vp->sar = src_frame->sample_aspect_ratio; vp->sar = src_frame->sample_aspect_ratio;
#else
vp->sar = av_guess_sample_aspect_ratio(is->ic, is->video_st, src_frame);
#endif
/* alloc or resize hardware picture buffer */ /* alloc or resize hardware picture buffer */
if (!vp->bmp || vp->reallocate || !vp->allocated || if (!vp->bmp || vp->reallocate || !vp->allocated ||
@@ -1688,6 +1684,8 @@ static int get_video_frame(VideoState *is, AVFrame *frame, AVPacket *pkt, int *s
frame->pts = 0; frame->pts = 0;
} }
frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);
if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) { if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) {
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
if (is->frame_last_pts != AV_NOPTS_VALUE && frame->pts) { if (is->frame_last_pts != AV_NOPTS_VALUE && frame->pts) {
@@ -1937,7 +1935,6 @@ static int video_thread(void *arg)
last_serial = serial; last_serial = serial;
} }
frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);
ret = av_buffersrc_add_frame(filt_in, frame); ret = av_buffersrc_add_frame(filt_in, frame);
if (ret < 0) if (ret < 0)
goto the_end; goto the_end;