mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 1639:9423cb98e63f

initial multifile support

author	arpi
date	Wed, 22 Aug 2001 21:35:44 +0000
parents	13aeaa05ac5e
children	b7dae998505c

comparison

equal deleted inserted replaced

-:671802bf867b
+:9423cb98e63f
 // restore terminal:
 #ifdef HAVE_GUI
 if ( nogui )
 #endif
 getch2_disable();
 #ifdef USE_LIBVO2
 if(video_out) vo2_close(video_out);
 #else
 if(video_out) video_out->uninit();
 #endif
 #ifdef HAVE_GUI
 if ( nogui )
 #endif
 lirc_mp_cleanup();
 #endif
 exit(1);
 }
 static char* current_module=NULL; // for debugging
 mp_msg_init(MSGL_STATUS);
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
 #ifdef HAVE_GUI
-if ( nogui )
+if ( nogui ) {
-{
+#endif
-#endif
 parse_cfgfiles();
-if ((num_filenames=parse_command_line(conf, argc, argv, envp, &filenames)) < 0) exit(1);
+num_filenames=parse_command_line(conf, argc, argv, envp, &filenames);
-printf("XXX num_filenames: %d\n",num_filenames);
+if(num_filenames<0) exit(1); // error parsing cmdline
-curr_filename=0;
+if(!num_filenames && !vcd_track && !dvd_title){
-filename=(num_filenames>0)?filenames[curr_filename]:NULL;
+	// no file/vcd/dvd -> show HELP:
+	printf("%s",help_text);
-mp_msg_init(verbose+MSGL_STATUS);
+	exit(0);
+}
 // Many users forget to include command line in bugreports...
 if(verbose){
 printf("CommandLine:");
 for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
 printf("\n");
+printf("num_filenames: %d\n",num_filenames);
 }
 #ifndef USE_LIBVO2
 if(video_driver && strcmp(video_driver,"help")==0){
 printf("Available video output drivers:\n");
 	printf("\t%s\t%s\n", info->short_name, info->name);
 }
 printf("\n");
 exit(0);
 }
 #ifdef HAVE_GUI
 }
 #endif
-if(!filename){
+mp_msg_init(verbose+MSGL_STATUS);
-if(!vcd_track && !dvd_title){
-printf("%s",help_text); exit(0);
+//------ load global data first ------
-}
-}
+// check codec.conf
+if(!parse_codec_cfg(get_path("codecs.conf"))){
+if(!parse_codec_cfg(DATADIR"/codecs.conf")){
+mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
+exit(1);
+}
+}
+// check font
+#ifdef USE_OSD
+if(font_name){
+vo_font=read_font_desc(font_name,font_factor,verbose>1);
+if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
+} else {
+// try default:
+vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
+if(!vo_font)
+vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
+}
+#endif
+#ifdef USE_SUB
+// check .sub
+if(sub_name){
+int l=strlen(sub_name);
+if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
+		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
+	  sub_utf8=1;
+subtitles=sub_read_file(sub_name);
+if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
+} else {
+if(sub_auto && filename)  // auto load sub file ...
+subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
+if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
+}
+#endif
+#ifdef HAVE_LIRC
+#ifdef HAVE_GUI
+if ( nogui )
+#endif
+lirc_mp_setup();
+#endif
+#ifdef USE_TERMCAP
+load_termcap(NULL); // load key-codes
+#endif
+//========= Catch terminate signals: ================
+// terminate requests:
+signal(SIGTERM,exit_sighandler); // kill
+signal(SIGHUP,exit_sighandler);  // kill -HUP  /  xterm closed
+#ifdef HAVE_GUI
+if ( nogui )
+#endif
+signal(SIGINT,exit_sighandler);  // Interrupt from keyboard
+signal(SIGQUIT,exit_sighandler); // Quit from keyboard
+// fatal errors:
+signal(SIGBUS,exit_sighandler);  // bus error
+signal(SIGSEGV,exit_sighandler); // segfault
+signal(SIGILL,exit_sighandler);  // illegal instruction
+signal(SIGFPE,exit_sighandler);  // floating point exc.
+signal(SIGABRT,exit_sighandler); // abort()
+// ******************* Now, let's see the per-file stuff ********************
+curr_filename=0;
+play_next_file:
+filename=(num_filenames>0)?filenames[curr_filename]:NULL;
 #ifdef USE_LIBVO2
