RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/showwaves: use INT16_MAX instead of a self defined macro

This commit is contained in:
Clément Bœsch 2014-12-24 15:11:23 +01:00
parent 96dce6f7ce
commit f6950a077c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avf_showwaves.c
View File

@ -178,12 +178,10 @@ static int request_frame(AVFilterLink *outlink)
return ret; return ret;
} }
#define MAX_INT16 ((1<<15) -1)
static void draw_sample_point(uint8_t *buf, int height, int linesize, static void draw_sample_point(uint8_t *buf, int height, int linesize,
int16_t sample, int16_t *prev_y, int intensity) int16_t sample, int16_t *prev_y, int intensity)
{ {
const int h = height/2 - av_rescale(sample, height/2, MAX_INT16); const int h = height/2 - av_rescale(sample, height/2, INT16_MAX);
if (h >= 0 && h < height) if (h >= 0 && h < height)
buf[h * linesize] += intensity; buf[h * linesize] += intensity;
} }
@ -192,7 +190,7 @@ static void draw_sample_line(uint8_t *buf, int height, int linesize,
int16_t sample, int16_t *prev_y, int intensity) int16_t sample, int16_t *prev_y, int intensity)
{ {
int k; int k;
const int h = height/2 - av_rescale(sample, height/2, MAX_INT16); const int h = height/2 - av_rescale(sample, height/2, INT16_MAX);
int start = height/2; int start = height/2;
int end = av_clip(h, 0, height-1); int end = av_clip(h, 0, height-1);
if (start > end) if (start > end)
@ -205,7 +203,7 @@ static void draw_sample_p2p(uint8_t *buf, int height, int linesize,
int16_t sample, int16_t *prev_y, int intensity) int16_t sample, int16_t *prev_y, int intensity)
{ {
int k; int k;
const int h = height/2 - av_rescale(sample, height/2, MAX_INT16); const int h = height/2 - av_rescale(sample, height/2, INT16_MAX);
if (h >= 0 && h < height) { if (h >= 0 && h < height) {
buf[h * linesize] += intensity; buf[h * linesize] += intensity;
if (*prev_y && h != *prev_y) { if (*prev_y && h != *prev_y) {