comparison mencoder.c @ 9746:27fff718ede6

Stream cleanup, don't use blah_on options anymore.
author albeu
date Sun, 30 Mar 2003 17:07:31 +0000
parents b9f43efd98e7
children 6586ec1f6ee4
comparison
equal deleted inserted replaced
9745:c79bcf85f68c 9746:27fff718ede6
90 extern int cache_fill_status; 90 extern int cache_fill_status;
91 #else 91 #else
92 #define cache_fill_status 0 92 #define cache_fill_status 0
93 #endif 93 #endif
94 94
95 int vcd_track=0;
96 int audio_id=-1; 95 int audio_id=-1;
97 int video_id=-1; 96 int video_id=-1;
98 int dvdsub_id=-1; 97 int dvdsub_id=-1;
99 int vobsub_id=-1; 98 int vobsub_id=-1;
100 static char* audio_lang=NULL; 99 static char* audio_lang=NULL;
420 filename = play_tree_iter_get_file(playtree_iter,1); 419 filename = play_tree_iter_get_file(playtree_iter,1);
421 } 420 }
422 } 421 }
423 #endif 422 #endif
424 423
425 if(!filename && !vcd_track && !dvd_title && !tv_param_on && !dvbin_param_on){ 424 if(!filename){
426 printf(MSGTR_MissingFilename); 425 printf(MSGTR_MissingFilename);
427 mencoder_exit(1,NULL); 426 mencoder_exit(1,NULL);
428 } 427 }
429 428
430 mp_msg_set_level(verbose+MSGL_STATUS); 429 mp_msg_set_level(verbose+MSGL_STATUS);
446 #endif 445 #endif
447 #endif 446 #endif
448 447
449 vo_init_osd(); 448 vo_init_osd();
450 449
451 stream=open_stream(filename,vcd_track,&file_format); 450 stream=open_stream(filename,0,&file_format);
452 451
453 if(!stream){ 452 if(!stream){
454 printf(MSGTR_CannotOpenFile_Device); 453 printf(MSGTR_CannotOpenFile_Device);
455 mencoder_exit(1,NULL); 454 mencoder_exit(1,NULL);
456 } 455 }
897 fprintf(stderr,"Increasing audio density to 4\n"); 896 fprintf(stderr,"Increasing audio density to 4\n");
898 audio_density = 4; 897 audio_density = 4;
899 } 898 }
900 } 899 }
901 900
902 if(tv_param_on == 1) 901 if(file_format == DEMUXER_TYPE_TV)
903 { 902 {
904 fprintf(stderr,"Forcing audio preload to 0, max pts correction to 0\n"); 903 fprintf(stderr,"Forcing audio preload to 0, max pts correction to 0\n");
905 audio_preload = 0.0; 904 audio_preload = 0.0;
906 default_max_pts_correction = 0; 905 default_max_pts_correction = 0;
907 } 906 }
1112 videosamples++; 1111 videosamples++;
1113 videorate+=(GetTimerMS() - ptimer_start); 1112 videorate+=(GetTimerMS() - ptimer_start);
1114 1113
1115 if(skip_flag<0){ 1114 if(skip_flag<0){
1116 // duplicate frame 1115 // duplicate frame
1117 if(!tv_param_on && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag); 1116 if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
1118 while(skip_flag<0){ 1117 while(skip_flag<0){
1119 duplicatedframes++; 1118 duplicatedframes++;
1120 muxer_write_chunk(mux_v,0,0); 1119 muxer_write_chunk(mux_v,0,0);
1121 ++skip_flag; 1120 ++skip_flag;
1122 } 1121 }
1123 } else 1122 } else
1124 if(skip_flag>0){ 1123 if(skip_flag>0){
1125 // skip frame 1124 // skip frame
1126 if(!tv_param_on && !verbose) printf(MSGTR_SkipFrame); 1125 if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_SkipFrame);
1127 skippedframes++; 1126 skippedframes++;
1128 --skip_flag; 1127 --skip_flag;
1129 } 1128 }
1130 1129
1131 if(sh_audio && !demuxer2){ 1130 if(sh_audio && !demuxer2){