From patchwork Wed Feb 3 13:10:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25370 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 61B95449149 for ; Wed, 3 Feb 2021 15:10:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4698B68A1C5; Wed, 3 Feb 2021 15:10:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2616688179 for ; Wed, 3 Feb 2021 15:10:29 +0200 (EET) Received: by mail-ej1-f48.google.com with SMTP id bl23so35649000ejb.5 for ; Wed, 03 Feb 2021 05:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=EueqerWR5qYR7Oo7MhnYLJL1+DC4Hb5git5f5jTy+0k=; b=lGKML5a6jPAlvgPvVz3ssv+TP8G/8f9VpAz8H6MRrRdy4zQw1COSKu41QDyKK3oi/r 3foqnz++VbVgqJ0876cAZ8aKR1bB+MU2DiPX/m4sQYh+LCL/uDOh857uSw7PY/SrudES eLiVRmYib5AzuG6shapGgEzExGvx9/gt02GJ8xhr2L0l9/8BKoO17bTDEvsjX6lrmyRk hW+Wza7k+wkxa9nHThwts+dfR0aFFWGXhA74wstQtE47gswPsRcRKZhm/fOCwzu+Y2Yi r2ogfBRklbjTqFADzYyx8vDiVNdFCOXjYnfxKdqWY6KiYvNF3Wj9J/Jwn0A1+E0XTboh 1eBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EueqerWR5qYR7Oo7MhnYLJL1+DC4Hb5git5f5jTy+0k=; b=dhAdBJrZthw+JXO6SQSvDJ4ODUo5BrGdb0376gigD+1fFbQqgj6Esd+Fl+fC8vSWDW DkTkcVvsZedcNrd02uNYMJKrmDKq/6iL/5SECcSoq/kC7TeN/pfEZVEQ5KZ5S1kRmAOJ IUuCk1B71JEYpuahw/uNeepKTrbnixE2Je3B6qfdg5iN9vy/0WuF/d4c6fx92mOZM3aM NKP2xjGrOtOkNld/0VdEeilZ8r89H7hFN3PUMOxO5k9NXAuK0MRusGfX12euWmnuW6BO edzqraCDbbevZh/bWm6ZhmanWbbBuRBIingZuO5SR6Wjm6/BYcdwt/7YH6S8zCaQrZ6U rfbQ== X-Gm-Message-State: AOAM531pYOyguvc+dlIOx05P9lfjbVlMH6vPptoMhvNpLCsFDgKoC2oZ fNZDJHaTCxdDpt6uPeQcx8ROYRT7klYjug== X-Google-Smtp-Source: ABdhPJyPRZl3wuAEgvGfFOlzvplxtxRKBn+CfwsSrCASFKPmpgqTQxultT66iJEyJ/o9HTnd1h+h0Q== X-Received: by 2002:a17:907:3e02:: with SMTP id hp2mr3090479ejc.411.1612357829131; Wed, 03 Feb 2021 05:10:29 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id p10sm864649edj.2.2021.02.03.05.10.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 05:10:28 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 14:10:19 +0100 Message-Id: <20210203131019.7235-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203131019.7235-1-onemda@gmail.com> References: <20210203131019.7235-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat: add xbm_pipe demuxer 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2dec.c | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index b977fa0b1e..17d4467818 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -279,6 +279,7 @@ OBJS-$(CONFIG_IMAGE_SVG_PIPE_DEMUXER) += img2dec.o img2.o 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_XBM_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 diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9628c726a7..f837ddabc8 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -518,6 +518,7 @@ extern AVInputFormat ff_image_svg_pipe_demuxer; 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_xbm_pipe_demuxer; extern AVInputFormat ff_image_xpm_pipe_demuxer; extern AVInputFormat ff_image_xwd_pipe_demuxer; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 1279d47f54..dcf07a69bc 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1031,6 +1031,13 @@ static int pam_probe(const AVProbeData *p) return pnm_magic_check(p, 7) ? pnm_probe(p) : 0; } +static int xbm_probe(const AVProbeData *p) +{ + if (!memcmp(p->buf, "#define", 7)) + return AVPROBE_SCORE_MAX - 1; + return 0; +} + static int xpm_probe(const AVProbeData *p) { const uint8_t *b = p->buf; @@ -1139,5 +1146,6 @@ IMAGEAUTO_DEMUXER(sunrast, AV_CODEC_ID_SUNRAST) IMAGEAUTO_DEMUXER(svg, AV_CODEC_ID_SVG) IMAGEAUTO_DEMUXER(tiff, AV_CODEC_ID_TIFF) IMAGEAUTO_DEMUXER(webp, AV_CODEC_ID_WEBP) +IMAGEAUTO_DEMUXER(xbm, AV_CODEC_ID_XBM) IMAGEAUTO_DEMUXER(xpm, AV_CODEC_ID_XPM) IMAGEAUTO_DEMUXER(xwd, AV_CODEC_ID_XWD)