From patchwork Thu Jul 2 19:19:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20786 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 7025444988E for ; Thu, 2 Jul 2020 22:20:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C0816883AD; Thu, 2 Jul 2020 22:20:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C13EB68813A for ; Thu, 2 Jul 2020 22:19:52 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id l63so13898880pge.12 for ; Thu, 02 Jul 2020 12:19:52 -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=Rd+hNU7iZpSZymW7egdikgwNouTmzGlH1YG+yhL/NFo=; b=Zy3o/AEbsLmBAwudO/cDgT1oIbhNNjBsWgc/jX0yPQJzVFGgbZaJxzShah63vkG8Wt sbnFJYRFpodnrCp1Y3Yfyd3ihT3lFEmCGqqaXwjbiB9VU3bLq48bsQJZQSYDv7h7uA9q +kokl1r/bZMEoT3ABjG1LC0lpZWUB5EF55xflXEfn4vbigzFs3m9hMDP7vi3PlECChbb iAI5H8QLabjFnFVa4hml6HG/nfkwn3iwiZ17jBHcmZdC6ku8n8Nq1MZ3CRLfAv2rXbcx BlAB5g7JYG0D9rmr+Ff2XhdpuFx2ARMFGwXVo9/upJ5AxCZRadhak4sVKX+7sJL0wzqn MWhQ== 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=Rd+hNU7iZpSZymW7egdikgwNouTmzGlH1YG+yhL/NFo=; b=UUTBTE6eHJkveep1eFwqfoCqVi04pqSmaYTI8ksaEwI82dt+8ZHVgP7KvSYe5vP1ZW IFiWVHfIqimMNlnNo+CXoie6Nyle2h95khHGtvfOECAbTSXcnnR0BHHNCBtVnQMI1O8M FLPVrEsSFLuE6SHyv7NmlHNZAmJSSAw5B0DJZhwBjonkzPC4KR3cci5Xcny9eauYA/L0 26C/AgLrDm2CFxk+bzbd/n9cP1ABQWgpw9CmQPQ+VJh+ZEbd4Sl9wpYwX5kUPGCQkPhe 9JRt/O+RbzEd5X2y/S0KiaIxYEpQ2HrDZ0eElgtO+xpslZDiv7G2pDdDah/89BMcnyS2 zIJw== X-Gm-Message-State: AOAM5314Jxh+XElZYyAs4Gaz34E4wPwzQhbcwmGSlDR/SdE7gq4H+tZd Tnsan7zkIatAOd1Uaqt8UrWrV3YijByV/g== X-Google-Smtp-Source: ABdhPJxTUfY3BVYY1aGBNjasqLCehuA7aGv93py/TkP93OdcH9B5RyAt0kqoJKXDhu0QR5dy9HI2Bw== X-Received: by 2002:a65:4786:: with SMTP id e6mr10280280pgs.258.1593717590575; Thu, 02 Jul 2020 12:19:50 -0700 (PDT) Received: from localhost.localdomain ([122.172.138.213]) by smtp.gmail.com with ESMTPSA id b14sm9596457pfb.186.2020.07.02.12.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 12:19:50 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jul 2020 00:49:39 +0530 Message-Id: <20200702191939.6667-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200702191939.6667-1-gautamramk@gmail.com> References: <20200702191939.6667-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 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" 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..a7e89cd056 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 (!memcmp(b, "PG ML ", 6)) + 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, \