virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

minor QP bugfix

Browse Source 
Originally committed as revision 4400 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
This commit is contained in:
Michael Niedermayer 2002-01-28 22:38:15 +00:00
parent 5dfd24ac98
commit bdd677ac13
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
postproc/postprocess_template.c
View File

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2001 Michael Niedermayer (michaelni@gmx.at) Copyright (C) 2001-2002 Michael Niedermayer (michaelni@gmx.at)
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -2587,7 +2587,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
after watching a black picture for 5 hours*/ after watching a black picture for 5 hours*/
static uint64_t *yHistogram= NULL; static uint64_t *yHistogram= NULL;
int black=0, white=255; // blackest black and whitest white in the picture int black=0, white=255; // blackest black and whitest white in the picture
int QPCorrecture= 256; int QPCorrecture= 256*256;
/* Temporary buffers for handling the last row(s) */ /* Temporary buffers for handling the last row(s) */
static uint8_t *tempDst= NULL; static uint8_t *tempDst= NULL;
@ -2615,7 +2615,6 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
long long memcpyTime=0, vertTime=0, horizTime=0, sumTime; long long memcpyTime=0, vertTime=0, horizTime=0, sumTime;
sumTime= rdtsc(); sumTime= rdtsc();
#endif #endif
dcOffset= ppMode->maxDcDiff; dcOffset= ppMode->maxDcDiff;
dcThreshold= ppMode->maxDcDiff*2 + 1; dcThreshold= ppMode->maxDcDiff*2 + 1;
@ -2727,16 +2726,17 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
packedYScale|= packedYScale<<32; packedYScale|= packedYScale<<32;
packedYScale|= packedYScale<<16; packedYScale|= packedYScale<<16;
if(mode & LEVEL_FIX) QPCorrecture= (int)(scale*256*256 + 0.5);
else QPCorrecture= 256*256;
} }
else else
{ {
packedYScale= 0x0100010001000100LL; packedYScale= 0x0100010001000100LL;
packedYOffset= 0; packedYOffset= 0;
QPCorrecture= 256*256;
} }
if(mode & LEVEL_FIX) QPCorrecture= packedYScale &0xFFFF;
else QPCorrecture= 256;
/* copy & deinterlace first row of blocks */ /* copy & deinterlace first row of blocks */
y=-BLOCK_SIZE; y=-BLOCK_SIZE;
{ {
@ -2819,8 +2819,8 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
#endif #endif
#ifdef ARCH_X86 #ifdef ARCH_X86
int *QPptr= isColor ? &QPs[(y>>3)*QPStride] :&QPs[(y>>4)*QPStride]; int *QPptr= isColor ? &QPs[(y>>3)*QPStride] :&QPs[(y>>4)*QPStride];
int QPDelta= isColor ? 1<<(32-3) : 1<<(32-4); int QPDelta= isColor ? (-1) : 1<<31;
int QPFrac= QPDelta; int QPFrac= 1<<30;
#endif #endif
int QP=0; int QP=0;
/* can we mess with a 8x16 block from srcBlock/dstBlock downwards and 1 line upwards /* can we mess with a 8x16 block from srcBlock/dstBlock downwards and 1 line upwards
@ -2875,7 +2875,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
#endif #endif
if(!isColor) if(!isColor)
{ {
QP= (QP* QPCorrecture)>>8; QP= (QP* QPCorrecture + 256*128)>>16;
yHistogram[ srcBlock[srcStride*12 + 4] ]++; yHistogram[ srcBlock[srcStride*12 + 4] ]++;
} }
#ifdef HAVE_MMX #ifdef HAVE_MMX