len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-16 08:32:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid magic numbers. Use the available defines to set up the bit mask to compare MPEG frame headers.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29607 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-03-16 22:05:46 +00:00
parent 3706d6d0b5
commit 742980f94c
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
apps/mp3data.c
View file

@ -49,19 +49,19 @@
#define VDEBUGF(...) do { } while(0) #define VDEBUGF(...) do { } while(0)
#endif #endif
#define SYNC_MASK (0x7ffL << 21) #define SYNC_MASK (0x7ffL << 21)
#define VERSION_MASK (3L << 19) #define VERSION_MASK (3L << 19)
#define LAYER_MASK (3L << 17) #define LAYER_MASK (3L << 17)
#define PROTECTION_MASK (1L << 16) #define PROTECTION_MASK (1L << 16)
#define BITRATE_MASK (0xfL << 12) #define BITRATE_MASK (0xfL << 12)
#define SAMPLERATE_MASK (3L << 10) #define SAMPLERATE_MASK (3L << 10)
#define PADDING_MASK (1L << 9) #define PADDING_MASK (1L << 9)
#define PRIVATE_MASK (1L << 8) #define PRIVATE_MASK (1L << 8)
#define CHANNELMODE_MASK (3L << 6) #define CHANNELMODE_MASK (3L << 6)
#define MODE_EXT_MASK (3L << 4) #define MODE_EXT_MASK (3L << 4)
#define COPYRIGHT_MASK (1L << 3) #define COPYRIGHT_MASK (1L << 3)
#define ORIGINAL_MASK (1L << 2) #define ORIGINAL_MASK (1L << 2)
#define EMPHASIS_MASK 3L #define EMPHASIS_MASK (3L)
/* MPEG Version table, sorted by version index */ /* MPEG Version table, sorted by version index */
static const signed char version_table[4] = { static const signed char version_table[4] = {
@ -206,8 +206,8 @@ static bool headers_have_same_type(unsigned long header1,
unsigned long header2) unsigned long header2)
{ {
/* Compare MPEG version, layer and sampling frequency. If header1 is zero /* Compare MPEG version, layer and sampling frequency. If header1 is zero
* it is assumed the headers are of same type. */ * it is assumed both frame headers are of same type. */
unsigned int mask = 0xfffe0c00; unsigned int mask = SYNC_MASK | VERSION_MASK | LAYER_MASK | SAMPLERATE_MASK;
header1 &= mask; header1 &= mask;
header2 &= mask; header2 &= mask;
return header1 ? (header1 == header2) : true; return header1 ? (header1 == header2) : true;