diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-12 18:03:16 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-12 18:03:16 +0000 |
commit | f549b66aea6b6e2e3d8d0a9c365b4f42182d039a (patch) | |
tree | 76168a1c5cd18b2a4f3f046f8e9457c8b6ee0442 /mencoder.c | |
parent | 3d0493357f977ea689c62fd0838e3f02d9d54e2d (diff) | |
download | mpv-f549b66aea6b6e2e3d8d0a9c365b4f42182d039a.tar.bz2 mpv-f549b66aea6b6e2e3d8d0a9c365b4f42182d039a.tar.xz |
fix for interlaced (2 fields) mpeg2 streams:
- accept frame skip caused by the codec
- do timer correction after calculating frame skip/dup count
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6722 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c index 74dda21f5e..0144c4b47f 100644 --- a/mencoder.c +++ b/mencoder.c @@ -953,8 +953,6 @@ if(sh_audio){ if(in_size<0){ at_eof=1; break; } sh_video->timer+=frame_time; ++decoded_frameno; - v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate; - if(demuxer2){ // 3-pass encoding, read control file (frameno.avi) // find our frame: while(next_frameno<decoded_frameno){ @@ -981,6 +979,8 @@ if(demuxer2){ // 3-pass encoding, read control file (frameno.avi) // check frame duplicate/drop: +//printf("\r### %5.3f ###\n",v_timer_corr); + if(v_timer_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && (skip_limit<0 || skip_flag<skip_limit) ){ v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; @@ -1006,6 +1006,8 @@ if( (v_pts_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag<0) } // demuxer2 +v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate; + ptimer_start = GetTimerMS(); switch(mux_v->codec){ @@ -1020,8 +1022,16 @@ case VCODEC_FRAMENO: default: // decode_video will callback down to ve_*.c encoders, through the video filters blit_frame=decode_video(sh_video,start,in_size,(skip_flag>0)?1:0); - if(skip_flag>0) break; - if(!blit_frame) aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0); // empty. + if(!blit_frame && skip_flag<=0){ + // unwanted skipping of a frame, what to do? + if(skip_limit==0){ + // skipping not allowed -> write empty frame: + aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0); + } else { + // skipping allowed -> skip it and distriubute timer error: + v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; + } + } } videosamples++; |