virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

libavcodec/psd : add support for psd bitmap mode

Browse Source 
Fixes ticket #6044

Based on patch by Carl Eugen Hoyos
This commit is contained in:
Martin Vignali 2017-01-11 00:18:29 +01:00 committed by Carl Eugen Hoyos
parent 4313ed511a
commit 658e626cc0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/psd.c
View File

@ -316,9 +316,12 @@ static int decode_frame(AVCodecContext *avctx, void *data,
s->pixel_size = s->channel_depth >> 3;/* in byte */
s->line_size = s->width * s->pixel_size;
s->uncompressed_size = s->line_size * s->height * s->channel_count;
switch (s->color_mode) {
case PSD_BITMAP:
s->line_size = s->width + 7 >> 3;
avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
break;
case PSD_INDEXED:
if (s->channel_depth != 8 || s->channel_count != 1) {
av_log(s->avctx, AV_LOG_ERROR,
@ -383,6 +386,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME;
}
s->uncompressed_size = s->line_size * s->height * s->channel_count;
if ((ret = ff_get_buffer(avctx, picture, 0)) < 0)
return ret;
@ -430,9 +435,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
plane_number = eq_channel[c];
ptr = picture->data[plane_number];/* get the right plane */
for (y = 0; y < s->height; y++) {
memcpy(ptr, ptr_data, s->width * s->pixel_size);
memcpy(ptr, ptr_data, s->line_size);
ptr += picture->linesize[plane_number];
ptr_data += s->width * s->pixel_size;
ptr_data += s->line_size;
}
}
}