This fixes pixel values not being properly shifted in
libopenjpeg_copyto16 and libopenjpeg_copy_to_packed16 methods.
Pixel formats like xyz12le need to be shifted by AVComponentDescriptor::shift
to get the correct values.
---
libavcodec/libopenjpegdec.c | 6 [32m++++[m[31m--[m
1 file changed, 4 insertions(+), 2 deletions(-)
[1mdiff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c[m
[1mindex 02b1ceb..1cd1b9b 100644[m
[1m--- a/libavcodec/libopenjpegdec.c[m
[1m+++ b/libavcodec/libopenjpegdec.c[m
[36m@@ -184,10 +184,11 @@[m [mstatic inline void
libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *im[m
[m
static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t
*image) {[m
uint16_t *img_ptr;[m
[32m+[m[32m const AVPixFmtDescriptor *desc =
av_pix_fmt_desc_get(picture->format);[m
int index, x, y, c;[m
int adjust[4];[m
for (x = 0; x < image->numcomps; x++)[m
[31m- adjust[x] =
FFMAX(FFMIN(av_pix_fmt_desc_get(picture->format)->comp[x].depth_minus1 + 1 -
image->comps[x].prec, 8), 0);[m
[32m+[m[32m adjust[x] = FFMAX(FFMIN(desc->comp[x].depth_minus1 + 1 -
image->comps[x].prec, 8), 0) + desc->comp[x].shift;[m
[m
for (y = 0; y < picture->height; y++) {[m
index = y * picture->width;[m
[36m@@ -220,10 +221,11 @@[m [mstatic inline void libopenjpeg_copyto8(AVFrame
*picture, opj_image_t *image) {[m
static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image)
{[m
int *comp_data;[m
uint16_t *img_ptr;[m
[32m+[m[32m const AVPixFmtDescriptor *desc =
av_pix_fmt_desc_get(picture->format);[m
int index, x, y;[m
int adjust[4];[m
for (x = 0; x < image->numcomps; x++)[m
[31m- adjust[x] =
FFMAX(FFMIN(av_pix_fmt_desc_get(picture->format)->comp[x].depth_minus1 + 1 -
image->comps[x].prec, 8), 0);[m
[32m+[m[32m adjust[x] = FFMAX(FFMIN(desc->comp[x].depth_minus1 + 1 -
image->comps[x].prec, 8), 0) + desc->comp[x].shift;[m
[m
for (index = 0; index < image->numcomps; index++) {[m
comp_data = image->comps[index].data;[m
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
