highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/deshake: fix deshake crash issue.

Browse Source 
Fixes ticket #7441.

for block contrast calculate, the block is like this:

|<---------------- stride-----------------------|
+----------------------------------------------->  X
|
|            w = 16
|    (cx,cy)+------+
|           |      |
|h=blocksize|      |
|           |      |
|           +------+
V

Y

so we calc the block contrast use:
   (cy + y) * stride + (cx + x)

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao
2018-09-18 14:57:49 +08:00
committed by Jun Zhao
parent 6ff4473012
commit 5a3ce4a92b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_deshake.c
View File

@@ -196,7 +196,7 @@ static int block_contrast(uint8_t *src, int x, int y, int stride, int blocksize)
for (i = 0; i <= blocksize * 2; i++) { for (i = 0; i <= blocksize * 2; i++) {
// We use a width of 16 here to match the sad function // We use a width of 16 here to match the sad function
for (j = 0; j <= 15; j++) { for (j = 0; j <= 15; j++) {
pos = (y - i) * stride + (x - j); pos = (y + i) * stride + (x + j);
if (src[pos] < lowest) if (src[pos] < lowest)
lowest = src[pos]; lowest = src[pos];
else if (src[pos] > highest) { else if (src[pos] > highest) {