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

pkt->pts is already set, please fix audio if you modify this code - supressed unused PKT_FLAG_DROPPED_FRAME 

Originally committed as revision 1250 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-11-20 10:50:44 +00:00
parent bb28568364
commit 6bcafa93d7
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libav/grab.c
View File

@ -32,7 +32,6 @@ typedef struct {
int width, height;
int frame_rate;
INT64 time_frame;
INT64 time_frame_start;
int frame_size;
struct video_capability video_cap;
struct video_audio audio_saved;
@ -241,8 +240,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec.height = height;
st->codec.frame_rate = frame_rate;
s->time_frame_start = s->time_frame;
av_set_pts_info(s1, 48, 1, 1000000); /* 48 bits pts in us */
return 0;
@ -285,7 +282,6 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
INT64 curtime, delay;
struct timespec ts;
INT64 per_frame = (INT64_C(1000000) * FRAME_RATE_BASE) / s->frame_rate;
int dropped = 0;
/* Calculate the time of the next frame */
s->time_frame += per_frame;
@ -297,7 +293,6 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (delay <= 0) {
if (delay < -per_frame) {
/* printf("grabbing is %d frames late (dropping)\n", (int) -(delay / 16666)); */
dropped = 1;
s->time_frame += per_frame;
}
break;
@ -312,13 +307,6 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
pkt->pts = curtime & ((1LL << 48) - 1);
if (dropped)
pkt->flags |= PKT_FLAG_DROPPED_FRAME;
pkt->pts = (s->time_frame - s->time_frame_start) * s1->pts_den / ((INT64)s1->pts_num * 1000000);
//printf("setting pkt->pts=%lld (time_frame=%lld)\n", pkt->pts, s->time_frame);
/* read one frame */
if (s->aiw_enabled) {
return aiw_read_picture(s, pkt->data);