From patchwork Mon Jun 29 18:56:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20723 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp3029525ybm; Mon, 29 Jun 2020 11:56:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY0CLG0r7ufOhIdyRvldZz0tSZ4+XG6VOwN/ms8mvG9HnlRDZj4fau0u1L5VnjoXXPKlVw X-Received: by 2002:a5d:6a46:: with SMTP id t6mr18984335wrw.374.1593457000585; Mon, 29 Jun 2020 11:56:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593457000; cv=none; d=google.com; s=arc-20160816; b=tF6bnVYuzBKRYMdt4mX9Rmk3L4rt67BsfuvykN/SCtc/sWdP3bZyoVCH+Lo79k7lra ugwIdn/O93XiMplqyKBqM5S1ouCsmBxOPFlDd3MhAo571bo6tcwlXIEVbMHyKckE0GWr JST0Y5sI5E++U/RYttRzK/B/3Ko1HYNlRL3ajasoTLJi9gJDB12Q6FAVJ/MxXDHg/ISU VpVX/5fimHAtZ5Mr5EFUErJp2cCUUCvuy5ADHAQnR4WzhmdYcreliZEfL2aMPyB94kMe P6q2Nz0+duvcFwFKS8FVA3h7oZwvOZLFDYJk3624+OLuKEvDOaRWwlq1OYsqzmpF/JRi f4Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=//g/5fVmKrS3LGtmUpoOJlZbGcnJqItJu++kOCy4yF0=; b=QBwJ1Fx7fOYH3hI4harmTO+ciTyXGAUyxR4lTzHsuWXmaXkmcx/3hmvrDy7HjUtVdT z+vUShcsd7Q5u5vVKJGPaR8auAbUSf4vq6e2JdN2pP4MIiZas6hChTRaNwFGCn9+Z56i V1+laOBWGDcrGb443lmKeQnPD1vrbMnxzWZtjuzvh/nCeJOAMF18vZQlRTHOZ33bOegO N+UoXPF+ZwdpJHzhmzJf+cQFCnIxQ6pvYPxzbfBjNdpXrVLGY+E9AFfooXspq78N6Xk6 t1UilBEGNq08fRrt2mEMmiQ2cv6NxcayyJBfnfYx4iOu4rZFUNRXUPZIMVzSP4sYsrtC 19Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=e6dD3wY+; 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 g83si667500wmg.87.2020.06.29.11.56.39; Mon, 29 Jun 2020 11:56:40 -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=e6dD3wY+; 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 517D8688074; Mon, 29 Jun 2020 21:56:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F56D687F97 for ; Mon, 29 Jun 2020 21:56:31 +0300 (EEST) Received: by mail-pg1-f182.google.com with SMTP id e8so8731567pgc.5 for ; Mon, 29 Jun 2020 11:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lwe+PTM+0ejj+z0XXcO58mIYuRUAmVDwPF4zLNRdTLg=; b=e6dD3wY+0ndic5LjNh5vZ30W3MDpVNmifFAqD88GSjGPhpb6k3Lr1K/+6SwXsDnVcO xxW/B2leRB1pEwNWH6N0JVBuW9EMTwi952h9M0nKTJEEaJUj2S9psB00FIH8s4RhxaYa Zc5gKkluWGvFwpE/LXRsNKZpu2gSIkL5tLIFDb3rH/HQpLEeG0B9qBmCY6+DpB34FuaW qbkDUN7UxjKQyIDJU+5Lc4Kblt8g0esrKg4wquZ8AjrOPutlUJV8BhfW1d3aqdSz3Jnc X4C81MW0m2YyRbA4XxF2Yp+Y2sY43AKc1Kjd7lw5VOm+YnICAu8aWf0efDWctEhhDAhA Dm8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lwe+PTM+0ejj+z0XXcO58mIYuRUAmVDwPF4zLNRdTLg=; b=a+S9yG9ECl6Nw9/wc/gJWM2/gYL0JhYpy1Y7hCWrbRlct/Vemju/DhZVsNcXqMcHIK Ad9LE12Y/FZLxQZ0xkH0cOFTmCyg3Wb+972ZYbA68ITM6q4YafM+C2mcQbOYzdpofJki J7tv6fPGlsmBz5rb04LF1KcPPMICap4X6TRIAqLJvGlbVR61nKXxYRyM6voOZJKMIYKD pmRwNhIfyv4i/fIacDZNEzm5fM341x2avzumA2IWsPJzHUFxJtzN4prydyMu7zXVuKp4 +Zs08Ykx5t50qX1hWgEwpKu6pTHg5zA6VHXZI/YGDvm7reMSfgH2ZxzvHFQOhSQzDha0 FBMg== X-Gm-Message-State: AOAM531XMyeaMsnqJuPO93G83BkcSUJ+lGUyxJq3A9jWTJC3DMD3ieuM XHKrdSeokaFEUxnH5xvWCV6o9UmwiBlw3g== X-Received: by 2002:a05:6a00:2292:: with SMTP id f18mr15044812pfe.192.1593456989453; Mon, 29 Jun 2020 11:56:29 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id d5sm261178pjo.20.2020.06.29.11.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 11:56:28 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jun 2020 00:26:18 +0530 Message-Id: <20200629185618.15101-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200629185618.15101-1-gautamramk@gmail.com> References: <20200629185618.15101-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 2/2] libavformat/img2dec: Added pgx 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 Cc: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jQCxNZKXZ7Wz Content-Length: 3680 From: Gautam Ramakrishnan This patch adds support to demux pgx file format. --- libavformat/allformats.c | 1 + libavformat/img2dec.c | 9 +++++++++ libavformat/version.h | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 97fd06debb..f8527b1fd4 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -488,6 +488,7 @@ extern AVInputFormat ff_image_pbm_pipe_demuxer; extern AVInputFormat ff_image_pcx_pipe_demuxer; extern AVInputFormat ff_image_pgmyuv_pipe_demuxer; extern AVInputFormat ff_image_pgm_pipe_demuxer; +extern AVInputFormat ff_image_pgx_pipe_demuxer; extern AVInputFormat ff_image_pictor_pipe_demuxer; extern AVInputFormat ff_image_png_pipe_demuxer; extern AVInputFormat ff_image_ppm_pipe_demuxer; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ee7ceed08f..b6063bb685 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1000,6 +1000,14 @@ static int pgmyuv_probe(const AVProbeData *p) // custom FFmpeg format recognized return ret && av_match_ext(p->filename, "pgmyuv") ? ret : 0; } +static int pgx_probe(const AVProbeData *p) +{ + const uint8_t *b = p->buf; + if ((AV_RB64(b) & 0xFFFFFFFFFFFF0000) == 0x5047204D4C200000) + return AVPROBE_SCORE_EXTENSION + 1; + return 0; +} + static int ppm_probe(const AVProbeData *p) { return pnm_magic_check(p, 3) || pnm_magic_check(p, 6) ? pnm_probe(p) : 0; @@ -1094,6 +1102,7 @@ IMAGEAUTO_DEMUXER(pbm, AV_CODEC_ID_PBM) IMAGEAUTO_DEMUXER(pcx, AV_CODEC_ID_PCX) IMAGEAUTO_DEMUXER(pgm, AV_CODEC_ID_PGM) IMAGEAUTO_DEMUXER(pgmyuv, AV_CODEC_ID_PGMYUV) +IMAGEAUTO_DEMUXER(pgx, AV_CODEC_ID_PGX) IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM) diff --git a/libavformat/version.h b/libavformat/version.h index 3c1957b00c..75c03fde0a 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 47 +#define LIBAVFORMAT_VERSION_MINOR 48 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \