[Mplayer-cvslog] CVS: main/libmpcodecs ad_acm.c, 1.12, 1.13 ad_alaw.c, 1.3, 1.4 ad_dk3adpcm.c, 1.6, 1.7 ad_dmo.c, 1.2, 1.3 ad_dshow.c, 1.5, 1.6 ad_faad.c, 1.14, 1.15 ad_ffmpeg.c, 1.15, 1.16 ad_imaadpcm.c, 1.7, 1.8 ad_liba52.c, 1.13, 1.14 ad_libmad.c, 1.3, 1.4 ad_mp3lib.c, 1.6, 1.7 ad_msadpcm.c, 1.10, 1.11 ad_msgsm.c, 1.4, 1.5

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv7128/libmpcodecs

Modified Files:
	ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dmo.c ad_dshow.c ad_faad.c 
	ad_ffmpeg.c ad_imaadpcm.c ad_liba52.c ad_libmad.c ad_mp3lib.c 
	ad_msadpcm.c ad_msgsm.c 
Log Message:
setting samplesize to 2 in decoders where neccessary.
Needed because initialization of sh_audio was moved from dec_audio to
demuxer.c, and some demuxers set samplesize incorrect or to 0.


Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ad_acm.c	26 Dec 2003 09:57:56 -0000	1.12
+++ ad_acm.c	21 Sep 2004 20:34:46 -0000	1.13
@@ -127,6 +127,7 @@
     sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
     sh_audio->channels=priv->o_wf->nChannels;
     sh_audio->samplerate=priv->o_wf->nSamplesPerSec;
+    sh_audio->samplesize=2;
 
     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/ACM audio codec init OK!\n");
     return 1;

Index: ad_alaw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_alaw.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ad_alaw.c	16 Oct 2002 16:49:58 -0000	1.3
+++ ad_alaw.c	21 Sep 2004 20:34:46 -0000	1.4
@@ -25,6 +25,7 @@
   sh_audio->channels=sh_audio->wf->nChannels;
   sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
   sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate;
+  sh_audio->samplesize=2;
   return 1;
 }
 

Index: ad_dk3adpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dk3adpcm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_dk3adpcm.c	31 Aug 2002 13:09:23 -0000	1.6
+++ ad_dk3adpcm.c	21 Sep 2004 20:34:46 -0000	1.7
@@ -84,6 +84,7 @@
   sh_audio->samplerate = sh_audio->wf->nSamplesPerSec;
   sh_audio->i_bps =
     (sh_audio->ds->ss_mul * sh_audio->samplerate) / sh_audio->ds->ss_div;
+  sh_audio->samplesize=2;
   return 1;
 }
 

Index: ad_dmo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dmo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_dmo.c	1 Dec 2002 16:44:11 -0000	1.2
+++ ad_dmo.c	21 Sep 2004 20:34:46 -0000	1.3
@@ -43,6 +43,7 @@
     sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
     sh_audio->channels=chans;
     sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
+    sh_audio->samplesize=2;
     sh_audio->audio_in_minsize=4*sh_audio->wf->nBlockAlign;
     if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192;
     sh_audio->audio_out_minsize=4*16384;

Index: ad_dshow.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dshow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_dshow.c	30 Aug 2002 21:44:20 -0000	1.5
+++ ad_dshow.c	21 Sep 2004 20:34:46 -0000	1.6
@@ -39,6 +39,7 @@
     sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
     sh_audio->channels=sh_audio->wf->nChannels;
     sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
+    sh_audio->samplesize=2;
     sh_audio->audio_in_minsize=2*sh_audio->wf->nBlockAlign;
     if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192;
     sh_audio->audio_out_minsize=16384;

Index: ad_faad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_faad.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ad_faad.c	11 Sep 2004 09:07:07 -0000	1.14
+++ ad_faad.c	21 Sep 2004 20:34:46 -0000	1.15
@@ -71,11 +71,11 @@
     /* XXX: FAAD support FLOAT output, how do we handle
       * that (FAAD_FMT_FLOAT)? ::atmos
       */
