From patchwork Thu Dec 20 00:00:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11485 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 49E9944C372 for ; Thu, 20 Dec 2018 02:00:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 631E268A9E8; Thu, 20 Dec 2018 02:00:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f172.google.com (mail-it1-f172.google.com [209.85.166.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A33368A9DF for ; Thu, 20 Dec 2018 02:00:32 +0200 (EET) Received: by mail-it1-f172.google.com with SMTP id g85so395657ita.3 for ; Wed, 19 Dec 2018 16:00:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=oM5PssoqrIc73/1vE10gebzixw6yd7iZvNJ5wcNqOaY=; b=ikSx4qNs1y7cybVNdH5bse/bTD3HiehBeMzV0Ggyf+PnmMG3kAiLIfLn3vPsgCl03m 4Bozs4hN6wydR0PMeFUtRGMXgJHlE4uzN3ojmVngArTL5KEkI2c6IYYWQmFsZEAR1lwt 645wxwye+Y8+X3FKQEH9p8JrL5HTZEwuHakAVtmWbsHVfNPu9yXv0NnthjX3f59o1lFh ugQTP7DRm+SkXysosZxzd+UZ19nRN5w7bBba0+pb1+KMDM8++fdmygpXhASKm/oRif0z 334UvVyMjmYa6Vu62G/bYXWrGOXScp8h+Q7zCOjTFFNyh2XdQWpYIoQrDaNjv4djg/7f xx6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=oM5PssoqrIc73/1vE10gebzixw6yd7iZvNJ5wcNqOaY=; b=mzA1zz1yW9pUp/rUpI8Fbhd8p1eg/9QrdDdHy6Q43kmXhFmigt0l7TXBz+KJsF2v52 ssusDSpya6wbTnNQ2px7HBToAT0kU77G0yaUjh56IvPZLmT7EwbL9y/YelYVqKEc6WlA /vWEqdEFBHixNDWVUatbTCDWap9LoW72Lf0AVPvkQqkBwugFATO+c4f0MZHddWW9F2Ub OD1PUCTel2Phtq/uEVPWinnoOgZyKPdgvYvwAxUz4xFYeXyw9Bo7/hYvM+D7ZesQWfxz QG3BTMjPCqopURbTYd0nzyQCE90cwyUIxu80Wz5Z5MsJS+tfaTTJbUr8IYc96ED6VjBT bc6w== X-Gm-Message-State: AA+aEWaUWDeqo9jjAa1ptI37meUfbLJkVu4CPnAwA8Cgp3urmo487uUp QoGUlt7PaxTVhsmAq7AxOzutOpOCFhisMZrkMhyEUg== X-Google-Smtp-Source: AFSGD/XR7oiKfg5DN0R7B9M8akrUs4vrIMLD1qLWKME8gamG6TBeNLjB1jjyYZP5pKDPzZd6Wf/ehi5pMY9p/K3nLLA= X-Received: by 2002:a24:130a:: with SMTP id 10mr8334560itz.58.1545264033458; Wed, 19 Dec 2018 16:00:33 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:5f11:0:0:0:0:0 with HTTP; Wed, 19 Dec 2018 16:00:32 -0800 (PST) From: Carl Eugen Hoyos Date: Thu, 20 Dec 2018 01:00:32 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/img2dec: Autodetect Photo CD images 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch depends on Paul's PhotoCD decoder. Please comment, Carl Eugen From b7247956162c8104ba8bef90ea85e2fc3578b643 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 20 Dec 2018 00:58:47 +0100 Subject: [PATCH] lavf/img2dec: Auto-detect Kodak Photo CD image files. --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2dec.c | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index 0e43a12..1f0fb45 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PGM_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PHOTOCD_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PICTOR_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PNG_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PPM_PIPE_DEMUXER) += img2dec.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index df83b04..b965bc2 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -472,6 +472,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_photocd_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 e82b1df..09de5a9 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1019,6 +1019,17 @@ static int gif_probe(AVProbeData *p) return AVPROBE_SCORE_MAX - 1; } +static int photocd_probe(AVProbeData *p) +{ + if (!memcmp(p->buf, "PCD_OPA", 7)) + return AVPROBE_SCORE_MAX - 1; + + if (p->buf_size < 0x804 || memcmp(p->buf + 0x800, "PCD_", 4)) + return 0; + + return AVPROBE_SCORE_MAX / 2 + 1; +} + #define IMAGEAUTO_DEMUXER(imgname, codecid)\ static const AVClass imgname ## _class = {\ .class_name = AV_STRINGIFY(imgname) " demuxer",\ @@ -1051,6 +1062,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(photocd, AV_CODEC_ID_PHOTOCD) IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM) -- 1.7.10.4