mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 432:5251b0c57e39

sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)

author	arpi_esp
date	Sun, 15 Apr 2001 14:33:49 +0000
parents	c106cb97db06
children	50955d1a56c1

comparison

equal deleted inserted replaced

-:c106cb97db06
+:5251b0c57e39
 printf("AVI: No Audio stream found...  ->nosound\n");
 has_audio=0;
 sh_audio=NULL;
 } else {
 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
-sh_audio->format=sh_audio->wf.wFormatTag;
+sh_audio->format=sh_audio->wf->wFormatTag;
 }
 }
 // calc. FPS:
 sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
 sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
 avi_header.bitrate=avi_header.movi_end-avi_header.movi_start-avi_header.idx_size*8;
 if(sh_audio) avi_header.bitrate-=sh_audio->audio.dwLength;
 if(verbose) printf("AVI video length=%d\n",avi_header.bitrate);
 avi_header.bitrate=((float)avi_header.bitrate/(float)sh_video->video.dwLength)*sh_video->fps;
 printf("VIDEO:  [%.4s]  %dx%d  %dbpp  %4.2f fps  %5.1f kbps (%4.1f kbyte/s)\n",
-&sh_video->bih.biCompression,
+&sh_video->bih->biCompression,
-sh_video->bih.biWidth,
+sh_video->bih->biWidth,
-sh_video->bih.biHeight,
+sh_video->bih->biHeight,
-sh_video->bih.biBitCount,
+sh_video->bih->biBitCount,
 sh_video->fps,
 avi_header.bitrate*0.008f,
 avi_header.bitrate/1024.0f );
 break;
 }
 printf("ASF: No Audio stream found...  ->nosound\n");
 has_audio=0;
 sh_audio=NULL;
 } else {
 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
-sh_audio->format=sh_audio->wf.wFormatTag;
+sh_audio->format=sh_audio->wf->wFormatTag;
 }
 }
 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms
 printf("VIDEO:  [%.4s]  %dx%d  %dbpp\n",
-&sh_video->bih.biCompression,
+&sh_video->bih->biCompression,
-sh_video->bih.biWidth,
+sh_video->bih->biWidth,
-sh_video->bih.biHeight,
+sh_video->bih->biHeight,
-sh_video->bih.biBitCount);
+sh_video->bih->biBitCount);
 break;
 }
 case DEMUXER_TYPE_MPEG_ES: {
 d_audio->type=0;
 has_audio=0;sh_audio=NULL; // ES streams has no audio channel
 // Determine image properties:
 switch(file_format){
 case DEMUXER_TYPE_AVI:
 case DEMUXER_TYPE_ASF: {
 // display info:
-sh_video->format=sh_video->bih.biCompression;
+sh_video->format=sh_video->bih->biCompression;
-sh_video->disp_w=sh_video->bih.biWidth;
+sh_video->disp_w=sh_video->bih->biWidth;
-sh_video->disp_h=abs(sh_video->bih.biHeight);
+sh_video->disp_h=abs(sh_video->bih->biHeight);
 break;
 }
 case DEMUXER_TYPE_MPEG_ES:
 case DEMUXER_TYPE_MPEG_PS: {
 // Find sequence_header first:
 }
 //================== Init VIDEO (codec & libvo) ==========================
 // Go through the codec.conf and find the best codec...
-sh_video->codec=find_codec(sh_video->format,(unsigned int*) &sh_video->bih.biCompression,NULL,0);
+sh_video->codec=find_codec(sh_video->format,(unsigned int*) &sh_video->bih->biCompression,NULL,0);
 if(!sh_video->codec){
 printf("Can't find codec for video format 0x%X !\n",sh_video->format);
 exit(1);
 }
 //has_video=sh_video->codec->driver;
 #ifndef USE_DIRECTSHOW
 printf("MPlayer was compiled WITHOUT directshow support!\n");
 exit(1);
 #else
 sh_video->our_out_buffer=NULL;
-if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, &sh_video->bih, 0, &sh_video->our_out_buffer)){
+if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, &sh_video->our_out_buffer)){
 printf("ERROR: Couldn't open required DirectShow codec: %s\n",sh_video->codec->dll);
 printf("Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n");
 printf("package from:  ftp://thot.banki.hu/esp-team/linux/MPlayer/w32codec.zip  !\n");
 printf("Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n");
 exit(1);
 }
 case 3: {  // OpenDivX
 if(verbose) printf("OpenDivX video codec\n");
 { DEC_PARAM dec_param;
 DEC_SET dec_set;
-	dec_param.x_dim = sh_video->bih.biWidth;
+	dec_param.x_dim = sh_video->bih->biWidth;
-	dec_param.y_dim = sh_video->bih.biHeight;
+	dec_param.y_dim = sh_video->bih->biHeight;
 	dec_param.color_depth = 32;
 	decore(0x123, DEC_OPT_INIT, &dec_param, NULL);
 	dec_set.postproc_level = divx_quality;
 	decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
 }
 unsigned int t2;
 int in_size=ds_get_packet(d_video,&start);
 if(in_size<0){ eof=1;break;}
 if(in_size>max_framesize) max_framesize=in_size;
-sh_video->bih.biSizeImage = in_size;
+if(in_size){
+sh_video->bih->biSizeImage = in_size;
 //      ret = ICDecompress(avi_header.hic, ICDECOMPRESS_NOTKEYFRAME|(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL),
 ret = ICDecompress(sh_video->hic, ICDECOMPRESS_NOTKEYFRAME,
-&sh_video->bih,   start,
+sh_video->bih,   start,
 &sh_video->o_bih, sh_video->our_out_buffer);
 if(ret){ printf("Error decompressing frame, err=%d\n",ret);break; }
+}
 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
 video_out->draw_frame((uint8_t **)&sh_video->our_out_buffer);
 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f;
 break;
 #if 1
 /*================ A-V TIMESTAMP CORRECTION: =========================*/
 if(has_audio){
 if(pts_from_bps && (file_format==DEMUXER_TYPE_AVI)){
 //      a_pts=(float)ds_tell(d_audio)/sh_audio->wf.nAvgBytesPerSec-(buffer_delay+audio_delay);
-a_pts=(float)ds_tell(d_audio)/sh_audio->wf.nAvgBytesPerSec-(buffer_delay);
+a_pts=(float)ds_tell(d_audio)/sh_audio->wf->nAvgBytesPerSec-(buffer_delay);
 delay_corrected=1; // hack
 } else
 if(d_audio->pts){
 //      printf("\n=== APTS  a_pts=%5.3f  v_pts=%5.3f ===  \n",d_audio->pts,d_video->pts);
 #if 1
 int apos=0;
 int last=0;
 int len=0;
 // calc new audio position in audio stream: (using avg.bps value)
-curr_audio_pos=(avi_video_pts) * sh_audio->wf.nAvgBytesPerSec;
+curr_audio_pos=(avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
 if(curr_audio_pos<0)curr_audio_pos=0;
 #if 1
 curr_audio_pos&=~15; // requires for PCM formats!!!
 #else
-curr_audio_pos/=sh_audio->wf.nBlockAlign;
+curr_audio_pos/=sh_audio->wf->nBlockAlign;
-curr_audio_pos*=sh_audio->wf.nBlockAlign;
+curr_audio_pos*=sh_audio->wf->nBlockAlign;
 avi_header.audio_seekable=1;
 #endif
 // find audio chunk pos:
 for(i=0;i<video_chunk_pos;i++){
 avi_header.idx_pos=audio_chunk_pos;
 if(!(sh_audio->codec->flags&CODECS_FLAG_SEEKABLE)){
 #if 0
 //             curr_audio_pos=apos; // selected audio codec can't seek in chunk
-skip_audio_secs=(float)skip_audio_bytes/(float)sh_audio->wf.nAvgBytesPerSec;
+skip_audio_secs=(float)skip_audio_bytes/(float)sh_audio->wf->nAvgBytesPerSec;
 //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",skip_audio_bytes,skip_audio_secs);
 skip_audio_bytes=0;
 #else
-int d=skip_audio_bytes % sh_audio->wf.nBlockAlign;
+int d=skip_audio_bytes % sh_audio->wf->nBlockAlign;
 skip_audio_bytes-=d;
 //             curr_audio_pos-=d;
-skip_audio_secs=(float)d/(float)sh_audio->wf.nAvgBytesPerSec;
+skip_audio_secs=(float)d/(float)sh_audio->wf->nAvgBytesPerSec;
 //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",d,skip_audio_secs);
 #endif
 }
 // now: audio_chunk_pos=pos in index
 //      skip_audio_bytes=bytes to skip from that chunk

Mercurial > mplayer.hg

comparison mplayer.c @ 432:5251b0c57e39