From patchwork Sun Jun 28 14:43:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20662 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 ED382448A42 for ; Sun, 28 Jun 2020 17:43:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA51568B700; Sun, 28 Jun 2020 17:43:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BAE168B112 for ; Sun, 28 Jun 2020 17:43:40 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id u9so2491887pls.13 for ; Sun, 28 Jun 2020 07:43:39 -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=eWLYzixbP+MyhwjRKrdDdUTeaRHxHx+d133a/FjfkZI=; b=tTtFN4XhNqiXbb797EbT2xAcuz/T4vpwUkFHghLy+SbmBrl+EMj/Azv+oY9LQiG774 9/es4+REvHg95SvqaY71kt1zNuzL0MIsGt383JYTIBAtQg+RclaIpnkchnKnWTfYVwsZ 0bnKHfXlcK2k6/5myeBBoNyi1BKHoiwhdY8nBbo6P5c3adulXouJnqIjiwLf03fvRjFh HVK1qxSdRHihUSVIk82bkA8VdYV9iu2+t/qpr4LAFu1LCK9EEAmSZZ7Kcbjc4OU8cNd0 W8nWdvKNK1Ae0dUDOXv8eY+yihVG5nd32kHHPdtANuUUlR6XUNBFxApwv0fbA4bV6L95 1KEw== 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=eWLYzixbP+MyhwjRKrdDdUTeaRHxHx+d133a/FjfkZI=; b=Y/3I1ZGGlOedco915JoT72jpn14z2EBCo6ktPQyiJkCpqkN6WQNmO+FN0WNHSJE1RG Dq+WOKJCMW0hjwlvqr20Ay4wcXw61RMuaKSDR4L/2kabFNVNsDha2OhLnNco7OO8SPQc yA29JAVFDvlUr67uK0sb5Q8LsyOggpGV2Uz6t8peOYkV28/pj09U6YtWVxj6e35uYkAz PCmjJUwIcyQlFe/LraxgVC80vdgW7VUIwOa+bJERaNi4FeB2AdIWhqoI1zjlaJw8pArr NVBuwEchRXdFrZSbHLQwlSF5ttudlBoptIwhcC7OiPzvwHfZ5aoGSWeeOxfQF1McRsCz 7f9g== X-Gm-Message-State: AOAM5300zqkutakPYBS5NozWFPUwoxiod5Gk0RgQaOpd6V0GkIHRUAI9 VMCKOY0UXS8vE3mFoY9i1bh+t+qCCJc= X-Google-Smtp-Source: ABdhPJwXKY7EKRCaZ1P56GZ0VD1Dg4ePS0BfTI/LAFRCWELaFFalugzKdGICTFo4TcrVH1lzhZNgsQ== X-Received: by 2002:a17:902:d892:: with SMTP id b18mr10494381plz.335.1593355418035; Sun, 28 Jun 2020 07:43:38 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id d25sm26877338pgn.2.2020.06.28.07.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 07:43:37 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jun 2020 20:13:29 +0530 Message-Id: <20200628144329.7408-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200628144329.7408-1-gautamramk@gmail.com> References: <20200628144329.7408-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 | 10 ++++++++++ libavformat/version.h | 2 +- 3 files changed, 12 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..ec27e04a30 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1000,6 +1000,15 @@ 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; + int ret = (AV_RB64(b) & 0xFFFFFFFFFFFF0000) == 0x5047204D4C200000; + if (ret) + 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 +1103,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, \