+current_module="vo2_new";
 video_out=vo2_new(video_driver);
+current_module=NULL;
 #else
 // check video_out driver name:
 if (video_driver)
 	if ((i = strcspn(video_driver, ":")) > 0)
 	{
 }
 }
 #endif
 if(!video_out){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,video_driver?video_driver:"?");
-return 0;
+exit_player(MSGTR_Exit_error);
 }
 // check audio_out driver name:
 if (audio_driver)
 	if ((i = strcspn(audio_driver, ":")) > 0)
 audio_out = audio_out_drivers[i];break;
 }
 }
 if (!audio_out){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver);
-return 0;
+exit_player(MSGTR_Exit_error);
 }
 /*DSP!!  if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);*/
-// check codec.conf
-if(!parse_codec_cfg(get_path("codecs.conf"))){
+current_module="open_stream";
-if(!parse_codec_cfg(DATADIR"/codecs.conf")){
-mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
-exit(1);
-}
-}
-// check font
-#ifdef USE_OSD
-if(font_name){
-vo_font=read_font_desc(font_name,font_factor,verbose>1);
-if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
-} else {
-// try default:
-vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
-if(!vo_font)
-vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
-}
-#endif
-#ifdef USE_SUB
-// check .sub
-if(sub_name){
-int l=strlen(sub_name);
-if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
-		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
-	  sub_utf8=1;
-subtitles=sub_read_file(sub_name);
-if(!subtitles) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
-} else {
-if(sub_auto && filename)  // auto load sub file ...
-subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
-if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
-}
-#endif
 stream=open_stream(filename,vcd_track,&file_format);
-if(!stream) return 1; // error...
+if(!stream) exit_player(MSGTR_Exit_error); // error...
+stream->start_pos+=seek_to_byte;
 use_stdin=filename && (!strcmp(filename,"-"));
-stream->start_pos+=seek_to_byte;
 #ifdef HAVE_LIBCSS
+current_module="libcss";
 if (dvdimportkey) {
 if (dvd_import_key(dvdimportkey)) {
 	mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDkey);
-	exit(1);
+	exit_player(MSGTR_Exit_error);
 }
 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CmdlineDVDkey);
 }
 if (dvd_auth_device) {
 //  if (dvd_auth(dvd_auth_device,f)) {
 if (dvd_auth(dvd_auth_device,filename)) {
 GUI_MSG( mplErrorDVDAuth )
-exit(0);
+	exit_player(MSGTR_Exit_error);
 }
 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
 }
 #endif
 //============ Open & Sync stream and detect file format ===============
 if(!has_audio) audio_id=-2; // do NOT read audio packets...
+current_module="demux_open";
 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
-if(!demuxer) exit(1); // ERROR
+if(!demuxer) exit_player(MSGTR_Exit_error); // ERROR
 file_format=demuxer->file_format;
 d_audio=demuxer->audio;
 d_video=demuxer->video;
 // DUMP STREAMS:
 if(stream_dump_type){
 FILE *f;
 demux_stream_t *ds=NULL;
+current_module="dump";
 // select stream to dump
 switch(stream_dump_type){
 case 1: ds=d_audio;break;
 case 2: ds=d_video;break;
 case 3: ds=d_dvdsub;break;
 }
 if(!ds){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing);
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 // disable other streams:
 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; }
 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; }
 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; }
 // let's dump it!
 f=fopen(stream_dump_name?stream_dump_name:"stream.dump","wb");
-if(!f){ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);exit(1); }
+if(!f){
+mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
+exit_player(MSGTR_Exit_error);
+}
 while(!ds->eof){
 unsigned char* start;
 int in_size=ds_get_packet(ds,&start);
 if( (file_format==DEMUXER_TYPE_AVI || file_format==DEMUXER_TYPE_ASF)
 	&& stream_dump_type==2) fwrite(&in_size,1,4,f);
 if(in_size>0) fwrite(start,in_size,1,f);
 }
 fclose(f);
 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
-exit(1);
+exit_player(MSGTR_Exit_eof);
 }
 sh_audio=d_audio->sh;
 sh_video=d_video->sh;
