diff options
| author | Thomas Mundt <tmundt75@gmail.com> | 2017-09-19 22:49:09 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-09-25 22:13:37 +0200 |
| commit | d491d6a0cd01d9a1ab2061c6c8a977b1aa578d70 (patch) | |
| tree | e3978f133701bca12df77bfec0c539a2a1eb1de2 /libavfilter | |
| parent | 5d07275529f6544dd61480875908287dd6f7a426 (diff) | |
| download | ffmpeg-d491d6a0cd01d9a1ab2061c6c8a977b1aa578d70.tar.gz | |
avfilter/interlace: rename two variables for consistency
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_interlace.c | 10 | ||||
| -rw-r--r-- | libavfilter/vf_tinterlace.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index 0fdfe70f4c..731069818f 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -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_above2 = srcp + mref * 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++) { // this calculation is an integer representation of // '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2' // '4 +' is for rounding. - srcp_x = srcp[i] << 1; - srcp_ab = srcp_above[i] + srcp_below[i]; - dstp[i] = av_clip_uint8((4 + ((srcp[i] + srcp_x + srcp_ab) << 1) + src_x = srcp[i] << 1; + src_ab = srcp_above[i] + srcp_below[i]; + dstp[i] = av_clip_uint8((4 + ((srcp[i] + src_x + src_ab) << 1) - srcp_above2[i] - srcp_below2[i]) >> 3); // Prevent over-sharpening: // dst must not exceed src when the average of above and below // is less than src. And the other way around. - if (srcp_ab > srcp_x) { + if (src_ab > src_x) { if (dstp[i] < srcp[i]) dstp[i] = srcp[i]; } else if (dstp[i] > srcp[i]) diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 163ab7c184..f13791d254 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -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_above2 = srcp + mref * 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++) { // this calculation is an integer representation of // '0.75 * current + 0.25 * above + 0.25 * below - 0.125 * above2 - 0.125 * below2' // '4 +' is for rounding. - srcp_x = srcp[i] << 1; - srcp_ab = srcp_above[i] + srcp_below[i]; - dstp[i] = av_clip_uint8((4 + ((srcp[i] + srcp_x + srcp_ab) << 1) + src_x = srcp[i] << 1; + src_ab = srcp_above[i] + srcp_below[i]; + dstp[i] = av_clip_uint8((4 + ((srcp[i] + src_x + src_ab) << 1) - srcp_above2[i] - srcp_below2[i]) >> 3); // Prevent over-sharpening: // dst must not exceed src when the average of above and below // is less than src. And the other way around. - if (srcp_ab > srcp_x) { + if (src_ab > src_x) { if (dstp[i] < srcp[i]) dstp[i] = srcp[i]; } else if (dstp[i] > srcp[i]) |