Attachment #243011 for bug #272223

Lines 495-501 Link Here

(-)src/mpeg/MPEGfile.cc (-2 / +2 lines)
495		495
496	#define MAXSEARCH 2048	496	#define MAXSEARCH 2048
497	// read 4 bytes into header bitfield	497	// read 4 bytes into header bitfield
498	register unsigned short buf=0;	498	unsigned short buf=0;
499		499
500	// read over initial junk to find header; give up after 2048 bytes	500	// read over initial junk to find header; give up after 2048 bytes
501	int i=-2;	501	int i=-2;
Lines 503-509 Link Here
503	while (((buf & 0xfff0) != 0xfff0) && (i<MAXSEARCH)) {	503	while (((buf & 0xfff0) != 0xfff0) && (i<MAXSEARCH)) {
504	if ((buf & 0x00ff) == 0x00ff) {	504	if ((buf & 0x00ff) == 0x00ff) {
505	// only need to read next byte to try and get sync word	505	// only need to read next byte to try and get sync word
506	register unsigned char buf2=0;	506	unsigned char buf2=0;
507	if (fread(&buf2, sizeof (unsigned char), 1, fd) != 1) {	507	if (fread(&buf2, sizeof (unsigned char), 1, fd) != 1) {
508	return false;	508	return false;
509	}	509	}




			int     ch,
			short  samples[SBLIMIT])
{
    double         *bufOffsetPtr, sum;
    static int      init = 1;
    typedef double  NN[64][SBLIMIT];
    static NN      *filter;

    static BB      *buf;
    static int      bufOffset[2] = {64,64};
   // count # samples clipped
    //    int             clip = 0;
//    int             offset;
    long            foo;
//    double         *filterp;
//    double         *bandp;

    int i;
    double tmp;
    double p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15;
    double pp0,pp1,pp2,pp3,pp4,pp5,pp6,pp7,pp8,pp9,pp10,pp11,pp12,pp13,pp14,pp15;





	for (ss=0; ss<3; ss++) {
	  if (allocation[ch][sub]) {
	    int  x = 0;
	    double r;

	    // Locate MSB in the sample
	    // u is set outside loop to hopefully speed up the loop

 
	    // MSB inversion
	    // read sample
	    unsigned int samp 
	      = samples[no][ch][ss][sub];  
	    x = 1L << (x - 1);          // for MSB test
	    if ((samp & x)) {

	    r += (double)(samp & (x - 1)) / (double)x;
			
	    // calculate index
	    unsigned int indx 
	      = alloctable[sub][allocation[ch][sub]].quant;
 
	    // Dequantize the sample

Return to bug 272223

Lines 246-252 Link Here

(-)src/mpeg/allLayers.cc (-7 / +7 lines)
246	int ch,	246	int ch,
247	short samples[SBLIMIT])	247	short samples[SBLIMIT])
248	{	248	{
249	register double *bufOffsetPtr, sum;	249	double *bufOffsetPtr, sum;
250	static int init = 1;	250	static int init = 1;
251	typedef double NN[64][SBLIMIT];	251	typedef double NN[64][SBLIMIT];
252	static NN *filter;	252	static NN *filter;
Lines 254-267 Link Here
254	static BB *buf;	254	static BB *buf;
255	static int bufOffset[2] = {64,64};	255	static int bufOffset[2] = {64,64};
256	// count # samples clipped	256	// count # samples clipped
257	// register int clip = 0;	257	// int clip = 0;
258	// register int offset;	258	// int offset;
259	register long foo;	259	long foo;
260	// register double *filterp;	260	// double *filterp;
261	// register double *bandp;	261	// double *bandp;
262		262
263	int i;	263	int i;
264	register double tmp;	264	double tmp;
265	double p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15;	265	double p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15;
266	double pp0,pp1,pp2,pp3,pp4,pp5,pp6,pp7,pp8,pp9,pp10,pp11,pp12,pp13,pp14,pp15;	266	double pp0,pp1,pp2,pp3,pp4,pp5,pp6,pp7,pp8,pp9,pp10,pp11,pp12,pp13,pp14,pp15;
267		267

Lines 1381-1387 Link Here

(-)src/mpeg/layer2.cc (-3 / +3 lines)
1381	for (ss=0; ss<3; ss++) {	1381	for (ss=0; ss<3; ss++) {
1382	if (allocation[ch][sub]) {	1382	if (allocation[ch][sub]) {
1383	int x = 0;	1383	int x = 0;
1384	register double r;	1384	double r;
1385		1385
1386	// Locate MSB in the sample	1386	// Locate MSB in the sample
1387	// u is set outside loop to hopefully speed up the loop	1387	// u is set outside loop to hopefully speed up the loop
Lines 1391-1397 Link Here
1391		1391
1392	// MSB inversion	1392	// MSB inversion
1393	// read sample	1393	// read sample
1394	register unsigned int samp	1394	unsigned int samp
1395	= samples[no][ch][ss][sub];	1395	= samples[no][ch][ss][sub];
1396	x = 1L << (x - 1); // for MSB test	1396	x = 1L << (x - 1); // for MSB test
1397	if ((samp & x)) {	1397	if ((samp & x)) {
Lines 1404-1410 Link Here
1404	r += (double)(samp & (x - 1)) / (double)x;	1404	r += (double)(samp & (x - 1)) / (double)x;
1405		1405
1406	// calculate index	1406	// calculate index
1407	register unsigned int indx	1407	unsigned int indx
1408	= alloctable[sub][allocation[ch][sub]].quant;	1408	= alloctable[sub][allocation[ch][sub]].quant;
1409		1409
1410	// Dequantize the sample	1410	// Dequantize the sample