virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/interlace: rename two variables for consistency

Browse Source 
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
This commit is contained in:
Thomas Mundt
2017-09-19 22:49:09 +02:00
committed by Carl Eugen Hoyos
parent 5d07275529
commit d491d6a0cd
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_interlace.c
View File

@@ -102,19 +102,19 @@ static void lowpass_line_complex_c(uint8_t *dstp, ptrdiff_t linesize,
const uint8_t *srcp_below = srcp + pref; const uint8_t *srcp_below = srcp + pref;
const uint8_t *srcp_above2 = srcp + mref * 2; const uint8_t *srcp_above2 = srcp + mref * 2;
const uint8_t *srcp_below2 = srcp + pref * 2; const uint8_t *srcp_below2 = srcp + pref * 2;
int i, srcp_x, srcp_ab; int i, src_x, src_ab;
for (i = 0; i < linesize; i++) { for (i = 0; i < linesize; i++) {
// this calculation is an integer representation of // this calculation is an integer representation of
// '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2' // '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2'
// '4 +' is for rounding. // '4 +' is for rounding.
srcp_x = srcp[i] << 1; src_x = srcp[i] << 1;
srcp_ab = srcp_above[i] + srcp_below[i]; src_ab = srcp_above[i] + srcp_below[i];
dstp[i] = av_clip_uint8((4 + ((srcp[i] + srcp_x + srcp_ab) << 1) dstp[i] = av_clip_uint8((4 + ((srcp[i] + src_x + src_ab) << 1)
- srcp_above2[i] - srcp_below2[i]) >> 3); - srcp_above2[i] - srcp_below2[i]) >> 3);
// Prevent over-sharpening: // Prevent over-sharpening:
// dst must not exceed src when the average of above and below // dst must not exceed src when the average of above and below
// is less than src. And the other way around. // is less than src. And the other way around.
if (srcp_ab > srcp_x) { if (src_ab > src_x) {
if (dstp[i] < srcp[i]) if (dstp[i] < srcp[i])
dstp[i] = srcp[i]; dstp[i] = srcp[i];
} else if (dstp[i] > srcp[i]) } else if (dstp[i] > srcp[i])

10
libavfilter/vf_tinterlace.c
View File

@@ -133,19 +133,19 @@ static void lowpass_line_complex_c(uint8_t *dstp, ptrdiff_t width, const uint8_t
const uint8_t *srcp_below = srcp + pref; const uint8_t *srcp_below = srcp + pref;
const uint8_t *srcp_above2 = srcp + mref * 2; const uint8_t *srcp_above2 = srcp + mref * 2;
const uint8_t *srcp_below2 = srcp + pref * 2; const uint8_t *srcp_below2 = srcp + pref * 2;
int i, srcp_x, srcp_ab; int i, src_x, src_ab;
for (i = 0; i < width; i++) { for (i = 0; i < width; i++) {
// this calculation is an integer representation of // this calculation is an integer representation of
// '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2' // '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2'
// '4 +' is for rounding. // '4 +' is for rounding.
srcp_x = srcp[i] << 1; src_x = srcp[i] << 1;
srcp_ab = srcp_above[i] + srcp_below[i]; src_ab = srcp_above[i] + srcp_below[i];
dstp[i] = av_clip_uint8((4 + ((srcp[i] + srcp_x + srcp_ab) << 1) dstp[i] = av_clip_uint8((4 + ((srcp[i] + src_x + src_ab) << 1)
- srcp_above2[i] - srcp_below2[i]) >> 3); - srcp_above2[i] - srcp_below2[i]) >> 3);
// Prevent over-sharpening: // Prevent over-sharpening:
// dst must not exceed src when the average of above and below // dst must not exceed src when the average of above and below
// is less than src. And the other way around. // is less than src. And the other way around.
if (srcp_ab > srcp_x) { if (src_ab > src_x) {
if (dstp[i] < srcp[i]) if (dstp[i] < srcp[i])
dstp[i] = srcp[i]; dstp[i] = srcp[i];
} else if (dstp[i] > srcp[i]) } else if (dstp[i] > srcp[i])