Mercurial > mplayer.hg
comparison mplayer.c @ 18315:5646b8d9654c
Remove useless "#if 0" blocks
author | uau |
---|---|
date | Thu, 27 Apr 2006 13:16:40 +0000 |
parents | 3b5b7e78b9af |
children | b3be7df634b0 |
comparison
equal
deleted
inserted
replaced
18314:39f1bc23b65e | 18315:5646b8d9654c |
---|---|
3942 delay=sh_audio->delay; | 3942 delay=sh_audio->delay; |
3943 delay+=(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps; | 3943 delay+=(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps; |
3944 } | 3944 } |
3945 delay += sh_audio->a_out_buffer_len*playback_speed/(float)ao_data.bps; | 3945 delay += sh_audio->a_out_buffer_len*playback_speed/(float)ao_data.bps; |
3946 | 3946 |
3947 #if 0 | |
3948 if(pts_from_bps){ | |
3949 // PTS = sample_no / samplerate | |
3950 unsigned int samples= | |
3951 // (sh_audio->audio.dwSampleSize)? | |
3952 // ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : | |
3953 ds_tell_block(d_audio); // <- used for VBR audio | |
3954 samples+=sh_audio->audio.dwStart; // offset | |
3955 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; | |
3956 delay_corrected=1; | |
3957 a_pts-=(sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
3958 } else | |
3959 #endif | |
3960 { | 3947 { |
3961 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) | 3948 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) |
3962 a_pts = sh_audio->pts; | 3949 a_pts = sh_audio->pts; |
3963 if (a_pts == MP_NOPTS_VALUE) { | 3950 if (a_pts == MP_NOPTS_VALUE) { |
3964 // Decoder doesn't support tracking timestamps or demuxer doesn't | 3951 // Decoder doesn't support tracking timestamps or demuxer doesn't |
4864 /* FIXME there should be real seeking for vobsub */ | 4851 /* FIXME there should be real seeking for vobsub */ |
4865 if(sh_video) sh_video->pts=d_video->pts; | 4852 if(sh_video) sh_video->pts=d_video->pts; |
4866 if (vo_vobsub) | 4853 if (vo_vobsub) |
4867 //vobsub_reset(vo_vobsub); | 4854 //vobsub_reset(vo_vobsub); |
4868 vobsub_seek(vo_vobsub,sh_video->pts); | 4855 vobsub_seek(vo_vobsub,sh_video->pts); |
4869 #if 0 | |
4870 if(sh_video && d_video->packs == 0) | |
4871 ds_fill_buffer(d_video); | |
4872 if(sh_audio){ | |
4873 if(d_audio->packs == 0) | |
4874 ds_fill_buffer(d_audio); | |
4875 if( mp_msg_test(MSGT_AVSYNC,MSGL_V) ){ | |
4876 float a_pts=d_audio->pts; | |
4877 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
4878 mp_msg(MSGT_AVSYNC,MSGL_V,"SEEK: A: %5.3f V: %5.3f A-V: %5.3f \n",a_pts,d_video->pts,a_pts-d_video->pts); | |
4879 } | |
4880 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct: ? \r",d_audio->pts,d_video->pts,0.0f); | |
4881 } else { | |
4882 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A: --- V:%6.1f \r",d_video->pts); | |
4883 } | |
4884 #endif | |
4885 fflush(stdout); | 4856 fflush(stdout); |
4886 | 4857 |
4887 if(sh_video){ | 4858 if(sh_video){ |
4888 current_module="seek_video_reset"; | 4859 current_module="seek_video_reset"; |
4889 resync_video_stream(sh_video); | 4860 resync_video_stream(sh_video); |