RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

renamed gettime to av_gettime() 

Originally committed as revision 805 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-07-25 16:05:25 +00:00
parent 2302dd1319
commit a11bf0bd61
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libav/ffm.c
View File

@ -178,7 +178,7 @@ static int ffm_write_header(AVFormatContext *s)
if (ffm_nopts) if (ffm_nopts)
fst->pts = 0; fst->pts = 0;
else else
fst->pts = gettime(); fst->pts = av_gettime();
} }
/* flush until end of block reached */ /* flush until end of block reached */

14
libav/grab.c
View File

@ -148,7 +148,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
val = 1; val = 1;
ioctl(video_fd, VIDIOCCAPTURE, &val); ioctl(video_fd, VIDIOCCAPTURE, &val);
s->time_frame = gettime(); s->time_frame = av_gettime();
s->use_mmap = 0; s->use_mmap = 0;
} else { } else {
video_buf = mmap(0,gb_buffers.size,PROT_READ|PROT_WRITE,MAP_SHARED,video_fd,0); video_buf = mmap(0,gb_buffers.size,PROT_READ|PROT_WRITE,MAP_SHARED,video_fd,0);
@ -157,7 +157,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
goto fail; goto fail;
} }
gb_frame = 0; gb_frame = 0;
s->time_frame = gettime(); s->time_frame = av_gettime();
/* start to grab the first frame */ /* start to grab the first frame */
gb_buf.frame = gb_frame % gb_buffers.frames; gb_buf.frame = gb_frame % gb_buffers.frames;
@ -249,14 +249,6 @@ static int v4l_mm_read_picture(VideoData *s, UINT8 *buf)
while (ioctl(s->fd, VIDIOCSYNC, &gb_frame) < 0 && while (ioctl(s->fd, VIDIOCSYNC, &gb_frame) < 0 &&
(errno == EAGAIN || errno == EINTR)); (errno == EAGAIN || errno == EINTR));
/*
gettimeofday(&tv_e, 0);
delay = (tv_e.tv_sec - tv_s.tv_sec) * 1000000 + tv_e.tv_usec - tv_s.tv_usec;
if (delay > 10000)
printf("VIDIOCSYNC took %d us\n", delay);
*/
ptr = video_buf + gb_buffers.offsets[gb_frame]; ptr = video_buf + gb_buffers.offsets[gb_frame];
memcpy(buf, ptr, s->frame_size); memcpy(buf, ptr, s->frame_size);
@ -280,7 +272,7 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
/* wait based on the frame rate */ /* wait based on the frame rate */
for(first = 1;; first = 0) { for(first = 1;; first = 0) {
curtime = gettime(); curtime = av_gettime();
delay = s->time_frame - curtime; delay = s->time_frame - curtime;
if (delay <= 0) { if (delay <= 0) {
if (delay < -per_frame) { if (delay < -per_frame) {