devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fixed MPEG header validation for layer 1 on iriver, and simplified it for archos.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6746 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-06-18 11:26:14 +00:00
parent e2cd58145d
commit b0287720b1
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
firmware/mp3data.c
View file

@ -105,18 +105,17 @@ static bool is_mp3frameheader(unsigned long head)
return false; return false;
if (!(head & LAYER_MASK)) /* no layer? */ if (!(head & LAYER_MASK)) /* no layer? */
return false; return false;
#if CONFIG_HWCODEC != MASNONE
/* The MAS can't decode layer 1, so treat layer 1 data as invalid */
if ((head & LAYER_MASK) == LAYER_MASK)
return false;
#endif
if ((head & BITRATE_MASK) == BITRATE_MASK) /* bad bitrate? */ if ((head & BITRATE_MASK) == BITRATE_MASK) /* bad bitrate? */
return false; return false;
if (!(head & BITRATE_MASK)) /* no bitrate? */ if (!(head & BITRATE_MASK)) /* no bitrate? */
return false; return false;
if ((head & SAMPLERATE_MASK) == SAMPLERATE_MASK) /* bad sample rate? */ if ((head & SAMPLERATE_MASK) == SAMPLERATE_MASK) /* bad sample rate? */
return false; return false;
if (((head >> 19) & 1) == 1 &&
((head >> 17) & 3) == 3 &&
((head >> 16) & 1) == 1)
return false;
if ((head & 0xffff0000) == 0xfffe0000)
return false;
return true; return true;
} }