comparison mencoder.c @ 17023:dd5be8f8d16d

buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
author nicodvb
date Mon, 21 Nov 2005 22:53:14 +0000
parents 3047b92e8402
children cf6bfdf41143
comparison
equal deleted inserted replaced
17022:2627a9e6570c 17023:dd5be8f8d16d
831 force_fourcc[2], force_fourcc[3]); 831 force_fourcc[2], force_fourcc[3]);
832 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ForcingOutputFourcc, 832 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ForcingOutputFourcc,
833 mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression); 833 mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression);
834 } 834 }
835 835
836 if(muxer->fix_stream_parameters)
837 muxer_stream_fix_parameters(muxer,mux_v);
838 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! 836 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
839 837
840 // ============= AUDIO =============== 838 // ============= AUDIO ===============
841 if(sh_audio){ 839 if(sh_audio){
842 840
931 929
932 if(audio_delay_fix!=0.0){ 930 if(audio_delay_fix!=0.0){
933 mux_a->h.dwStart=audio_delay_fix*mux_a->h.dwRate/mux_a->h.dwScale; 931 mux_a->h.dwStart=audio_delay_fix*mux_a->h.dwRate/mux_a->h.dwScale;
934 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_SettingAudioDelay,mux_a->h.dwStart*mux_a->h.dwScale/(float)mux_a->h.dwRate); 932 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_SettingAudioDelay,mux_a->h.dwStart*mux_a->h.dwScale/(float)mux_a->h.dwRate);
935 } 933 }
936 if(muxer->fix_stream_parameters)
937 muxer_stream_fix_parameters(muxer,mux_a);
938 934
939 } // if(sh_audio) 935 } // if(sh_audio)
940
941 mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_WritingAVIHeader);
942 if (muxer->cont_write_header) muxer_write_header(muxer);
943 936
944 decoded_frameno=0; 937 decoded_frameno=0;
945 938
946 signal(SIGINT,exit_sighandler); // Interrupt from keyboard 939 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
947 signal(SIGQUIT,exit_sighandler); // Quit from keyboard 940 signal(SIGQUIT,exit_sighandler); // Quit from keyboard