[FFmpeg-cvslog] avcodec/mjpegdec: support adob transform 2
Michael Niedermayer
git at videolan.org
Tue Mar 11 04:49:25 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 04:20:23 2014 +0100| [e161c1bbfce904cd8e6683c4eeaadb634dd4c8e7] | committer: Michael Niedermayer
avcodec/mjpegdec: support adob transform 2
Fixes Ticket3426
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e161c1bbfce904cd8e6683c4eeaadb634dd4c8e7
---
libavcodec/mjpegdec.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ac94345..2fd371a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2092,6 +2092,28 @@ the_end:
}
}
}
+ if (s->adobe_transform == 2 && s->avctx->pix_fmt == AV_PIX_FMT_YUVA444P) {
+ int w = s->picture_ptr->width;
+ int h = s->picture_ptr->height;
+ for (i=0; i<h; i++) {
+ int j;
+ uint8_t *dst[4];
+ for (index=0; index<4; index++) {
+ dst[index] = s->picture_ptr->data[index]
+ + s->picture_ptr->linesize[index]*i;
+ }
+ for (j=0; j<w; j++) {
+ int k = dst[3][j];
+ int r = (255 - dst[0][j]) * k;
+ int g = (128 - dst[1][j]) * k;
+ int b = (128 - dst[2][j]) * k;
+ dst[0][j] = r*257 >> 16;
+ dst[1][j] = (g*257 >> 16) + 128;
+ dst[2][j] = (b*257 >> 16) + 128;
+ dst[3][j] = 255;
+ }
+ }
+ }
if (s->stereo3d) {
AVStereo3D *stereo = av_stereo3d_create_side_data(data);
More information about the ffmpeg-cvslog
mailing list