From patchwork Thu May 24 01:30:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 9066 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1500802jad; Wed, 23 May 2018 18:30:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZojBXKKZO6n8Yp8oR3HyIPVYHQ4/n+LaLO7j4HthM4/UerQa3h8Zy7p/QtZDhCKlOL6KPDP X-Received: by 2002:a1c:5894:: with SMTP id m142-v6mr5601683wmb.10.1527125452786; Wed, 23 May 2018 18:30:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527125452; cv=none; d=google.com; s=arc-20160816; b=waDW5Xw44qS2P7q0OwxQCIApFL0KiUAFM0iXSpm6QJ29QgqSum3qihkWocjG0uaKQZ szfzRIa00MVWEm+bcFZxa6jLsmdwZv62d36Rs7gIusfVMyCvbQ5JvZ9+9eCZGoDPvtge yXKox+QPN5A2XRRC1ARJqA2+blVKsFJblP+3wQauWLFgjt1wQCkbe9OKg1TQ2KRzlh80 N68VWsLDJeoRF41zn0j9yf8n3WcanbXCvwMiUtdrd9vZoekKeic3nmh83CbbreCu/iiw FyFLquaf5k/zKeulUeRG2ua9Y87uF2o1db6eo1tIf2k4vE84zMAWPtA6IDOH/35OgzjF C2dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=viiVxYugDfdVmDlxpGLNek0E60HCP7M1E1pEdgEHT2I=; b=rp5bpjreqJbpofJHZOkLEdEV4UDfHroqJUMDu9ivJ7qJy+JrGEdJLVwovsQVPaqslf EVo1zl8we2ZK5AvzvaqNljCK/Jpcm0w/S6QKZHEexA9l+VoLr0yT0YVPVGfEAI8jfnbv vM2Z0IDQHNzzgEhwzscgZNirQtXlIjJomY/dhmb0HyHwoZQtfCRpFzNsix3jO+ilUVx5 C97f6HCwmfLf0KVuR3+fBabaA5z7DWHQ7V6M256bB4tjRQVLPUiXh9mOU0/iKn1V3Xkm oONxLMOK1oC6Lho2obBVrQniNtBMi2eNtGy16+ekFGHDweZCXktjHtEYrbBVu4476Muy f2PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tJDAGnp2; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q5-v6si8118011wrj.213.2018.05.23.18.30.52; Wed, 23 May 2018 18:30:52 -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 header.s=20161025 header.b=tJDAGnp2; 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=QUARANTINE 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 C957C68A2B1; Thu, 24 May 2018 04:30:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51B4A68A20C for ; Thu, 24 May 2018 04:30:02 +0300 (EEST) Received: by mail-io0-f170.google.com with SMTP id e12-v6so343572iob.8 for ; Wed, 23 May 2018 18:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=R3DV5KkPWDmIOQXXFRI47rtOCSIXRBQds4BqI+wsWx0=; b=tJDAGnp2rNCeq1PRbQdqwBH5ZdxiJ/GiVad43y1+sboouEgm/5hcyOriJdLkpBqzAm gV+7i2G5cDaE20ifiZWl7BdjYlHSv9b8E5lwNk5qp0jvYsqHPvOl0e84/XW6nz/sKGAE PRbAbSr0+5CFktCustnY079vzIDUH1FInJi9cJZ6OWGXn79Ctk22XSnuf7pcTDQp3wfF 9QRRyKMGMOZXlwh/DNvCF9HikypQ0WKCI8p361G1cgMu2afAXhy+6mwO4nBVvYmTMTqv DIbF2FS42rgQfI+JZOkGK4y+crrCNtvP4nQFHRAloZK2ei1JnHkzbQ4BfWp7aUW6UGz1 7jIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=R3DV5KkPWDmIOQXXFRI47rtOCSIXRBQds4BqI+wsWx0=; b=MUzWGZKt3yTg0OM3LhL9LE0mXJ9JY14X2QOG2itBdnlyGbM/IiUwAT26ccIw32+61j 3pNXpbIEW78D7vRsIa//nMJUtx6qJY88sUibeo+j/LudlXcoz+NQtEMpPnpDgAIw+vvg lRjYo2qfROE9tV7xpsaXgo0eQ0a/SwmU+sb22p/qeGujgJx1bonnVJJ1SM9BRTtaWNM9 HMxD3l/q3qAq5AzVz24TCLXxXsPsxU3+oDTkzvPYHDkVQgvmsuF2zW+xlQyrI9NNOdQ9 XRuC6wRVpAt7nXrtD/CnoAUJGdmIUXHiB2kS2E+HX3DZBVi1cuTiLqhsHVAb3zzMcgqO b6lA== X-Gm-Message-State: ALKqPwetUZbSo3diTZUN9Bay1sYHVq3lUOUZVc4oqnRvccL0XS1p3UOK qRbivD2vGZz98tQgWFEC9ya9c/vVG1ILObXhe+E= X-Received: by 2002:a6b:ac85:: with SMTP id v127-v6mr4856072ioe.286.1527125443031; Wed, 23 May 2018 18:30:43 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:81c6:0:0:0:0:0 with HTTP; Wed, 23 May 2018 18:30:42 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 24 May 2018 03:30:42 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/img2dec: Autodetect xwd 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" Hi! Attached patch implements autodetection of xwd images. Please comment, Carl Eugen From c0e14393a570b84804c5d9c1208bc4a0a95f3641 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 24 May 2018 03:19:43 +0200 Subject: [PATCH] lavf/img2dec: Auto-detect xwd images. --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2dec.c | 32 ++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index a5585dc..8fb075f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -258,6 +258,7 @@ OBJS-$(CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_TIFF_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_WEBP_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_XPM_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_XWD_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_IRCAM_DEMUXER) += ircamdec.o ircam.o pcm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a94364f..adcc8d9 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -476,6 +476,7 @@ extern AVInputFormat ff_image_sunrast_pipe_demuxer; extern AVInputFormat ff_image_tiff_pipe_demuxer; extern AVInputFormat ff_image_webp_pipe_demuxer; extern AVInputFormat ff_image_xpm_pipe_demuxer; +extern AVInputFormat ff_image_xwd_pipe_demuxer; /* external libraries */ extern AVOutputFormat ff_chromaprint_muxer; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ffbc9a6..354b811 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -34,6 +34,7 @@ #include "internal.h" #include "img2.h" #include "libavcodec/mjpeg.h" +#include "libavcodec/xwd.h" #include "subtitles.h" #if HAVE_GLOB @@ -974,6 +975,36 @@ static int xpm_probe(AVProbeData *p) return 0; } +static int xwd_probe(AVProbeData *p) +{ + const uint8_t *b = p->buf; + unsigned width, bpp, bpad, lsize; + + if ( p->buf_size < XWD_HEADER_SIZE + || AV_RB32(b ) < XWD_HEADER_SIZE + || AV_RB32(b + 4) != XWD_VERSION // version + || AV_RB32(b + 8) != XWD_Z_PIXMAP // format + || AV_RB32(b + 12) > 32 || !AV_RB32(b + 12) // depth + || AV_RB32(b + 16) == 0 // width + || AV_RB32(b + 20) == 0 // height + || AV_RB32(b + 28) > 1 // byteorder + || AV_RB32(b + 32) & ~56 || av_popcount(AV_RB32(b + 32)) != 1 // bitmap unit + || AV_RB32(b + 36) > 1 // bitorder + || AV_RB32(b + 40) & ~56 || av_popcount(AV_RB32(b + 40)) != 1 // padding + || AV_RB32(b + 44) > 32 || !AV_RB32(b + 44) // bpp + || AV_RB32(b + 68) > 256) // colours + return 0; + + width = AV_RB32(b + 16); + bpad = AV_RB32(b + 40); + bpp = AV_RB32(b + 44); + lsize = AV_RB32(b + 48); + if (lsize < FFALIGN(width * bpp, bpad) >> 3) + return 0; + + return AVPROBE_SCORE_MAX / 2 + 1; +} + #define IMAGEAUTO_DEMUXER(imgname, codecid)\ static const AVClass imgname ## _class = {\ .class_name = AV_STRINGIFY(imgname) " demuxer",\ @@ -1016,3 +1047,4 @@ IMAGEAUTO_DEMUXER(svg, AV_CODEC_ID_SVG) IMAGEAUTO_DEMUXER(tiff, AV_CODEC_ID_TIFF) IMAGEAUTO_DEMUXER(webp, AV_CODEC_ID_WEBP) IMAGEAUTO_DEMUXER(xpm, AV_CODEC_ID_XPM) +IMAGEAUTO_DEMUXER(xwd, AV_CODEC_ID_XWD) diff --git a/libavformat/version.h b/libavformat/version.h index e3975f5..b050747 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 16 +#define LIBAVFORMAT_VERSION_MINOR 17 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 1.7.10.4