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

avcodec/smcenc: unbreak skip blocks for inter coding

Browse Source 
When using frames with different linesize.
This commit is contained in:
Paul B Mahol 2022-11-13 00:48:38 +01:00
parent 163f1949ed
commit 2d25f33a7e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/smcenc.c
View File

@ -116,6 +116,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame,
const uint8_t *src_pixels = (const uint8_t *)frame->data[0]; const uint8_t *src_pixels = (const uint8_t *)frame->data[0];
const int stride = frame->linesize[0]; const int stride = frame->linesize[0];
const uint8_t *prev_pixels = (const uint8_t *)s->prev_frame->data[0]; const uint8_t *prev_pixels = (const uint8_t *)s->prev_frame->data[0];
const int prev_stride = s->prev_frame->linesize[0];
uint8_t *distinct_values = s->distinct_values; uint8_t *distinct_values = s->distinct_values;
const uint8_t *pixel_ptr, *row_ptr; const uint8_t *pixel_ptr, *row_ptr;
const int height = frame->height; const int height = frame->height;
@ -155,10 +156,10 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame,
int compare = 0; int compare = 0;
for (int y = 0; y < y_size; y++) { for (int y = 0; y < y_size; y++) {
const ptrdiff_t offset = pixel_ptr - src_pixels; const ptrdiff_t offset = pixel_ptr - row_ptr;
const uint8_t *prev_pixel_ptr = prev_pixels + offset; const uint8_t *prev_pixel_ptr = prev_pixels + cur_y * prev_stride + offset;
compare |= memcmp(prev_pixel_ptr + y * stride, pixel_ptr + y * stride, 4); compare |= memcmp(prev_pixel_ptr + y * prev_stride, pixel_ptr + y * stride, 4);
if (compare) if (compare)
break; break;
} }