Mercurial > mplayer.hg
changeset 13552:d40a1dfbf1d9
make use of new defines: 24 and 32bit integer types
author | alex |
---|---|
date | Mon, 04 Oct 2004 19:50:40 +0000 |
parents | 2466b2ee99a8 |
children | 0febef62023e |
files | libaf/af_mp.c |
diffstat | 1 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libaf/af_mp.c Mon Oct 04 19:36:12 2004 +0000 +++ b/libaf/af_mp.c Mon Oct 04 19:50:40 2004 +0000 @@ -18,10 +18,22 @@ ofmt = AF_FORMAT_LE|AF_FORMAT_US; break; case(AFMT_U16_BE): ofmt = AF_FORMAT_BE|AF_FORMAT_US; break; + case(AFMT_S24_LE): + ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break; + case(AFMT_S24_BE): + ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break; + case(AFMT_U24_LE): + ofmt = AF_FORMAT_LE|AF_FORMAT_US; break; + case(AFMT_U24_BE): + ofmt = AF_FORMAT_BE|AF_FORMAT_US; break; case(AFMT_S32_LE): ofmt = AF_FORMAT_LE|AF_FORMAT_SI; break; case(AFMT_S32_BE): ofmt = AF_FORMAT_BE|AF_FORMAT_SI; break; + case(AFMT_U32_LE): + ofmt = AF_FORMAT_LE|AF_FORMAT_US; break; + case(AFMT_U32_BE): + ofmt = AF_FORMAT_BE|AF_FORMAT_US; break; case(AFMT_IMA_ADPCM): ofmt = AF_FORMAT_IMA_ADPCM; break; case(AFMT_MU_LAW): @@ -58,6 +70,7 @@ switch(fmt->bps){ case 1: return AFMT_S8; case 2: return (fmt->format&AF_FORMAT_LE) ? AFMT_S16_LE : AFMT_S16_BE; + case 3: return (fmt->format&AF_FORMAT_LE) ? AFMT_S24_LE : AFMT_S24_BE; case 4: return (fmt->format&AF_FORMAT_LE) ? AFMT_S32_LE : AFMT_S32_BE; } } else { @@ -65,7 +78,8 @@ switch(fmt->bps){ case 1: return AFMT_U8; case 2: return (fmt->format&AF_FORMAT_LE) ? AFMT_U16_LE : AFMT_U16_BE; -// case 4: return (fmt->format&AF_FORMAT_LE) ? AFMT_U32_LE : AFMT_U32_BE; + case 3: return (fmt->format&AF_FORMAT_LE) ? AFMT_U24_LE : AFMT_U24_BE; + case 4: return (fmt->format&AF_FORMAT_LE) ? AFMT_U32_LE : AFMT_U32_BE; } } } else {