From e615b49682c837df7f3fb6a7c1212081477d61e1 Mon Sep 17 00:00:00 2001 From: beveloper Date: Fri, 26 Dec 2003 00:30:05 +0000 Subject: [PATCH] compatible with MediaDefs.h now git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5755 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/media/RawFormats.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/headers/private/media/RawFormats.h b/headers/private/media/RawFormats.h index 2f3a2a6e66..af3bfc9184 100644 --- a/headers/private/media/RawFormats.h +++ b/headers/private/media/RawFormats.h @@ -8,15 +8,18 @@ // use. Only the raw decoder does understand them, they are created // by the file readers, like WAV or AIFF reader +// these values match those from media_raw_audio_format +// (type & B_AUDIO_FORMAT_SIZE_MASK) == sample size enum { - B_AUDIO_FORMAT_UINT8 = 0x00100, - B_AUDIO_FORMAT_INT8 = 0x00200, - B_AUDIO_FORMAT_INT16 = 0x00400, - B_AUDIO_FORMAT_INT24 = 0x00800, - B_AUDIO_FORMAT_INT32 = 0x01000, - B_AUDIO_FORMAT_FLOAT32 = 0x02000, - B_AUDIO_FORMAT_FLOAT64 = 0x04000, - B_AUDIO_FORMAT_MASK = 0xfffff, + B_AUDIO_FORMAT_UINT8 = 0x0011, + B_AUDIO_FORMAT_INT8 = 0x0001, + B_AUDIO_FORMAT_INT16 = 0x0002, + B_AUDIO_FORMAT_INT24 = 0x0003, + B_AUDIO_FORMAT_INT32 = 0x0004, + B_AUDIO_FORMAT_FLOAT32 = 0x0024, + B_AUDIO_FORMAT_FLOAT64 = 0x0028, + B_AUDIO_FORMAT_MASK = 0xffff, + B_AUDIO_FORMAT_SIZE_MASK = 0xf, B_AUDIO_FORMAT_CHANNEL_ORDER_WAVE = 0x100000, B_AUDIO_FORMAT_CHANNEL_ORDER_AIFF = 0x200000, };