-    if(sh->samplesize)
       switch(sh->samplesize){
 	case 1: // 8Bit
 	  mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: 8Bit samplesize not supported by FAAD, assuming 16Bit!\n");
 	default:
+	  sh->samplesize=2;
 	case 2: // 16Bit
 	  faac_conf->outputFormat = FAAD_FMT_16BIT;
 	  break;
@@ -123,6 +123,7 @@
     mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz  channels: %d\n", faac_samplerate, faac_channels);
     sh->channels = faac_channels;
     sh->samplerate = faac_samplerate;
+    sh->samplesize=2;
     //sh->o_bps = sh->samplesize*faac_channels*faac_samplerate;
     if(!sh->i_bps) {
       mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: compressed input bitrate missing, assuming 128kbit/s!\n");

Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ad_ffmpeg.c	6 Apr 2004 16:15:57 -0000	1.15
+++ ad_ffmpeg.c	21 Sep 2004 20:34:46 -0000	1.16
@@ -110,6 +110,7 @@
   sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
   sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
 #endif
+  sh_audio->samplesize=2;
   return 1;
 }
 

Index: ad_imaadpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_imaadpcm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ad_imaadpcm.c	3 Sep 2003 22:30:30 -0000	1.7
+++ ad_imaadpcm.c	21 Sep 2004 20:34:46 -0000	1.8
@@ -111,6 +111,7 @@
   /* decodes 34 byte -> 64 short*/
   sh_audio->i_bps = 
     (sh_audio->ds->ss_mul * sh_audio->samplerate) / sh_audio->ds->ss_div;
+  sh_audio->samplesize=2;
 
   return 1;
 }

Index: ad_liba52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ad_liba52.c	26 Apr 2004 08:53:41 -0000	1.13
+++ ad_liba52.c	21 Sep 2004 20:34:46 -0000	1.14
@@ -67,6 +67,7 @@
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"a52: len=%d  flags=0x%X  %d Hz %d bit/s\n",length,flags,sample_rate,bit_rate);
     sh_audio->samplerate=sample_rate;
     sh_audio->i_bps=bit_rate/8;
+    sh_audio->samplesize=2;
     demux_read_data(sh_audio->ds,sh_audio->a_in_buffer+8,length-8);
     if(sh_audio->format!=0x2000)
 	swab(sh_audio->a_in_buffer+8,sh_audio->a_in_buffer+8,length-8);

Index: ad_libmad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libmad.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ad_libmad.c	30 Aug 2002 21:44:20 -0000	1.3
+++ ad_libmad.c	21 Sep 2004 20:34:46 -0000	1.4
@@ -88,6 +88,7 @@
   sh->channels=(this->frame.header.mode == MAD_MODE_SINGLE_CHANNEL) ? 1 : 2;
   sh->samplerate=this->frame.header.samplerate;
   sh->i_bps=this->frame.header.bitrate/8;
+  sh_audio->samplesize=2;
   
   return 1;
 }

Index: ad_mp3lib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_mp3lib.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_mp3lib.c	15 Aug 2003 12:35:08 -0000	1.6
+++ ad_mp3lib.c	21 Sep 2004 20:34:46 -0000	1.7
@@ -50,6 +50,7 @@
   sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1);
   if(!sh->a_buffer_len) return 0; // unsupported layer/format
   sh->channels=2; // hack
+  sh->samplesize=2;
   sh->samplerate=MP3_samplerate;
   sh->i_bps=MP3_bitrate*(1000/8);
   MP3_PrintHeader();

Index: ad_msadpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_msadpcm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ad_msadpcm.c	24 Oct 2002 10:05:09 -0000	1.10
+++ ad_msadpcm.c	21 Sep 2004 20:34:47 -0000	1.11
@@ -78,6 +78,7 @@
   sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
   sh_audio->i_bps = sh_audio->wf->nBlockAlign *
     (sh_audio->channels*sh_audio->samplerate) / sh_audio->ds->ss_div;
+  sh_audio->samplesize=2;
 
   return 1;
 }

Index: ad_msgsm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_msgsm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_msgsm.c	15 Sep 2002 21:23:59 -0000	1.4
+++ ad_msgsm.c	21 Sep 2004 20:34:47 -0000	1.5
@@ -25,6 +25,7 @@
   GSM_Init();
   sh_audio->channels=sh_audio->wf->nChannels;
   sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
+  sh_audio->samplesize=2;
   // decodes 65 byte -> 320 short
   // 1 sec: sh_audio->channels*sh_audio->samplerate  samples
   // 1 frame: 320 samples