From patchwork Mon Oct 24 20:21:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vignali X-Patchwork-Id: 1159 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp2338123vsd; Mon, 24 Oct 2016 13:21:36 -0700 (PDT) X-Received: by 10.194.87.170 with SMTP id az10mr15385288wjb.189.1477340496779; Mon, 24 Oct 2016 13:21:36 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v83si14140076wmv.63.2016.10.24.13.21.36; Mon, 24 Oct 2016 13:21:36 -0700 (PDT) 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 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 19EDC689CB2; Mon, 24 Oct 2016 23:21:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f44.google.com (mail-oi0-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5A3A689BEA for ; Mon, 24 Oct 2016 23:21:23 +0300 (EEST) Received: by mail-oi0-f44.google.com with SMTP id m72so57572201oik.3 for ; Mon, 24 Oct 2016 13:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=S6hAxejrTUu/gr7DO2jxEsa2BJofY8Z9dy+JafBeHL4=; b=VTNcEalDDHu6raib6X4eTxrVWUQ4qpx0QgQjWFVoV4JChMGq1DbmeLw3c3nJFX9Tu2 BJB6mXdRQf31p1i6PwYKTtzxdqfteXMV76J2fRY1b/pD++SaILvGmf3QuCUNYvsmz66L aBLSvL2iq6c0Xm7FAf5kME9fOzuo1g5qBhMo1im2h69/M0OqlpeajZKUmMt3NpGGu3vJ LBZi7gIiSyT71YqdKJcFIRfgIS/oV+zYxYpEprf7JGLqbcs5nYP76GWOEm2nPZym78ji XrOlZxnlyTGhJtZbyOaJpY71jPafRzPoP1ChWt3R3ZFagLM/MSkPofCWOgrz/TZqA6Dv 2ZAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=S6hAxejrTUu/gr7DO2jxEsa2BJofY8Z9dy+JafBeHL4=; b=muCEUswR6BRHuuNUQ1FWC86qCyO4+7wJ6ygy/i3qtAD72DSZl2Ve/EtSxae7FVkCe5 zROXjVyoKpyH3e88zTzSTZisKuqqLrkpyD1ULWbsxW9IZzQnIq/9VPubjYyZy7Edoy1A DVVTVewVI3ojONV7wEW6fe4cMMD81k9jAKh7rbAlsV2PUyGgODVb1myFVoVKrmxA8gfo eyiVklKeYpdKO9z++d7b6499CndOP4MpcAM25Dw4GIJnHJZ7q/C4KwFmv0oHlSJ34Sqt 2zIWB7oUoGBVWJGL4j3nsZeoHjAIdDcCBurT3p+Wj5b/sOPTYWN8sf5qhCZAWGPLepPT fEnw== X-Gm-Message-State: AA6/9Rkbr4LRhQIFmL2daE10e5L2wRHRdv1u4yiAE97WiR1SyU2adj5IZdDZwAszoJ8LB9NtK990HzAubxRFJQ== X-Received: by 10.202.78.84 with SMTP id c81mr20197272oib.181.1477340485125; Mon, 24 Oct 2016 13:21:25 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.75.197 with HTTP; Mon, 24 Oct 2016 13:21:24 -0700 (PDT) In-Reply-To: <20160807001755.GK5460@nb4> References: <20160723180734.GA4887@nb4> <20160725004647.GV4887@nb4> <20160802112826.GP5460@nb4> <20160805102546.GU5460@nb4> <20160807001755.GK5460@nb4> From: Martin Vignali Date: Mon, 24 Oct 2016 22:21:24 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] libavcodec : add psd image file decoder 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" Hello, In attach new patchs. I tested with zzuf using zzuf -c -s0:10000 -r0.01 ./ffmpeg -i inFile -f null - on one sample and with zzuf -c -s0:5000 -r0.01 ./ffmpeg -i inFile -f null on 10 others samples Martin From 5d3bdad458987ece0dfdbaf6518208bba0fde321 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Mon, 24 Oct 2016 22:17:19 +0200 Subject: [PATCH 2/2] libavformat : add Photoshop PSD file. --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2dec.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index 5d827d31..5ce4cab 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -235,6 +235,7 @@ OBJS-$(CONFIG_IMAGE_PGM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PICTOR_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PNG_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PPM_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PSD_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_QDRAW_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_SGI_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER) += img2dec.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6a216ef..9d77b9c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -366,6 +366,7 @@ void av_register_all(void) REGISTER_DEMUXER (IMAGE_PICTOR_PIPE, image_pictor_pipe); REGISTER_DEMUXER (IMAGE_PNG_PIPE, image_png_pipe); REGISTER_DEMUXER (IMAGE_PPM_PIPE, image_ppm_pipe); + REGISTER_DEMUXER (IMAGE_PSD_PIPE, image_psd_pipe); REGISTER_DEMUXER (IMAGE_QDRAW_PIPE, image_qdraw_pipe); REGISTER_DEMUXER (IMAGE_SGI_PIPE, image_sgi_pipe); REGISTER_DEMUXER (IMAGE_SUNRAST_PIPE, image_sunrast_pipe); diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index a920f46..d668249 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -822,6 +822,39 @@ static int png_probe(AVProbeData *p) return 0; } +static int psd_probe(AVProbeData *p) +{ + const uint8_t *b = p->buf; + int ret = 0; + uint16_t color_mode; + + if (AV_RL32(b) == MKTAG('8','B','P','S')) { + ret += 1; + } else { + return 0; + } + + if ((b[4] == 0) && (b[5] == 1)) {/* version 1 is PSD, version 2 is PSB */ + ret += 1; + } else { + return 0; + } + + if ((AV_RL32(b+6) == 0) && (AV_RL16(b+10) == 0))/* reserved must be 0 */ + ret += 1; + if (p->buf_size < 26) + return 0; + + color_mode = AV_RB16(b+24); + if ((color_mode <= 9) && (color_mode != 5) && (color_mode != 6)) + ret += 1; + + if (ret) + return AVPROBE_SCORE_EXTENSION + ret; + + return 0; +} + static int sgi_probe(AVProbeData *p) { const uint8_t *b = p->buf; @@ -947,6 +980,7 @@ IMAGEAUTO_DEMUXER(pgmyuv, AV_CODEC_ID_PGMYUV) IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM) +IMAGEAUTO_DEMUXER(psd, AV_CODEC_ID_PSD) IMAGEAUTO_DEMUXER(qdraw, AV_CODEC_ID_QDRAW) IMAGEAUTO_DEMUXER(sgi, AV_CODEC_ID_SGI) IMAGEAUTO_DEMUXER(sunrast, AV_CODEC_ID_SUNRAST) -- 1.9.3 (Apple Git-50)