virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

lavfi/select/scene: fix potential overread.

Browse Source 
Also make sure we use the actual width of the image and not the whole
linesize.
This commit is contained in:
Clément Bœsch 2012-10-13 18:19:29 +02:00
parent dff826b4a8
commit 0852648301
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/vf_select.c
View File

@ -204,21 +204,24 @@ static double get_scene_score(AVFilterContext *ctx, AVFilterBufferRef *picref)
picref->video->h == prev_picref->video->h && picref->video->h == prev_picref->video->h &&
picref->video->w == prev_picref->video->w && picref->video->w == prev_picref->video->w &&
picref->linesize[0] == prev_picref->linesize[0]) { picref->linesize[0] == prev_picref->linesize[0]) {
int x, y; int x, y, nb_sad = 0;
int64_t sad = 0; int64_t sad = 0;
double mafd, diff; double mafd, diff;
uint8_t *p1 = picref->data[0]; uint8_t *p1 = picref->data[0];
uint8_t *p2 = prev_picref->data[0]; uint8_t *p2 = prev_picref->data[0];
const int linesize = picref->linesize[0]; const int linesize = picref->linesize[0];
for (y = 0; y < picref->video->h; y += 8) for (y = 0; y < picref->video->h - 8; y += 8) {
for (x = 0; x < linesize; x += 8) for (x = 0; x < picref->video->w*3 - 8; x += 8) {
sad += select->c.sad[1](select, sad += select->c.sad[1](select,
p1 + y * linesize + x, p1 + y * linesize + x,
p2 + y * linesize + x, p2 + y * linesize + x,
linesize, 8); linesize, 8);
nb_sad += 8 * 8;
}
}
emms_c(); emms_c();
mafd = sad / (picref->video->h * picref->video->w * 3); mafd = nb_sad ? sad / nb_sad : 0;
diff = fabs(mafd - select->prev_mafd); diff = fabs(mafd - select->prev_mafd);
ret = av_clipf(FFMIN(mafd, diff) / 100., 0, 1); ret = av_clipf(FFMIN(mafd, diff) / 100., 0, 1);
select->prev_mafd = mafd; select->prev_mafd = mafd;