Mercurial > mplayer.hg

comparison mencoder.c @ 17910:5ae29dc47c17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
feed something (hopefully correct timestamps) into the video filter chain
author michael
date Tue, 21 Mar 2006 23:09:52 +0000
parents 155fa4f8b32a
children 3fe3b2b3a6ce
comparison
equal deleted inserted replaced
17909:f7048eaffa85 17910:5ae29dc47c17
1319 if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); 1319 if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
1320 break; 1320 break;
1321 default: 1321 default:
1322 // decode_video will callback down to ve_*.c encoders, through the video filters 1322 // decode_video will callback down to ve_*.c encoders, through the video filters
1323 blit_frame=decode_video(sh_video,frame_data.start,frame_data.in_size, 1323 blit_frame=decode_video(sh_video,frame_data.start,frame_data.in_size,
1324 skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE)); 1324 skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), mux_v->timer);
1325 1325
1326 if (sh_video->vf_inited < 0) mencoder_exit(1, NULL); 1326 if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);
1327 1327
1328 if(!blit_frame){ 1328 if(!blit_frame){
1329 if (play_n_frames >= 0) 1329 if (play_n_frames >= 0)
1737 } 1737 }
1738 if (sh_video->pts >= end_pts) done = 1; 1738 if (sh_video->pts >= end_pts) done = 1;
1739 1739
1740 if (vfilter) { 1740 if (vfilter) {
1741 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); 1741 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE);
1742 decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip); 1742 decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE);
1743 } 1743 }
1744 1744
1745 #ifdef USE_EDL 1745 #ifdef USE_EDL
1746 if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS, 1746 if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS,
1747 "EDL SKIP: Start: %.2f End: %.2f Current: V: %.2f A: %.2f \r", 1747 "EDL SKIP: Start: %.2f End: %.2f Current: V: %.2f A: %.2f \r",