[FFmpeg-cvslog] libopenjpegdec.c: Correctly scale gray16 output if precision < 16

[Michael Bradshaw]

ffmpeg | branch: master | Michael Bradshaw <mjbshaw at gmail.com> | Thu Sep 12 09:21:51 2013 +0200| [7412a4a48f23fd1a08fd30e75bbf116b6186fef9] | committer: Carl Eugen Hoyos

libopenjpegdec.c: Correctly scale gray16 output if precision < 16

Fixes ticket #2943.

Signed-off-by: Carl Eugen Hoyos <cehoyos at ag.or.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7412a4a48f23fd1a08fd30e75bbf116b6186fef9
---

 libavcodec/libopenjpegdec.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index c331b59..27fb56e 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -207,12 +207,16 @@ static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) {
     int *comp_data;
     uint16_t *img_ptr;
     int index, x, y;
+    int adjust[4];
+    for (x = 0; x < image->numcomps; x++)
+        adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0);
+
     for (index = 0; index < image->numcomps; index++) {
         comp_data = image->comps[index].data;
         for (y = 0; y < image->comps[index].h; y++) {
             img_ptr = (uint16_t*) (picture->data[index] + y * picture->linesize[index]);
             for (x = 0; x < image->comps[index].w; x++) {
-                *img_ptr = *comp_data;
+                *img_ptr = *comp_data << adjust[index];
                 img_ptr++;
                 comp_data++;
             }