diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-28 02:00:23 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-28 02:00:23 +0000 |
| commit | c3d77725ccb2df759bde2aa5819bfb17ea48fef6 (patch) | |
| tree | 3eadaef59a7fca97376d987a76fde65edcec370f /libaf | |
| parent | 3fda49a8cbfb7993f4199913c6183fa60db295da (diff) | |
| download | mpv-c3d77725ccb2df759bde2aa5819bfb17ea48fef6.tar.bz2 mpv-c3d77725ccb2df759bde2aa5819bfb17ea48fef6.tar.xz | |
100l use right mask type when checking for input format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14262 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/af_format.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libaf/af_format.c b/libaf/af_format.c index f39022f1f5..00362a9ab1 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -281,22 +281,19 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) 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 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) si2us(l->audio,l->audio,len,l->bps); break; } - break; - default: + } else { // Input must be int // Change signed/unsigned @@ -340,7 +336,6 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) memcpy(l->audio,c->audio,len*c->bps); break; } - break; } // Switch from cpu native endian to the correct endianess |