mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 1467:f352e1e951ba

stream opening -> open.c, initialframes ignored

author	arpi
date	Thu, 09 Aug 2001 01:17:24 +0000
parents	7845f6d7c4ba
children	6f9167f0fcca

comparison

equal deleted inserted replaced

-:7845f6d7c4ba
+:f352e1e951ba
 #ifdef HAVE_LIRC
 #include "lirc_mp.h"
 #endif
 #include "help_mp.h"
-#ifdef STREAMING
-#include "url.h"
-#include "network.h"
-static URL_t* url;
-#endif
 #define DEBUG if(0)
 #ifdef HAVE_GUI
 int nogui=1;
 }
 #endif
 exit_player(NULL);
 }
-extern int vcd_get_track_end(int fd,int track);
+extern stream_t* open_stream(char* filename,int vcd_track,int* file_format);
 extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
 // dec_audio.c:
 extern int init_audio(sh_audio_t *sh_audio);
 extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen);
 char* filename=NULL; //"MI2-Trailer.avi";
 stream_t* stream=NULL;
 int file_format=DEMUXER_TYPE_UNKNOWN;
 //
 int delay_corrected=1;
-#ifdef VCD_CACHE
-int vcd_cache_size=128;
-#endif
-#ifdef __FreeBSD__
-int bsize = VCD_SECTOR_SIZE;
-#endif
 char* title="MPlayer";
 // movie info:
 int out_fmt=0;
 //float a_frame=0;    // Audio
 float rel_seek_secs=0;
 int i;
