mirror of https://git.ffmpeg.org/ffmpeg.git
ffplay: add update parameter to fill_rectangle
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
parent
84e7d368d6
commit
00b70f8d29
15
ffplay.c
15
ffplay.c
|
@ -449,7 +449,7 @@ static int packet_queue_get(PacketQueue *q, AVPacket *pkt, int block, int *seria
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void fill_rectangle(SDL_Surface *screen,
|
static inline void fill_rectangle(SDL_Surface *screen,
|
||||||
int x, int y, int w, int h, int color)
|
int x, int y, int w, int h, int color, int update)
|
||||||
{
|
{
|
||||||
SDL_Rect rect;
|
SDL_Rect rect;
|
||||||
rect.x = x;
|
rect.x = x;
|
||||||
|
@ -457,6 +457,8 @@ static inline void fill_rectangle(SDL_Surface *screen,
|
||||||
rect.w = w;
|
rect.w = w;
|
||||||
rect.h = h;
|
rect.h = h;
|
||||||
SDL_FillRect(screen, &rect, color);
|
SDL_FillRect(screen, &rect, color);
|
||||||
|
if (update && w > 0 && h > 0)
|
||||||
|
SDL_UpdateRect(screen, x, y, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ALPHA_BLEND(a, oldp, newp, s)\
|
#define ALPHA_BLEND(a, oldp, newp, s)\
|
||||||
|
@ -824,7 +826,7 @@ static void video_audio_display(VideoState *s)
|
||||||
if (s->show_mode == SHOW_MODE_WAVES) {
|
if (s->show_mode == SHOW_MODE_WAVES) {
|
||||||
fill_rectangle(screen,
|
fill_rectangle(screen,
|
||||||
s->xleft, s->ytop, s->width, s->height,
|
s->xleft, s->ytop, s->width, s->height,
|
||||||
bgcolor);
|
bgcolor, 0);
|
||||||
|
|
||||||
fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
|
fgcolor = SDL_MapRGB(screen->format, 0xff, 0xff, 0xff);
|
||||||
|
|
||||||
|
@ -845,7 +847,7 @@ static void video_audio_display(VideoState *s)
|
||||||
}
|
}
|
||||||
fill_rectangle(screen,
|
fill_rectangle(screen,
|
||||||
s->xleft + x, ys, 1, y,
|
s->xleft + x, ys, 1, y,
|
||||||
fgcolor);
|
fgcolor, 0);
|
||||||
i += channels;
|
i += channels;
|
||||||
if (i >= SAMPLE_ARRAY_SIZE)
|
if (i >= SAMPLE_ARRAY_SIZE)
|
||||||
i -= SAMPLE_ARRAY_SIZE;
|
i -= SAMPLE_ARRAY_SIZE;
|
||||||
|
@ -858,7 +860,7 @@ static void video_audio_display(VideoState *s)
|
||||||
y = s->ytop + ch * h;
|
y = s->ytop + ch * h;
|
||||||
fill_rectangle(screen,
|
fill_rectangle(screen,
|
||||||
s->xleft, y, s->width, 1,
|
s->xleft, y, s->width, 1,
|
||||||
fgcolor);
|
fgcolor, 0);
|
||||||
}
|
}
|
||||||
SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
|
SDL_UpdateRect(screen, s->xleft, s->ytop, s->width, s->height);
|
||||||
} else {
|
} else {
|
||||||
|
@ -896,7 +898,7 @@ static void video_audio_display(VideoState *s)
|
||||||
|
|
||||||
fill_rectangle(screen,
|
fill_rectangle(screen,
|
||||||
s->xpos, s->height-y, 1, 1,
|
s->xpos, s->height-y, 1, 1,
|
||||||
fgcolor);
|
fgcolor, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
|
SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
|
||||||
|
@ -2828,8 +2830,7 @@ static void toggle_audio_display(VideoState *is)
|
||||||
is->show_mode = (is->show_mode + 1) % SHOW_MODE_NB;
|
is->show_mode = (is->show_mode + 1) % SHOW_MODE_NB;
|
||||||
fill_rectangle(screen,
|
fill_rectangle(screen,
|
||||||
is->xleft, is->ytop, is->width, is->height,
|
is->xleft, is->ytop, is->width, is->height,
|
||||||
bgcolor);
|
bgcolor, 1);
|
||||||
SDL_UpdateRect(screen, is->xleft, is->ytop, is->width, is->height);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* handle an event sent by the GUI */
|
/* handle an event sent by the GUI */
|
||||||
|
|
Loading…
Reference in New Issue