Skip to content

Commit 628e6d0

Browse files
Joseph Artsimovichmichaelni
authored andcommitted
Fix partially hidden macroblocks for 10-bit DNxHD.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
1 parent 15acfa2 commit 628e6d0

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

libavcodec/dnxhdenc.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,21 @@ static void dnxhd_8bit_get_pixels_8x4_sym(DCTELEM *restrict block, const uint8_t
7171
static av_always_inline void dnxhd_10bit_get_pixels_8x4_sym(DCTELEM *restrict block, const uint8_t *pixels, int line_size)
7272
{
7373
int i;
74-
75-
block += 32;
74+
const uint16_t* pixels16 = pixels;
75+
line_size >>= 1;
7676

7777
for (i = 0; i < 4; i++) {
78-
memcpy(block + i * 8, pixels + i * line_size, 8 * sizeof(*block));
79-
memcpy(block - (i+1) * 8, pixels + i * line_size, 8 * sizeof(*block));
78+
block[0] = pixels16[0]; block[1] = pixels16[1];
79+
block[2] = pixels16[2]; block[3] = pixels16[3];
80+
block[4] = pixels16[4]; block[5] = pixels16[5];
81+
block[6] = pixels16[6]; block[7] = pixels16[7];
82+
pixels16 += line_size;
83+
block += 8;
8084
}
85+
memcpy(block, block - 8, sizeof(*block) * 8);
86+
memcpy(block + 8, block - 16, sizeof(*block) * 8);
87+
memcpy(block + 16, block - 24, sizeof(*block) * 8);
88+
memcpy(block + 24, block - 32, sizeof(*block) * 8);
8189
}
8290

8391
static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, DCTELEM *block,

0 commit comments

Comments
 (0)