WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libmpg123/layer3.c

 /*
-	leyer3.c: the layer 3 decoder
+	layer3.c: the layer 3 decoder
-	copyright 1995-2008 by the mpg123 project - free software under the terms of the LGPL 2.1
+	copyright 1995-2009 by the mpg123 project - free software under the terms of the LGPL 2.1
 	see COPYING and AUTHORS files in distribution or http://mpg123.org
 	initially written by Michael Hipp
 	unsigned big_values;
 	unsigned scalefac_compress;
 	unsigned block_type;
 	unsigned mixed_block_flag;
 	unsigned table_select[3];
-	unsigned subblock_gain[3];
+	/* Making those two signed int as workaround for open64/pathscale/sun compilers, and also for consistency, since they're worked on together with other signed variables. */
-	unsigned maxband[3];
+	int maxband[3];
-	unsigned maxbandl;
+	int maxbandl;
 	unsigned maxb;
 	unsigned region1start;
 	unsigned region2start;
 	unsigned preflag;
 	unsigned scalefac_scale;
 	struct { struct gr_info_s gr[2]; } ch[2];
 };
 struct bandInfoStruct
 {
-	int longIdx[23];
+	unsigned short longIdx[23];
-	int longDiff[22];
+	unsigned char longDiff[22];
-	int shortIdx[14];
+	unsigned short shortIdx[14];
-	int shortDiff[13];
+	unsigned char shortDiff[13];
 };
 /* Techy details about our friendly MPEG data. Fairly constant over the years;-) */
