From patchwork Tue Jan 10 23:07:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vignali X-Patchwork-Id: 2179 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp494444vsb; Tue, 10 Jan 2017 15:07:28 -0800 (PST) X-Received: by 10.194.118.228 with SMTP id kp4mr3671633wjb.26.1484089648163; Tue, 10 Jan 2017 15:07:28 -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 ng7si2879447wjb.80.2017.01.10.15.07.27; Tue, 10 Jan 2017 15:07:28 -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 EC9D168A546; Wed, 11 Jan 2017 01:07:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f54.google.com (mail-oi0-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38E8368A510 for ; Wed, 11 Jan 2017 01:07:11 +0200 (EET) Received: by mail-oi0-f54.google.com with SMTP id u143so157474674oif.3 for ; Tue, 10 Jan 2017 15:07:18 -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=az/fZ7QEG0iTO0ayER2O4Y5POlvugTHYBD07tdJ1ZDQ=; b=l9lb6MMAxMT2ZAw4L8TliK2sJxNFrSSWUCvFXNR6n9hToLRhVpP4ZDgGOgh5KNTKzY 8lk/I8mkJsgklRxuD7pK/ow/Tj2IH9EfwqYuv1BzbRZMAMpQu2eo0dgIqCXMKDutMxFu pCm2NeQqyFdpBNzohZmXsC6zdhvWxv1aTF6L/fAy5iuKqb0VF2Zotruwa+qg2MSsJWSq C/O6J4zi2cVv4MOGzdNmkvFQdZmkYpP+y0g6+uRkpA+tmLKJtBr0FOH/QViorN+vnsoi r2Me5xWVM4E4hPMqKFjYjMlY6+ZSYLauqC/bKFDUAH+RDx7seZKYiR/BTER05w1uPCTf dnRQ== 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=az/fZ7QEG0iTO0ayER2O4Y5POlvugTHYBD07tdJ1ZDQ=; b=cGnQFPfehnklTaATeW+pP5Ks5dXE7LlthxzUzK09D8ci9NDFPC1+mkxG2H1q7AsGlB 9w2gxUUbBv/XOnCZpUP/+EtEBHgQeeMGU9eovm6KVapLFUIj8VNBntTW43SUcEVHZnKm hZzI8DfK55M4nX8poBUpfkgIHfUXuAa2+384I8/dtFcvHZVdiat9JVMqlbt1bpWdje6k h2HrXrx4fPABD3iowx8vgXhou/H3omXfo2edqbBuxH+5dl8oIHDcv99MqDLCHcxEN9KA VEDgM3Ps/npY1N1zWVaYwtwofeoXdbT2Ao2NeqxalDWX42M3vAfFKSV5XDfEoGzz8r+k WqJA== X-Gm-Message-State: AIkVDXJJiHdzlH0NwOMHFc195b7Fp5hrXCEmdGupvQVATLfhXMf7kFGleiUCqwNoPHo+I63E7a+OO4rL6fxIdw== X-Received: by 10.157.19.93 with SMTP id q29mr1823732otq.60.1484089637229; Tue, 10 Jan 2017 15:07:17 -0800 (PST) MIME-Version: 1.0 Received: by 10.182.97.74 with HTTP; Tue, 10 Jan 2017 15:07:16 -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:07:16 +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" 2017-01-10 23:56 GMT+01:00 Carl Eugen Hoyos : > 2017-01-10 23:53 GMT+01:00 Martin Vignali : > >> > But maybe you can put the Store data code inside the planar part > >> > (it's very similar) > >> > >> That means I have to remove the pixel_size context variable: > >> Do you want me to do that? > > > > No i don't think you need to remove it. > > Then I don't know how to do it, please send a patch. > (Please mention the ticket.) > > I though about something like the patch in attach. I just quickly test this patch, pass fate test, and decode a test sample. Seems strange, that the uncompress size, doesn't need to be adapt. Martin From 7527be4ae13d3e134e5eb607e5e7ccd060eb5446 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Tue, 10 Jan 2017 23:59:59 +0100 Subject: [PATCH] libavcodec/psd : add support for psd bitmap mode Ticket 6044 Based on patch by Carl Eugen Hoyos --- libavcodec/psd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 7587ed9..074df51 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -319,6 +319,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, 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, @@ -428,9 +432,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)