From patchwork Tue Jan 10 23:20:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vignali X-Patchwork-Id: 2180 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp498644vsb; Tue, 10 Jan 2017 15:20:48 -0800 (PST) X-Received: by 10.223.152.134 with SMTP id w6mr3273138wrb.139.1484090448400; Tue, 10 Jan 2017 15:20:48 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o9si2730284wrc.319.2017.01.10.15.20.47; Tue, 10 Jan 2017 15:20:48 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12DD768A567; Wed, 11 Jan 2017 01:20:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f51.google.com (mail-oi0-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76FF068A559 for ; Wed, 11 Jan 2017 01:20:31 +0200 (EET) Received: by mail-oi0-f51.google.com with SMTP id w204so68577036oiw.0 for ; Tue, 10 Jan 2017 15:20:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=qJvVV6bdBxRhExAC8ydPiWJrAHcZ4V+JRVykmRzu5EE=; b=jgBG5Ke4Uyc2Dw0/2IOHq88fTcrwyo4CkIe3qYq7C2tDmdmd0usI2otaF53LRmhKZv pwn5wsX67fBRHzHomMl4ikrCYPPSXg3pABBW58Qdk0WUNmaKg6n+CdVxRA1fWFggt59B ycuOZwBgSj76QcQ9kA+14QKNwoD8nj/vSwaIOjaYHL1zJVtSpruzu/XUctZfgR8kxz0L u3Jw7HjPtUeQ89DsmM4OlljRY4taB9PZ+ryZKzrk3mFo5YHKdQPtvHj9GIyNPpRfCLbb HY1SbZ7L0b9ZfCW0Ak5aYbWmEeuq9kt6F8VTvEJkZD/5zEd1N3IYQgivRrXzNHZtKS0X yU1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=qJvVV6bdBxRhExAC8ydPiWJrAHcZ4V+JRVykmRzu5EE=; b=Ypc5qX+Zyz6yIQ64q6xlHq8MygbOwJPqCoNWm2sL8fkyNtInhGZb88BBDLCyc/bPuK cwNuMb0/57jCswi4IlCkir5VWzAWcfnqkLTixMFGHOa1ZhhQinfoNiVDGInY05Q6ytN0 /os9dICXNzaM5iCEFw9Oiyx4ccPJRF4ef/ACxy4Q5wuOeqohlDRPx5DIkcTJy7DZKXRK fD0ALRXh4dliRCnrRDjHfSOnmRAHz01NcNYjNUdo3dbWXJJHtug37YKwnJJGGCPNGOzp pqCYOrnMMIYh9HoZhqj251baEbzv2bv3vajnF0vSJr5nTjxAaI3MdVEFX98W+nhBEcWv Iifw== X-Gm-Message-State: AIkVDXLgqKgqu+/XN5D9gsGX2susz70OLdoMDy8HWEYC72y/vaGUtRTyz4hQSBiR6epCEU2povlkCoRHrNa9bQ== X-Received: by 10.157.38.237 with SMTP id i42mr2691977otd.76.1484090437750; Tue, 10 Jan 2017 15:20:37 -0800 (PST) MIME-Version: 1.0 Received: by 10.182.97.74 with HTTP; Tue, 10 Jan 2017 15:20:37 -0800 (PST) In-Reply-To: References: <201701101421.34179.cehoyos@ag.or.at> <06e7a9a2-3cfb-f8f4-bfeb-265d7837826e@gmail.com> From: Martin Vignali Date: Wed, 11 Jan 2017 00:20:37 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH]lavc/psd: Support 1bpp images X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" > > Please move the uncompressed calculation > below the color_mode switch and commit. > > In attach new patch. Martin From db1ca3645624fe8fac29f09cef3ef89dd013fef6 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Wed, 11 Jan 2017 00:18:29 +0100 Subject: [PATCH] libavcodec/psd : add support for psd bitmap mode Ticket 6044 Based on patch by Carl Eugen Hoyos --- libavcodec/psd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 7587ed9..c79f72a 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -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, @@ -381,6 +384,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; @@ -428,9 +433,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; } } } -- 1.9.3 (Apple Git-50)