generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "fbdev: simplify logic in fbdev_read_packet()"

Browse Source 
This change is buggy.

This reverts commit d46c9f83cf.
This commit is contained in:
Michael Niedermayer
2011-04-11 00:37:00 +02:00
parent 5381823eb6
commit 2e92a34cde
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavdevice/fbdev.c
View File

@@ -189,20 +189,22 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt)
fbdev->time_frame = av_gettime(); fbdev->time_frame = av_gettime();
/* wait based on the frame rate */ /* wait based on the frame rate */
curtime = av_gettime(); while (1) {
delay = fbdev->time_frame - curtime; curtime = av_gettime();
av_dlog(avctx, delay = fbdev->time_frame - curtime;
"time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n", av_dlog(avctx,
fbdev->time_frame, curtime, delay); "time_frame:%"PRId64" curtime:%"PRId64" delay:%"PRId64"\n",
if (delay > 0) { fbdev->time_frame, curtime, delay);
if (delay <= 0) {
fbdev->time_frame += INT64_C(1000000) * av_q2d(fbdev->time_base);
break;
}
if (avctx->flags & AVFMT_FLAG_NONBLOCK) if (avctx->flags & AVFMT_FLAG_NONBLOCK)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
ts.tv_sec = delay / 1000000; ts.tv_sec = delay / 1000000;
ts.tv_nsec = (delay % 1000000) * 1000; ts.tv_nsec = (delay % 1000000) * 1000;
while (nanosleep(&ts, &ts) < 0 && errno == EINTR); while (nanosleep(&ts, &ts) < 0 && errno == EINTR);
} }
/* compute the time of the next frame */
fbdev->time_frame += INT64_C(1000000) * av_q2d(fbdev->time_base);
if ((ret = av_new_packet(pkt, fbdev->frame_size)) < 0) if ((ret = av_new_packet(pkt, fbdev->frame_size)) < 0)
return ret; return ret;