Mercurial > mplayer.hg
comparison mencoder.c @ 17569:6c541a8421ca
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
| author | corey |
|---|---|
| date | Thu, 09 Feb 2006 19:39:51 +0000 |
| parents | f580a7755ac5 |
| children | 2fd66535616a |
comparison
equal
deleted
inserted
replaced
| 17568:2275417ad349 | 17569:6c541a8421ca |
|---|---|
| 1034 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | 1034 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) |
| 1035 d += 60*a; | 1035 d += 60*a; |
| 1036 else | 1036 else |
| 1037 sscanf(seek_to_sec, "%f", &d); | 1037 sscanf(seek_to_sec, "%f", &d); |
| 1038 | 1038 |
| 1039 demux_seek(demuxer, d, audio_delay, 1); | 1039 demux_seek(demuxer, d, 1); |
| 1040 // there is 2 way to handle the -ss option in 3-pass mode: | 1040 // there is 2 way to handle the -ss option in 3-pass mode: |
| 1041 // > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only | 1041 // > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only |
| 1042 // > 2. do all the 3 passes with the same -ss value | 1042 // > 2. do all the 3 passes with the same -ss value |
| 1043 // this line enables behaviour 1. (and kills 2. at the same time): | 1043 // this line enables behaviour 1. (and kills 2. at the same time): |
| 1044 // if(demuxer2) demux_seek(demuxer2, d, audio_delay, 1); | 1044 // if(demuxer2) demux_seek(demuxer2, d, 1); |
| 1045 } | 1045 } |
| 1046 | 1046 |
| 1047 if (out_file_format == MUXER_TYPE_MPEG) | 1047 if (out_file_format == MUXER_TYPE_MPEG) |
| 1048 { | 1048 { |
| 1049 if (audio_preload > 0.4) { | 1049 if (audio_preload > 0.4) { |
| 1767 | 1767 |
| 1768 if (!sh_video) return 0; | 1768 if (!sh_video) return 0; |
| 1769 if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do... | 1769 if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do... |
| 1770 | 1770 |
| 1771 if (!edl_seek_type) { | 1771 if (!edl_seek_type) { |
| 1772 if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){ | 1772 if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, 0)){ |
| 1773 sh_video->pts = demuxer->video->pts; | 1773 sh_video->pts = demuxer->video->pts; |
| 1774 //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts); | 1774 //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts); |
| 1775 resync_video_stream(sh_video); | 1775 resync_video_stream(sh_video); |
| 1776 //if(vo_spudec) spudec_reset(vo_spudec); | 1776 //if(vo_spudec) spudec_reset(vo_spudec); |
| 1777 if (audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy); | 1777 if (audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy); |