Mercurial > mplayer.hg

changeset 14261:710b223604fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l use right mask type when checking for input format
author rtognimp
date Tue, 28 Dec 2004 02:00:23 +0000
parents 7f3c14830dcd
children 04ed193d1e32
files libaf/af_format.c
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libaf/af_format.c	Tue Dec 28 01:59:12 2004 +0000
+++ b/libaf/af_format.c	Tue Dec 28 02:00:23 2004 +0000
@@ -281,22 +281,19 @@
     endian(c->audio,c->audio,len,c->bps);
 
   // Conversion table
-  switch(c->format & ~AF_FORMAT_END_MASK){
-  case(AF_FORMAT_MU_LAW):
+  if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_MU_LAW) {
     from_ulaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK);
     if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK))
       to_ulaw(l->audio, l->audio, len, 1, AF_FORMAT_SI);
     if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
       si2us(l->audio,l->audio,len,l->bps);
-    break;
-  case(AF_FORMAT_A_LAW):
+  } else if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_A_LAW) {
     from_alaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK);
     if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK))
       to_alaw(l->audio, l->audio, len, 1, AF_FORMAT_SI);
     if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
       si2us(l->audio,l->audio,len,l->bps);
-    break;
-  case(AF_FORMAT_F):
+  } else if((c->format & AF_FORMAT_POINT_MASK) == AF_FORMAT_F) {
     switch(l->format&AF_FORMAT_SPECIAL_MASK){
     case(AF_FORMAT_MU_LAW):
       to_ulaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK);
@@ -310,8 +307,7 @@
 	si2us(l->audio,l->audio,len,l->bps);
       break;
     }
-    break;
-  default:
+  } else {
     // Input must be int
     
     // Change signed/unsigned
@@ -340,7 +336,6 @@
 	memcpy(l->audio,c->audio,len*c->bps);
       break;
     }
-    break;
   }
 
   // Switch from cpu native endian to the correct endianess