[FFmpeg-cvslog] postproc: Avoid floats in maxClipped computation
Michael Niedermayer
git at videolan.org
Sun May 31 02:11:37 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 01:40:12 2015 +0200| [6f51674c91cfcae0c0fdebf23d9cb9a3e294f09b] | committer: Michael Niedermayer
postproc: Avoid floats in maxClipped computation
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f51674c91cfcae0c0fdebf23d9cb9a3e294f09b
---
libpostproc/postprocess.c | 2 +-
libpostproc/postprocess_internal.h | 2 +-
libpostproc/postprocess_template.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index acce0f2..92cc436 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -681,7 +681,7 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality)
ppMode->minAllowedY= 16;
ppMode->baseDcDiff= 256/8;
ppMode->flatnessThreshold= 56-16-1;
- ppMode->maxClippedThreshold= 0.01;
+ ppMode->maxClippedThreshold= (AVRational){1,100};
ppMode->error=0;
memset(temp, 0, GET_MODE_BUFFER_SIZE);
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index c1a306d..d128dfb 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -99,7 +99,7 @@ typedef struct PPMode{
int minAllowedY; ///< for brightness correction
int maxAllowedY; ///< for brightness correction
- float maxClippedThreshold; ///< amount of "black" you are willing to lose to get a brightness-corrected picture
+ AVRational maxClippedThreshold; ///< amount of "black" you are willing to lose to get a brightness-corrected picture
int maxTmpNoise[3]; ///< for Temporal Noise Reducing filter (Maximal sum of abs differences)
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index fc49e19..c7ad3f0 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -3383,7 +3383,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[
}
/* We always get a completely black picture first. */
- maxClipped= (uint64_t)(sum * c.ppMode.maxClippedThreshold);
+ maxClipped= av_rescale(sum, c.ppMode.maxClippedThreshold.num, c.ppMode.maxClippedThreshold.den);
clipped= sum;
for(black=255; black>0; black--){
More information about the ffmpeg-cvslog
mailing list