-const struct bandInfoStruct bandInfo[9] =
+static const struct bandInfoStruct bandInfo[9] =
+{
 	{ /* MPEG 1.0 */
 		{0,4,8,12,16,20,24,30,36,44,52,62,74, 90,110,134,162,196,238,288,342,418,576},
 	for(j=0;j<9;j++)
+	{
 		const struct bandInfoStruct *bi = &bandInfo[j];
 		int *mp;
 		int cb,lwin;
-		const int *bdf;
+		const unsigned char *bdf;
 		mp = map[j][0] = mapbuf0[j];
 		bdf = bi->longDiff;
 		for(i=0,cb = 0; cb < 8 ; cb++,i+=*bdf++)
 	si->main_data_begin = getbits(fr, tab[1]);
 	if(si->main_data_begin > fr->bitreservoir)
+	{
-		if(VERBOSE2) fprintf(stderr, "Note: missing %d bytes in bit reservoir for frame %li\n", (int)(si->main_data_begin - fr->bitreservoir), (long)fr->num);
+		if(!fr->to_ignore && VERBOSE2) fprintf(stderr, "Note: missing %d bytes in bit reservoir for frame %li\n", (int)(si->main_data_begin - fr->bitreservoir), (long)fr->num);
 		/*  overwrite main_data_begin for the really available bit reservoir */
 		gr_info->part2_3_length = getbits(fr, 12);
 		gr_info->big_values = getbits(fr, 9);
 		if(gr_info->big_values > 288)
 		{
-			error("big_values too large!");
+			if(NOQUIET) error("big_values too large!");
 			gr_info->big_values = 288;
+		}
 		gr_info->pow2gain = fr->gainpow2+256 - getbits_fast(fr, 8) + powdiff;
 			for(i=0;i<3;i++)
 			gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(fr, 3)<<3);
 			if(gr_info->block_type == 0)
 			{
-				error("Blocktype == 0 and window-switching == 1 not allowed.");
+				if(NOQUIET) error("Blocktype == 0 and window-switching == 1 not allowed.");
 				return 1;
+			}
+				{
 					int r0c,r1c;
 					if((gr_info->block_type == 2) && (!gr_info->mixed_block_flag) ) r0c = 5;
 					else r0c = 7;
 					/* r0c+1+r1c+1 == 22, always. */
 					r1c = 20 - r0c;
 					gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
 					gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
+				}
+		{
 			int i,r0c,r1c;
 			for (i=0; i<3; i++)
 			gr_info->table_select[i] = getbits_fast(fr, 5);
-			r0c = getbits_fast(fr, 4);
+			r0c = getbits_fast(fr, 4); /* 0 .. 15 */
-			r1c = getbits_fast(fr, 3);
+			r1c = getbits_fast(fr, 3); /* 0 .. 7 */
-			gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
+			gr_info->region1start = bandInfo[sfreq].longIdx[r0c+1] >> 1 ;
-			gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
 			/* max(r0c+r1c+2) = 15+7+2 = 24 */
-			if(r0c + r1c + 2 > 22) gr_info->region2start = 576>>1;
+			if(r0c+1+r1c+1 > 22) gr_info->region2start = 576>>1;
 			else gr_info->region2start = bandInfo[sfreq].longIdx[r0c+1+r1c+1] >> 1;
 	for(i=0;i
 	return numbits;
+}
-}
+static unsigned char pretab_choice[2][22] =
+{
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-static const int pretab1[22] = {0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,3,3,2,0};
+	{0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,3,3,3,2,0}
-static const int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+};
 /*
+	{
 		int bv       = gr_info->big_values;
 		int region1  = gr_info->region1start;
-		int region2  = gr_info->region2start;
-		if(region1 > region2)
-		{
-			/*
-				That's not optimal: it fixes a segfault with fuzzed data, but also apparently triggers where it shouldn't, see bug 1641196.
-				The benefit of not crashing / having this security risk is bigger than these few frames of a lame-3.70 file that aren't audible anyway.
-				But still, I want to know if indeed this check or the old lame is at fault.
-			*/
-			error("You got some really nasty file there... region1>region2!");
-			return 1;
 		int region2  = gr_info->region2start;
 		l3 = ((576>>1)-bv)>>1;
 		/* we may lose the 'odd' bit here !! check this later again */
 		mc = 0;
 		for(i=0;i<2;i++)
+		{
 			int lp = l[i];
-			struct newhuff *h = ht+gr_info->table_select[i];
+			const struct newhuff *h = ht+gr_info->table_select[i];
 			for(;lp;lp--,mc--)
+			{
 				register int x,y;
 				if( (!mc) )
 						v = gr_info->full_gain[lwin][(*scf++) << shift];
 						step = 3;
+					}
+				}
+				{
-					register short *val = h->table;
+					const short *val = h->table;
 					REFRESH_MASK;
 					while((y=*val++)<0)
+					{
 						if (mask < 0) val -= y;
+			}
+		}
 		for(;l3 && (part2remain+num > 0);l3--)
 		{
-			struct newhuff* h;
+			const struct newhuff* h;
-			register short* val;
+			const short* val;
 			register short a;
 			/*
 				This is only a humble hack to prevent a special segfault.
 				More insight into the real workings is still needed.
+	}
 	else
+	{
 		/* decoding with 'long' BandIndex table (block_type != 2) */
-		const int *pretab = gr_info->preflag ? pretab1 : pretab2;
+		const unsigned char *pretab = pretab_choice[gr_info->preflag];
 		int i,max = -1;
 		int cb = 0;
 		int *m = map[sfreq][2];
 		register real v = 0.0;
 		int mc = 0;
 		/* long hash table values */
 		for(i=0;i<3;i++)
 		{
 			int lp = l[i];
-			struct newhuff *h = ht+gr_info->table_select[i];
+			const struct newhuff *h = ht+gr_info->table_select[i];
 			for(;lp;lp--,mc--)
 #endif
 						v = gr_info->pow2gain[(*(scf++) + (*pretab++)) << shift];
+					}
+				}
+				{
-					register short *val = h->table;
+					const short *val = h->table;
 					REFRESH_MASK;
 					while((y=*val++)<0)
+					{
 						if (mask < 0) val -= y;
+		}
 		/* short (count1table) values */
 		for(;l3 && (part2remain+num > 0);l3--)
 		{
-			struct newhuff *h = htc+gr_info->count1table_select;
+			const struct newhuff *h = htc+gr_info->count1table_select;
+			const short *val = h->table;
-			register short *val = h->table,a;
+			register short a;
 			REFRESH_MASK;
 			while((a=*val++)<0)
 	set_pointer(fr,sideinfo.main_data_begin);
 	for(gr=0;gr
+	{
-	{
+		/*  hybridIn[2][SBLIMIT][SSLIMIT] */
+		real (*hybridIn)[SBLIMIT][SSLIMIT] = fr->layer3.hybrid_in;
-		ALIGNED(16) real hybridIn[2][SBLIMIT][SSLIMIT];
+		/*  hybridOut[2][SSLIMIT][SBLIMIT] */
-		ALIGNED(16) real hybridOut[2][SSLIMIT][SBLIMIT];
+		real (*hybridOut)[SSLIMIT][SBLIMIT] = fr->layer3.hybrid_out;
+		{

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libmpg123/layer3.c – Rev 1905 → 3960