comparison libpostproc/postprocess_template.c @ 182:3ccd74a91074 libavcodec

minor brightness/contrast bugfix / moved some global vars into ppMode non mmx compilation bugfix

181:edc5f6cf1855

#endif
#ifdef TIMING
	long long memcpyTime=0, vertTime=0, horizTime=0, sumTime;
	sumTime= rdtsc();
#endif
//mode= 0x7F;
#ifdef HAVE_MMX
	maxTmpNoise[0]= ppMode->maxTmpNoise[0];
	maxTmpNoise[1]= ppMode->maxTmpNoise[1];
	maxTmpNoise[2]= ppMode->maxTmpNoise[2];
#endif

	if(mode & CUBIC_IPOL_DEINT_FILTER) copyAhead=16;
	else if(mode & LINEAR_BLEND_DEINT_FILTER) copyAhead=14;
	else if(   (mode & V_DEBLOCK)

		yHistogram= (uint64_t*)malloc(8*256);
		for(i=0; i<256; i++) yHistogram[i]= width*height/64*15/256;

		if(mode & FULL_Y_RANGE)
		{
			maxAllowedY=255;
			minAllowedY=0;
		}
	}

	if(!isColor)
	{

		{
			if(clipped < maxClipped) break;
			clipped-= yHistogram[white];
		}

		scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black);

#ifdef HAVE_MMX2
		packedYScale= (uint16_t)(scale*256.0 + 0.5);
		packedYOffset= (((black*packedYScale)>>8) - minAllowedY) & 0xFFFF;
#else
		packedYScale= (uint16_t)(scale*1024.0 + 0.5);
		packedYOffset= (black - minAllowedY) & 0xFFFF;
#endif

		packedYOffset|= packedYOffset<<32;
		packedYOffset|= packedYOffset<<16;

182:3ccd74a91074

#endif
#ifdef TIMING
	long long memcpyTime=0, vertTime=0, horizTime=0, sumTime;
	sumTime= rdtsc();
#endif

	dcOffset= ppMode->maxDcDiff;
	dcThreshold= ppMode->maxDcDiff*2 + 1;

#ifdef HAVE_MMX
	maxTmpNoise[0]= ppMode->maxTmpNoise[0];
	maxTmpNoise[1]= ppMode->maxTmpNoise[1];
	maxTmpNoise[2]= ppMode->maxTmpNoise[2];
	
	mmxDCOffset= 0x7F - dcOffset;
	mmxDCThreshold= 0x7F - dcThreshold;

	mmxDCOffset*= 0x0101010101010101LL;
	mmxDCThreshold*= 0x0101010101010101LL;
#endif

	if(mode & CUBIC_IPOL_DEINT_FILTER) copyAhead=16;
	else if(mode & LINEAR_BLEND_DEINT_FILTER) copyAhead=14;
	else if(   (mode & V_DEBLOCK)

		yHistogram= (uint64_t*)malloc(8*256);
		for(i=0; i<256; i++) yHistogram[i]= width*height/64*15/256;

		if(mode & FULL_Y_RANGE)
		{
			ppMode->maxAllowedY=255;
			ppMode->minAllowedY=0;
		}
	}

	if(!isColor)
	{

		{
			if(clipped < maxClipped) break;
			clipped-= yHistogram[white];
		}

		scale= (double)(ppMode->maxAllowedY - ppMode->minAllowedY) / (double)(white-black);

#ifdef HAVE_MMX2
		packedYScale= (uint16_t)(scale*256.0 + 0.5);
		packedYOffset= (((black*packedYScale)>>8) - ppMode->minAllowedY) & 0xFFFF;
#else
		packedYScale= (uint16_t)(scale*1024.0 + 0.5);
		packedYOffset= (black - ppMode->minAllowedY) & 0xFFFF;
#endif

		packedYOffset|= packedYOffset<<32;
		packedYOffset|= packedYOffset<<16;