1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-02 17:12:49 +02:00

lavc/h274: correct grain DB indices

The spec specified indices in the order [x][y], but our code follows the
traditional C convention of [y][x]. This was not correctly account for
when calculating the base index of the grain database access.
This commit is contained in:
Niklas Haas 2023-09-27 15:39:00 +02:00
parent 338a5fcdbe
commit 616e9d2413

View File

@ -259,11 +259,11 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame,
// only advanced in 16x16 blocks, so use a nested loop
for (int y = 0; y < height; y += 16) {
for (int x = 0; x < width; x += 16) {
uint16_t y_offset = (seed >> 16) % 52;
uint16_t x_offset = (seed & 0xFFFF) % 56;
uint16_t x_offset = (seed >> 16) % 52;
uint16_t y_offset = (seed & 0xFFFF) % 56;
const int invert = (seed & 0x1);
y_offset &= 0xFFFC;
x_offset &= 0xFFF8;
x_offset &= 0xFFFC;
y_offset &= 0xFFF8;
prng_shift(&seed);
for (int yy = 0; yy < 16 && y+yy < height; yy += 8) {