-int f; // filedes
+int use_stdin=0; //int f; // filedes
 printf("%s",banner_text);
 #ifdef HAVE_GUI
 if ( nogui )
 // check .sub
 if(sub_name){
 subtitles=sub_read_file(sub_name);
 if(!subtitles) fprintf(stderr,"Can't load subtitles: %s\n",sub_name);
 } else {
-if ( sub_auto )
+if(sub_auto)  // auto load sub file ...
-{
+subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
-// auto load sub file ...
+if(!subtitles) subtitles=sub_read_file(get_path("default.sub")); // try default
-subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );
+}
-}
+#endif
-if ( subtitles == NULL ) subtitles=sub_read_file(get_path("default.sub")); // try default:
-}
+stream=open_stream(filename,vcd_track,&file_format);
-#endif
+if(!stream) return 1; // error...
+use_stdin=(!strcmp(filename,"-"));
-if(vcd_track){
-//============ Open VideoCD track ==============
-int ret,ret2;
-f=open(filename,O_RDONLY);
-if(f<0){ fprintf(stderr,"CD-ROM Device '%s' not found!\n",filename);return 1; }
-vcd_read_toc(f);
-ret2=vcd_get_track_end(f,vcd_track);
-if(ret2<0){ fprintf(stderr,"Error selecting VCD track! (get)\n");return 1;}
-ret=vcd_seek_to_track(f,vcd_track);
-if(ret<0){ fprintf(stderr,"Error selecting VCD track! (seek)\n");return 1;}
-seek_to_byte+=ret;
-if(verbose) printf("VCD start byte position: 0x%X  end: 0x%X\n",seek_to_byte,ret2);
-#ifdef VCD_CACHE
-vcd_cache_init(vcd_cache_size);
-#endif
-#ifdef __FreeBSD__
-if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) {
-perror ( "Error in CDRIOCSETBLOCKSIZE");
-}
-#endif
-stream=new_stream(f,STREAMTYPE_VCD);
-stream->start_pos=ret;
-stream->end_pos=ret2;
-} else {
-//============ Open plain FILE ============
-off_t len;
-if(!strcmp(filename,"-")){
-// read from stdin
-printf("Reading from stdin...\n");
-f=0; // 0=stdin
-stream=new_stream(f,STREAMTYPE_STREAM);
-} else {
-#ifdef STREAMING
-url = url_new(filename);
-if(url==NULL) {
-// failed to create a new URL, so it's not an URL (or a malformed URL)
-#endif
-f=open(filename,O_RDONLY);
-if(f<0){ fprintf(stderr,"File not found: '%s'\n",filename);return 1; }
-len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET);
-if (len == -1)
-	 perror("Error: lseek failed to obtain video file size");
-else
-if(verbose)
-#ifdef _LARGEFILE_SOURCE
-	 printf("File size is %lld bytes\n", (long long)len);
-#else
-	 printf("File size is %u bytes\n", (unsigned int)len);
-#endif
-stream=new_stream(f,STREAMTYPE_FILE);
-stream->end_pos=len;
-#ifdef STREAMING
-} else {
-file_format=autodetectProtocol( url, &f );
-if( file_format==DEMUXER_TYPE_UNKNOWN ) {
-fprintf(stderr,"Unable to open URL: %s\n", filename);
-url_free(url);
-return 1;
-} else {
-f=streaming_start( &url, f, file_format );
-if(f<0){ fprintf(stderr,"Unable to open URL: %s\n", url->url); return 1; }
-printf("Connected to server: %s\n", url->hostname );
-}
-stream=new_stream(f,STREAMTYPE_STREAM);
-}
-#endif
-}
-}
 #ifdef HAVE_LIBCSS
 if (dvdimportkey) {
 if (dvd_import_key(dvdimportkey)) {
 	fprintf(stderr,"Error processing DVD KEY.\n");
 {
 #endif
 #ifdef USE_TERMCAP
 load_termcap(NULL); // load key-codes
 #endif
-if(f) getch2_enable();
+if(!use_stdin) getch2_enable();
 #ifdef HAVE_GUI
 }
 #endif
 //========= Catch terminate signals: ================
 } else {
 if(!delay_corrected && d_audio->pts){
 //        float x=d_audio->pts-d_video->pts-(delay);
 float x=d_audio->pts-d_video->pts-(delay+audio_delay);
 float y=-(delay+audio_delay);
-printf("Initial PTS delay: %5.3f sec  (calculated: %5.3f)  audio_delay=%5.3f\n",x,y,audio_delay);
+float bps_a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
-	initial_pts_delay+=x;
+float bps_v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
-audio_delay+=x;
+printf("Initial PTS delay: %5.3f sec ->%5.3f (bps: %5.3f)  audio_delay=%5.3f\n",x,2*sh_video->frametime,bps_a_pts-bps_v_pts-(delay+audio_delay),audio_delay);
+	x=2*sh_video->frametime;
+//	initial_pts_delay+=x; audio_delay+=x;
 delay_corrected=1;
 if(verbose)
 printf("v: audio_delay=%5.3f  buffer_delay=%5.3f  a.pts=%5.3f  v.pts=%5.3f\n",
 audio_delay,delay,d_audio->pts,d_video->pts);
 }
 #endif
 while(
 #ifdef HAVE_LIRC
 lirc_mp_getinput()<=0 &&
 #endif
-(!f || getch2(20)<=0) && mplayer_get_key()<=0){
+(use_stdin || getch2(20)<=0) && mplayer_get_key()<=0){
 #ifndef USE_LIBVO2
 	     video_out->check_events();
 #endif
-if(!f) usec_sleep(1000); // do not eat the CPU
+if(use_stdin) usec_sleep(1000); // do not eat the CPU
 }
 osd_function=OSD_PLAY;
 #ifdef HAVE_GUI
 } else while( osd_function != OSD_PLAY ) usec_sleep( 1000 );
 #endif
 { int c;
 while(
 #ifdef HAVE_LIRC
 (c=lirc_mp_getinput())>0 ||
 #endif
-(f && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){
+(!use_stdin && (c=getch2(0))>0) || (c=mplayer_get_key())>0) switch(c){
 // seek 10 sec
 case KEY_RIGHT:
 osd_function=OSD_FFW;
 rel_seek_secs+=10;break;
 case KEY_LEFT:

Mercurial > mplayer.hg

comparison mplayer.c @ 1467:f352e1e951ba