From patchwork Mon Jun 29 19:16:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20729 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp3042214ybm; Mon, 29 Jun 2020 12:16:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAvS4rF1QxPnjKH30jmjcWvE8qBbIRtrT016DeoU0txGYJZ/8Vb8naJzGMUUivw0rbsr9v X-Received: by 2002:a05:6000:1107:: with SMTP id z7mr18054313wrw.355.1593458188651; Mon, 29 Jun 2020 12:16:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593458188; cv=none; d=google.com; s=arc-20160816; b=D+Y977nx6ZsI9AH7lpDWK+CxgLGlVnRwpNLtfoWkSyhitG1jTJcP6jpyr/2rTqOH6S TSRGVbvjNEdaUSlkL2s/+IR95kKjpmTxDftAWzDBhIajAS+oibhOqB7RyYQP7jEzM1Bo mDi0JcalWIYJCCpPvQ8D2XzlWEziGWdEAP0hqfHw8ZCC2FDhRIl8poydu9coxQ5vPznN 8X/yXC/ksvaPagNuUdfn+/EPcKPtIvueMvZ+ojLcNcm91ROmWMkla1cFJXRKiijFRdme 0hPZID3MInB3l+fvP79IYlHp4npPsWwZ0G0eOltWc6BRsvYdywt0sz5xpnt8OSJ/sPE+ S3gA== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=B+I27PLKvOq9L7CK4/5YkU4Imw6AJno9M0nSLoCY+Ss=; b=y02fxmnXqhehnCcYyOiRfglCjbWLSWwxnn6gGlvDt4OJUhjZvAVKp7LVFhql5n1WhT m8owdiygf/G95i9o0CGmYNsOAwVtuSu9WbaN8yMnYiYYh8i1D7q+cseDyAq+w8QsnNrR bqY/+IdQ87f2H6dtNRLa8Rfu3hvAW8sZrBhEVOj9HZ8DxDrs68/6YNWzYmoJua/qQRGg UFHLdR0xGQUxinsajix9MRpwNHwgfENpsNiMeuQOlzG7akQjP7lBOwIuw7qp1yEZMu83 eHrPVW5Y967A12M5VA9UCry1O0Y7yvOdqAg0tQ3phJ92p5jPXO3ogCcs7F5wk8ovYnvI 23QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RL2cpqEE; 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 y206si708924wmd.121.2020.06.29.12.16.28; Mon, 29 Jun 2020 12:16:28 -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=RL2cpqEE; 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 5330F68806F; Mon, 29 Jun 2020 22:16:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 287726802DE for ; Mon, 29 Jun 2020 22:16:18 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id a127so8285507pfa.12 for ; Mon, 29 Jun 2020 12:16:18 -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; bh=Rd+hNU7iZpSZymW7egdikgwNouTmzGlH1YG+yhL/NFo=; b=RL2cpqEEpk4hOk6m1TE6bVNP5Mh90UgydBIb4MKKCa6oGbC5AEZTM0gG32HeBiW/x3 uUUBcmc4+H+I5wNjZ5HlNPOd+Fwa5PffpHweUAlJuYhOgeYWCCA428k3c181FJwovgup s/uFvVfwpr/ZmRKTKHcavYF5ppUGpKA9sKpblX4ukN9XwTc+ApLLDPVW6RpXObNUicdc g76cYh9ve3mSKrBIqZqVnvxjxsKCUwDlBOxbkFwS0GnMAv7kjqsj4YxFVrQYQUQqynZm KckYc7ZjbHqR+aqANN+qR6tOpksbJeaoABLKINEY5/6X+CAZKk5+Hgq2j9gGrQIARia5 mx0Q== 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; bh=Rd+hNU7iZpSZymW7egdikgwNouTmzGlH1YG+yhL/NFo=; b=IJ5h2j3Gghv2h+oCPyj5CVYYgg1C2Pq6LokGT4eFGojhzAzDqV9iO7YqLxorQJDMkf g6T0aLaSltmoNXL+4Py0bwhMA3vOU4dYAxWBndfbA1hnzkh68ISNIFSCuA6YUmVIEOQZ bt3apDEMW2/W+FK0Ptup4uuqWdBId3/8FAgpXu5rESakgxGsaBb4mA3Pi57Os158Jsmm TvqvWfkDkXIHj7aT7HtJCD1b0spNNg6rHlSgR1uqx90vMqL2YhWshVvi2408natsf2na ADI9TUVdv1elKNgPGlWiSH8ikUse/R+kdypVJLk9YHV/i+eeZU4gefmHyCXvILnwbgSd nu+A== X-Gm-Message-State: AOAM530AXJMvt+/xXYAI9QO+IYfwa5jZKYPGGNNgWTXahVSqr38aTSUx 3sYVCAgD7qK+c6yZEsBcHrruC6SkCkuyVA== X-Received: by 2002:aa7:871a:: with SMTP id b26mr9516647pfo.294.1593458175589; Mon, 29 Jun 2020 12:16:15 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id m31sm272394pjb.52.2020.06.29.12.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 12:16:15 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jun 2020 00:46:09 +0530 Message-Id: <20200629191609.32192-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v5] 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: +bK6Kc9j1s8/ Content-Length: 3636 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, \