[Mplayer-cvslog] CVS: main asfheader.c,1.3,1.4 dec_audio.c,1.3,1.4 help_avp.h,1.1.1.1,1.2 help_mp.h,1.3,1.4 mplayer.c,1.41,1.42
GEREOFFY
arpi_esp at users.sourceforge.net
Wed Apr 11 03:38:59 CEST 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv11038
Modified Files:
asfheader.c dec_audio.c help_avp.h help_mp.h mplayer.c
Log Message:
less, and more informal printfs
Index: asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/asfheader.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** asfheader.c 2001/04/06 01:18:59 1.3
--- asfheader.c 2001/04/11 01:38:56 1.4
***************
*** 106,110 ****
#if 1
! printf("ASF file! (subchunks: %d)\n",asfh.cno);
while(!stream_eof(demuxer->stream)){
int pos,endpos;
--- 106,110 ----
#if 1
! //printf("ASF file! (subchunks: %d)\n",asfh.cno);
while(!stream_eof(demuxer->stream)){
int pos,endpos;
***************
*** 114,121 ****
endpos=pos+objh.size;
// for(i=0;i<16;i++) printf("%02X ",objh.guid[i]);
! printf("0x%08X [%s] %d\n",pos, asf_chunk_type(objh.guid),(int) objh.size);
switch(*((unsigned int*)&objh.guid)){
case 0xB7DC0791: // guid_stream_header
stream_read(demuxer->stream,(char*) &streamh,sizeof(streamh));
printf("stream type: %s\n",asf_chunk_type(streamh.type));
printf("stream concealment: %s\n",asf_chunk_type(streamh.concealment));
--- 114,122 ----
endpos=pos+objh.size;
// for(i=0;i<16;i++) printf("%02X ",objh.guid[i]);
! //printf("0x%08X [%s] %d\n",pos, asf_chunk_type(objh.guid),(int) objh.size);
switch(*((unsigned int*)&objh.guid)){
case 0xB7DC0791: // guid_stream_header
stream_read(demuxer->stream,(char*) &streamh,sizeof(streamh));
+ if(verbose){
printf("stream type: %s\n",asf_chunk_type(streamh.type));
printf("stream concealment: %s\n",asf_chunk_type(streamh.concealment));
***************
*** 123,126 ****
--- 124,128 ----
printf("unk1: %lX unk2: %X\n",streamh.unk1,streamh.unk2);
printf("FILEPOS=0x%X\n",stream_tell(demuxer->stream));
+ }
// type-specific data:
stream_read(demuxer->stream,(char*) buffer,streamh.type_size);
***************
*** 139,143 ****
asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1;
}
! printf("ASF audio scrambling: %d x %d x %d\n",asf_scrambling_h,asf_scrambling_w,asf_scrambling_b);
if(demuxer->audio->id==-1) demuxer->audio->id=streamh.stream_no & 0x7F;
break;
--- 141,145 ----
asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1;
}
! printf("ASF: audio scrambling: %d x %d x %d\n",asf_scrambling_h,asf_scrambling_w,asf_scrambling_b);
if(demuxer->audio->id==-1) demuxer->audio->id=streamh.stream_no & 0x7F;
break;
***************
*** 160,164 ****
case 0x8CABDCA1: // guid_file_header
stream_read(demuxer->stream,(char*) &fileh,sizeof(fileh));
! printf("packets: %d flags: %d pack_size: %d frame_size: %d\n",(int)fileh.packets,(int)fileh.flags,(int)fileh.packetsize,(int)fileh.frame_size);
asf_packet=malloc(fileh.packetsize); // !!!
break;
--- 162,166 ----
case 0x8CABDCA1: // guid_file_header
stream_read(demuxer->stream,(char*) &fileh,sizeof(fileh));
! if(verbose) printf("ASF: packets: %d flags: %d pack_size: %d frame_size: %d\n",(int)fileh.packets,(int)fileh.flags,(int)fileh.packetsize,(int)fileh.frame_size);
asf_packet=malloc(fileh.packetsize); // !!!
break;
Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dec_audio.c 2001/04/07 21:27:57 1.3
--- dec_audio.c 2001/04/11 01:38:56 1.4
***************
*** 30,34 ****
#else
// Win32 DShow audio codec:
! printf("DShow_audio: channs=%d rate=%d\n",sh_audio->channels,sh_audio->samplerate);
if(DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,&sh_audio->wf)){
--- 30,34 ----
#else
// Win32 DShow audio codec:
! // printf("DShow_audio: channs=%d rate=%d\n",sh_audio->channels,sh_audio->samplerate);
if(DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,&sh_audio->wf)){
Index: help_avp.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_avp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** help_avp.h 2001/02/24 20:28:35 1.1.1.1
--- help_avp.h 2001/04/11 01:38:56 1.2
***************
*** 1,4 ****
static char* banner_text=
! "\n"
"MPlayer v0.10 [AVI parser] (C) 2000. Arpad Gereoffy <arpi at esp-team.scene.hu>\n"
"\n";
--- 1,4 ----
static char* banner_text=
! "\n\n"
"MPlayer v0.10 [AVI parser] (C) 2000. Arpad Gereoffy <arpi at esp-team.scene.hu>\n"
"\n";
Index: help_mp.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** help_mp.h 2001/03/24 23:03:37 1.3
--- help_mp.h 2001/04/11 01:38:56 1.4
***************
*** 1,4 ****
static char* banner_text=
! "\n"
"MPlayer " VERSION " (C) 2000-2001 Arpad Gereoffy <arpi at esp-team.scene.hu>\n"
"\n";
--- 1,4 ----
static char* banner_text=
! "\n\n"
"MPlayer " VERSION " (C) 2000-2001 Arpad Gereoffy <arpi at esp-team.scene.hu>\n"
"\n";
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** mplayer.c 2001/04/11 00:35:57 1.41
--- mplayer.c 2001/04/11 01:38:56 1.42
***************
*** 324,328 ****
void exit_player(char* how){
if(how) printf("\nExiting... (%s)\n",how);
! printf("max framesize was %d bytes\n",max_framesize);
// restore terminal:
getch2_disable();
--- 324,328 ----
void exit_player(char* how){
if(how) printf("\nExiting... (%s)\n",how);
! if(verbose) printf("max framesize was %d bytes\n",max_framesize);
// restore terminal:
getch2_disable();
***************
*** 790,794 ****
has_audio=0;
} else {
! printf("Found audio codec: %s drv=%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
has_audio=sh_audio->codec->driver;
}
--- 790,794 ----
has_audio=0;
} else {
! printf("Found audio codec: [%s] drv:%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
has_audio=sh_audio->codec->driver;
}
***************
*** 801,805 ****
printf("Couldn't initialize audio codec! -> nosound\n");
} else {
! printf("AUDIO: samplerate=%d channels=%d bps=%d\n",has_audio,sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize);
}
}
--- 801,805 ----
printf("Couldn't initialize audio codec! -> nosound\n");
} else {
! printf("AUDIO: samplerate=%d channels=%d bps=%d\n",sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize);
}
}
***************
*** 815,819 ****
has_video=sh_video->codec->driver;
! printf("Found video codec: %s drv=%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
for(i=0;i<CODECS_MAX_OUTFMT;i++){
--- 815,819 ----
has_video=sh_video->codec->driver;
! printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
for(i=0;i<CODECS_MAX_OUTFMT;i++){
***************
*** 1037,1042 ****
}
! if(verbose) printf("Destination size: %d x %d out_fmt=%0X\n",
! screen_size_x,screen_size_y,out_fmt);
if(verbose) printf("video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
--- 1037,1059 ----
}
! { const vo_info_t *info = video_out->get_info();
! printf("VO: [%s] %dx%d => %dx%d %s%s%s ",info->short_name,
! movie_size_x,movie_size_y,
! screen_size_x,screen_size_y,
! fullscreen?"fs ":"",
! vidmode?"vm ":"",
! softzoom?"zoom ":""
! // fullscreen|(vidmode<<1)|(softzoom<<2)
! );
! if((out_fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
! printf("BGR%d\n",out_fmt&255); else
! if((out_fmt&IMGFMT_BGR_MASK)==IMGFMT_RGB)
! printf("RGB%d\n",out_fmt&255); else
! if(out_fmt==IMGFMT_YUY2) printf("YUY2\n"); else
! if(out_fmt==IMGFMT_YV12) printf("YV12\n");
! }
!
! // if(verbose) printf("Destination size: %d x %d out_fmt=%0X\n",
! // screen_size_x,screen_size_y,out_fmt);
if(verbose) printf("video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
***************
*** 1194,1200 ****
! if(has_audio){
! printf("Audio: type: %d samplerate: %d channels: %d bps: %d\n",has_audio,sh_audio->samplerate,sh_audio->channels,sh_audio->samplesize);
! } else {
printf("Audio: no sound\n");
if(verbose) printf("Freeing %d unused audio chunks\n",d_audio->packs);
--- 1211,1215 ----
! if(!has_audio){
printf("Audio: no sound\n");
if(verbose) printf("Freeing %d unused audio chunks\n",d_audio->packs);
***************
*** 1217,1224 ****
audio_delay-=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)/default_fps;
// audio_delay-=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)/default_fps;
! printf("AVI Initial frame delay: %5.3f\n",(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)/default_fps);
! printf("v: audio_delay=%5.3f buffer_delay=%5.3f a_pts=%5.3f a_frame=%5.3f\n",
! audio_delay,buffer_delay,a_pts,a_frame);
! printf("START: a_pts=%5.3f v_pts=%5.3f \n",d_audio->pts,d_video->pts);
delay_corrected=0; // has to correct PTS diffs
d_video->pts=0;d_audio->pts=0; // PTS is outdated now!
--- 1232,1241 ----
audio_delay-=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)/default_fps;
// audio_delay-=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)/default_fps;
! if(verbose){
! printf("AVI Initial frame delay: %5.3f\n",(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)/default_fps);
! printf("v: audio_delay=%5.3f buffer_delay=%5.3f a_pts=%5.3f a_frame=%5.3f\n",
! audio_delay,buffer_delay,a_pts,a_frame);
! printf("START: a_pts=%5.3f v_pts=%5.3f \n",d_audio->pts,d_video->pts);
! }
delay_corrected=0; // has to correct PTS diffs
d_video->pts=0;d_audio->pts=0; // PTS is outdated now!
***************
*** 1617,1620 ****
--- 1634,1638 ----
//a_pts-=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,buffer_delay,d_audio->pts,d_video->pts);
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list