Mercurial > mplayer.hg

changeset 7410:1578dc56a9ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
standard GSM support for .mov files
author arpi
date Sun, 15 Sep 2002 21:23:59 +0000
parents 33f2f851d264
children 72a9bd0314a4
files libmpcodecs/ad_msgsm.c
diffstat 1 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_msgsm.c	Sun Sep 15 21:02:22 2002 +0000
+++ b/libmpcodecs/ad_msgsm.c	Sun Sep 15 21:23:59 2002 +0000
@@ -7,7 +7,7 @@
 
 static ad_info_t info = 
 {
-	"native MSGSM audio decoder",
+	"native GSM/MSGSM audio decoder",
 	"msgsm",
 	"A'rpi",
 	"XAnim",
@@ -28,7 +28,12 @@
   // decodes 65 byte -> 320 short
   // 1 sec: sh_audio->channels*sh_audio->samplerate  samples
   // 1 frame: 320 samples
-  sh_audio->i_bps=65*(sh_audio->channels*sh_audio->samplerate)/320;  // 1:10
+  if(sh_audio->format==0x31 || sh_audio->format==0x32){
+    sh_audio->ds->ss_mul=65; sh_audio->ds->ss_div=320;
+  } else {
+    sh_audio->ds->ss_mul=33; sh_audio->ds->ss_div=160;
+  }
+  sh_audio->i_bps=sh_audio->ds->ss_mul*(sh_audio->channels*sh_audio->samplerate)/sh_audio->ds->ss_div;  // 1:10
   return 1;
 }
 
@@ -49,8 +54,15 @@
 
 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
 {
+  if(sh_audio->format==0x31 || sh_audio->format==0x32){
     unsigned char ibuf[65]; // 65 bytes / frame
     if(demux_read_data(sh_audio->ds,ibuf,65)!=65) return -1; // EOF
     XA_MSGSM_Decoder(ibuf,(unsigned short *) buf); // decodes 65 byte -> 320 short
     return 2*320;
+  } else {
+    unsigned char ibuf[33]; // 33 bytes / frame
+    if(demux_read_data(sh_audio->ds,ibuf,33)!=33) return -1; // EOF
+    XA_GSM_Decoder(ibuf,(unsigned short *) buf); // decodes 33 byte -> 160 short
+    return 2*160;
+  }
 }