diff options
| -rw-r--r-- | libmpdemux/demuxer.c | 21 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 1 | ||||
| -rw-r--r-- | libmpdemux/video.c | 8 |
3 files changed, 27 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8107638381..6b95faffc5 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -438,6 +438,25 @@ int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){ } } +float ds_get_next_pts(demux_stream_t *ds) { + demuxer_t* demux = ds->demuxer; + while(!ds->first) { + if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){ + mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes); + mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); + return -1; + } + if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){ + mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes); + mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); + return -1; + } + if(!demux_fill_buffer(demux,ds)) + return -1; + } + return ds->first->pts; +} + // ==================================================================== // feed-back from demuxers: @@ -696,7 +715,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){ mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPSfile); file_format=DEMUXER_TYPE_MPEG_PS; } else { - printf("MPEG packet stats: p100: %d p101: %d PES: %d MP3: %d \n", + mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d PES: %d MP3: %d \n", num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES,num_mp3audio_packets); //MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v) if(num_mp3audio_packets>50 && num_mp3audio_packets>2*num_elementary_packets100 diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index b0ccc2f518..1004b2f018 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -173,6 +173,7 @@ inline static int demux_getc(demux_stream_t *ds){ void ds_free_packs(demux_stream_t *ds); int ds_get_packet(demux_stream_t *ds,unsigned char **start); int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start); +float ds_get_next_pts(demux_stream_t *ds); // This is defined here because demux_stream_t ins't defined in stream.h stream_t* new_ds_stream(demux_stream_t *ds); diff --git a/libmpdemux/video.c b/libmpdemux/video.c index fb62b77965..3afe5a7058 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -291,14 +291,18 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** case DEMUXER_TYPE_FILM: case DEMUXER_TYPE_VIVO: case DEMUXER_TYPE_ASF: { - float d=d_video->pts-pts1; - if(d>0 && d<5) frame_time=d; + float next_pts = ds_get_next_pts(d_video); + float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; if(d>0){ if(verbose) if((int)sh_video->fps==1000) mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\navg. framerate: %d fps \n",(int)(1.0f/d)); sh_video->frametime=d; // 1ms sh_video->fps=1.0f/d; + frame_time = d; + } else { + mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value. Defaulting to 1/25 sec.\n"); + frame_time = 1/25.0; } } } |