virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/proresdec2: Add support for grayscale videos

Browse Source 
Signed-off-by: Håvard Espeland <espeland@mixedrealities.no>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Håvard Espeland
2016-05-27 11:06:13 +02:00
committed by Michael Niedermayer
parent 281caece46
commit 9c43703620
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/proresdec2.c
View File

@ -578,7 +578,7 @@ static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!(avctx->flags & AV_CODEC_FLAG_GRAY)) { if (!(avctx->flags & AV_CODEC_FLAG_GRAY) && (u_data_size + v_data_size) > 0) {
ret = decode_slice_chroma(avctx, slice, (uint16_t*)dest_u, chroma_stride, ret = decode_slice_chroma(avctx, slice, (uint16_t*)dest_u, chroma_stride,
buf + y_data_size, u_data_size, buf + y_data_size, u_data_size,
qmat_chroma_scaled, log2_chroma_blocks_per_mb); qmat_chroma_scaled, log2_chroma_blocks_per_mb);
@ -591,6 +591,15 @@ static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
else {
size_t mb_max_x = slice->mb_count << (mb_x_shift - 1);
for (size_t i = 0; i < 16; ++i)
for (size_t j = 0; j < mb_max_x; ++j) {
*(uint16_t*)(dest_u + (i * chroma_stride) + (j << 1)) = 511;
*(uint16_t*)(dest_v + (i * chroma_stride) + (j << 1)) = 511;
}
}
/* decode alpha plane if available */ /* decode alpha plane if available */
if (ctx->alpha_info && pic->data[3] && a_data_size) if (ctx->alpha_info && pic->data[3] && a_data_size)
decode_slice_alpha(ctx, (uint16_t*)dest_a, luma_stride, decode_slice_alpha(ctx, (uint16_t*)dest_a, luma_stride,