+current_module="video_read_properties";
 if(sh_video){
-if(!video_read_properties(sh_video)) exit(1); // couldn't read header?
+if(!video_read_properties(sh_video)) exit_player(MSGTR_Exit_error); // couldn't read header?
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"[V] filefmt:%d  fourcc:0x%X  size:%dx%d  fps:%5.2f  ftime:=%6.4f\n",
 file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h,
 sh_video->fps,sh_video->frametime
 );
 if(!sh_video->fps && !force_fps){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_FPSnotspecified);
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 }
 fflush(stdout);
 if(!sh_video){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NoVideoStream);
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 //================== Init AUDIO (codec) ==========================
+current_module="init_audio_codec";
 if(sh_audio){
 // Go through the codec.conf and find the best codec...
 sh_audio->codec=NULL;
 if(audio_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceAudioFmt,audio_family);
 while(1){
 }
 }
 //================== Init VIDEO (codec & libvo) ==========================
+current_module="init_video_codec";
 // Go through the codec.conf and find the best codec...
 sh_video->codec=NULL;
 if(video_family!=-1) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_TryForceVideoFmt,video_family);
 while(1){
 sh_video->codec=find_codec(sh_video->format,
 video_family=-1;
 continue;
 }
 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
 mp_msg(MSGT_CPLAYER,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 // is next line needed anymore? - atmos ::
 if(!allow_dshow && sh_video->codec->driver==VFM_DSHOW) continue; // skip DShow
 else if(video_codec && strcmp(sh_video->codec->name,video_codec)) continue;
 else if(video_family!=-1 && sh_video->codec->driver!=video_family) continue;
 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X\n",vo_format_name(out_fmt),ret);
 if(ret) break;
 }
 if(i>=CODECS_MAX_OUTFMT){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VOincompCodec);
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 sh_video->outfmtidx=i;
 if(flip==-1){
 // autodetect flipping
 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug1: out_fmt=%s\n",vo_format_name(out_fmt));
 if(!init_video(sh_video)){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec);
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 if(auto_quality>0){
 // Auto quality option enabled
 output_quality=get_video_quality_max(sh_video);
 // encode file!!!
 FILE *encode_file=fopen(encode_name,"rb");
 if(encode_file){
 fclose(encode_file);
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_EncodeFileExists,encode_name);
-return 0;
+exit_player(MSGTR_Exit_error);
 }
 encode_file=fopen(encode_name,"wb");
 if(!encode_file){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantCreateEncodeFile);
-return 0;
+exit_player(MSGTR_Exit_error);
 }
 write_avi_header_1(encode_file,mmioFOURCC('d', 'i', 'v', 'x'),sh_video->fps,sh_video->disp_w,sh_video->disp_h);
 fclose(encode_file);
 encode_index_name=malloc(strlen(encode_name)+8);
 strcpy(encode_index_name,encode_name);
 // ========== Init keyboard FIFO (connection to libvo) ============
 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
+current_module="init_libvo";
 #ifdef X11_FULLSCREEN
 if(fullscreen){
 if(vo_init()){
 //if(verbose) printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen);
 #ifdef USE_LIBVO2
 if(!vo2_start(video_out,
 sh_video->disp_w,sh_video->disp_h,out_fmt,0,
 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO );
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 #else
 if(video_out->init(sh_video->disp_w,sh_video->disp_h,
 screen_size_x,screen_size_y,
 fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
 title,out_fmt)){
 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO);
-exit(1);
+exit_player(MSGTR_Exit_error);
 }
 #endif
 mp_msg(MSGT_CPLAYER,MSGL_V,"INFO: Video OUT driver init OK!\n");
 fflush(stdout);
 float AV_delay=0; // average of A-V timestamp differences
 double cvideo_base_vtime;
 double cvideo_base_vframe;
 double vdecode_time;
-#ifdef HAVE_LIRC
-#ifdef HAVE_GUI
-if ( nogui )
-#endif
-lirc_mp_setup();
-#endif
-#ifdef HAVE_GUI
-if ( nogui )
-{
-#endif
-#ifdef USE_TERMCAP
-load_termcap(NULL); // load key-codes
-#endif
-if(!use_stdin) getch2_enable();
-#ifdef HAVE_GUI
-}
-#endif
-//========= Catch terminate signals: ================
-// terminate requests:
-signal(SIGTERM,exit_sighandler); // kill
-signal(SIGHUP,exit_sighandler);  // kill -HUP  /  xterm closed
-#ifdef HAVE_GUI
-if ( nogui )
-#endif
-signal(SIGINT,exit_sighandler);  // Interrupt from keyboard
-signal(SIGQUIT,exit_sighandler); // Quit from keyboard
-// fatal errors:
-signal(SIGBUS,exit_sighandler);  // bus error
-signal(SIGSEGV,exit_sighandler); // segfault
-signal(SIGILL,exit_sighandler);  // illegal instruction
-signal(SIGFPE,exit_sighandler);  // floating point exc.
-signal(SIGABRT,exit_sighandler); // abort()
 //================ SETUP AUDIO ==========================
 current_module="setup_audio";
 if(sh_audio){
 if(audio_out){ audio_out->uninit(); audio_out=NULL;} // close device
 }
 current_module=NULL;
-//==================== START PLAYING =======================
+if(file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
-if(file_format==DEMUXER_TYPE_AVI && sh_audio){
-#if 0
-//a_pts=d_audio->pts;
-if(verbose) printf("Initial frame delay  A: %d  V: %d\n",(int)sh_audio->audio.dwInitialFrames,(int)sh_video->video.dwInitialFrames);
-if(!pts_from_bps){
-float x=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)*sh_video->frametime;
-//    audio_delay-=x;
-if(verbose) printf("AVI Initial frame delay: %5.3f\n",x);
-delay_corrected=0; // has to correct PTS diffs
-}
-if(verbose){
-//    printf("v: audio_delay=%5.3f  buffer_delay=%5.3f  a_pts=%5.3f  sh_audio->timer=%5.3f\n",
-//             audio_delay,audio_buffer_delay,a_pts,sh_audio->timer);
-printf("START:  a_pts=%5.3f  v_pts=%5.3f  \n",d_audio->pts,d_video->pts);
-}
-d_video->pts=0;d_audio->pts=0; // PTS is outdated now!
-#endif
-} else {
-pts_from_bps=0; // it must be 0 for mpeg/asf !
-}
 if(force_fps){
 sh_video->fps=force_fps;
 sh_video->frametime=1.0f/sh_video->fps;
 mp_msg(MSGT_CPLAYER,MSGL_INFO,"FPS forced to be %5.3f  (ftime: %5.3f)\n",sh_video->fps,sh_video->frametime);
 }
+//==================== START PLAYING =======================
 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
+if(!use_stdin) getch2_enable();  // prepare stdin for hotkeys...
 InitTimer();
 total_time_usage_start=GetTimer();
 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it!
 //if(playsize>outburst) playsize=outburst;
 // Update buffer if needed
+current_module="decode_audio";   // Enter AUDIO decoder module
 t=GetTimer();
-current_module="decode_audio";   // Enter AUDIO decoder module
 while(sh_audio->a_buffer_len<playsize && !d_audio->eof){
 int ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len],
 playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len);
 if(ret>0) sh_audio->a_buffer_len+=ret; else break;
 }
 audio_delay-=0.1;  // decrease audio buffer delay
 if(sh_audio) sh_audio->timer+=0.1;
 break;
 // quit
 case KEY_ESC: // ESC
+case 'q': exit_player(MSGTR_Exit_quit);
 case KEY_ENTER: // ESC
-case 'q': exit_player(MSGTR_Exit_quit);
+eof=1;  // jump to next file
+break;
 case 'g': grab_frames=2;break;
 // pause
 case 'p':
 case ' ':
 osd_function=OSD_PAUSE;
 } // while(!eof)
 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",eof);
+}
+++curr_filename;
+if(curr_filename<num_filenames){
+// partial uninit:
+// restore terminal:
+#ifdef HAVE_GUI
+if ( nogui )
+#endif
+getch2_disable();
+#ifdef USE_LIBVO2
+if(video_out) vo2_close(video_out);
+#else
+if(video_out) video_out->uninit();
+#endif
+video_out=NULL;
+if(audio_out) audio_out->uninit();
+audio_out=NULL;
+//  if(encode_name) avi_fixate();
+goto play_next_file;
+}
 exit_player(MSGTR_Exit_eof);
-}
 return 1;
 }

Mercurial > mplayer.hg

comparison mplayer.c @ 1639:9423cb98e63f