From patchwork Sun Sep 12 20:20:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Reboredo X-Patchwork-Id: 30197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3423374iov; Sun, 12 Sep 2021 13:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKGBMYhqilPS3AlxbW64oDKTre2OHACdJtvIIKzxZvX0zU7kiSZ5Qa9TljGDuqL68VWhzI X-Received: by 2002:aa7:cdd1:: with SMTP id h17mr9775897edw.346.1631478044161; Sun, 12 Sep 2021 13:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631478044; cv=none; d=google.com; s=arc-20160816; b=W3XNMcwtP3z2a0etcgP6PCkuPriSNSfGbi4w+VxpAWEo9/UngzI+VIXdkIu8pr3VXs /+qYS9dvHIgeZBuZeLdJ9Ebrsmv5exj+68BW8PyBvNGI/08/sH8sYXx9IKHkq5feF1BU fxl7/8iDw7sS7nuDMqtMYFrOsu+blsfS59cIipfdB24iARNqwG+X22tAqOo1eq/ukZ7Z 7+4uwjO2LOgNfrUCCEKkPyFeAEEmxm2x63OveJuZy9sCrJIaEyeiI4C+uTOn3QEXbBx0 YSz+UnV9+FOiQkqPxanO2PKgmE84atuOSjlxauimgxmzURKPB7mUYBxZ7jCL+5/JvVJn Kdbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=imn11/iA6tEkI6d0F5ikj2ew4d20y2DEY6h/iUg5X4M=; b=UOY8jcHDrIG8jwB2WM5Ez2CwaL3AqOfZNQoYNRzq029K/cuoZ5ABZlT+j+E3rcsyeF TXx7D87aPJBNYG4X6GI67kty7kPCprS5tMRBWXkvjwvLm2gwnZ627b+qx7HF5L4xRnrr 9dCGHtVVza2TTxS8gOuXWHcw7Gvj+Ia92u/e6yUjj3K6IwJQNVq0nLzfIt0HQRaemELJ yZ4nGIKH2K+ZVcDRaRcM3iPONDtdJSORDqWGe172GiZH2YsIWB8/FN+egoRtfVliF4HO jV89XUT7/1w/t93dUAkiRFpHCVCHbhNJpAZUlHddvOTdmdrNdC6d05cDhI81EFW3Zyt1 XMQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YLroYtrP; 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 d26si5211457ejz.183.2021.09.12.13.20.43; Sun, 12 Sep 2021 13:20:44 -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=20210112 header.b=YLroYtrP; 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 E7E5B68A9AD; Sun, 12 Sep 2021 23:20:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f54.google.com (mail-oo1-f54.google.com [209.85.161.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FD7968A7BB for ; Sun, 12 Sep 2021 23:20:27 +0300 (EEST) Received: by mail-oo1-f54.google.com with SMTP id y47-20020a4a9832000000b00290fb9f6d3fso2677469ooi.3 for ; Sun, 12 Sep 2021 13:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=E273Q3+441YmXtSA68u4D5hp7F5nsju16OcINgeWUbs=; b=YLroYtrPP00lWU/wI5FjdAeuSux6FdLM4mgp8/GmcM1/AORpQ5mFKkk7gd5yjUHxS9 Dgo3aO9nB/s41yzDD48DwftFDG0B0Vw1o1rLdbVb5qW/EKRX09+zr+mxkzEQNSl0kAEu 5R8Yt+zFffkyDMU8qJ3nd+X7lfgDALAX1TA//UxgH9NzL5czNCQXUYd6w44AT1orfN0k JBXCtmlt/5GjopFg4dB6nZxrJiPUEwvmJcLSDn3L8GhedQHtzl7EdKeDoEpSg9JBXMcI bsDt0DcQQ73buWVK8kcn4q26OdxfBULoCCsw9XhYfB3jsq+3Efn4uP/9Sny65JUdvujj lxQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E273Q3+441YmXtSA68u4D5hp7F5nsju16OcINgeWUbs=; b=gAUhaU0yMBPgXHeY8pcjTB3anKulrvGeiZc2FsUaBdDT5IdUX64V7Eqm0GJOUgfGuU PwLbkPEqqxwqLUp9Ws3VdLbg9U7BzWPe+aNLXzTi6B367NhQPgDZD+9h9kOfNbvpVtTO js812eqLRXSee3a04SBczaCBedlF13QELBy0ezbjwxKjO0Ohhte5BJC4rDCNJsSg+Ogq WpRaaxIsrulC8yVayQf7xEMGHDO+bMLoBKp4D86RGz4sgiIGderitku8efILVCnxjtNr e5O2ueoZrEWq2GiiCRtvkYzhXmVq4NbBz/CcXanQB6WPFgXz8SFqatC62CP3BYXdo3GC OE3Q== X-Gm-Message-State: AOAM530ysNZK5e53V40Dv0dgVfgH3msWGd3mVdKyPEPEprrTeLFF7lgf wK+sYfKzkRtcmlUw3bAdAPq3/buW+uY= X-Received: by 2002:a4a:b402:: with SMTP id y2mr6604673oon.6.1631478025837; Sun, 12 Sep 2021 13:20:25 -0700 (PDT) Received: from localhost.localdomain (static.220.238.itcsa.net. [190.15.220.238]) by smtp.gmail.com with ESMTPSA id m24sm1206111oie.50.2021.09.12.13.20.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 13:20:25 -0700 (PDT) From: Martin Reboredo To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 17:20:07 -0300 Message-Id: <20210912202010.1542872-2-yakoyoku@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210912202010.1542872-1-yakoyoku@gmail.com> References: <20210912202010.1542872-1-yakoyoku@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/4] avcodec/webp: compatibilize with avformat/webpdec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: FQJvd5J6yfKl The demuxer implementation splits some RIFF chunks (`RIFF`/`VP8X`/`ANMF` + frame chunk) or sends the picture chunks separately. The internal WebP decoder waits for a complete file instead and by consequence it needs to be modified to support this kind of fractioned input. Fixes FATE tests with WebP. Signed-off-by: Martin Reboredo --- libavcodec/webp.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 3efd4438d9..7858d69481 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -40,6 +40,7 @@ * - XMP metadata */ +#include "libavformat/internal.h" #include "libavutil/imgutils.h" #define BITSTREAM_READER_LE @@ -191,6 +192,7 @@ typedef struct WebPContext { AVFrame *alpha_frame; /* AVFrame for alpha data decompressed from VP8L */ AVPacket *pkt; /* AVPacket to be passed to the underlying VP8 decoder */ AVCodecContext *avctx; /* parent AVCodecContext */ + int read_header; /* RIFF header has been read */ int initialized; /* set once the VP8 context is initialized */ int has_alpha; /* has a separate alpha chunk */ enum AlphaCompression alpha_compression; /* compression type for alpha chunk */ @@ -1353,17 +1355,36 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (bytestream2_get_bytes_left(&gb) < 12) return AVERROR_INVALIDDATA; - if (bytestream2_get_le32(&gb) != MKTAG('R', 'I', 'F', 'F')) { - av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n"); - return AVERROR_INVALIDDATA; - } - + chunk_type = bytestream2_get_le32(&gb); chunk_size = bytestream2_get_le32(&gb); - if (bytestream2_get_bytes_left(&gb) < chunk_size) - return AVERROR_INVALIDDATA; - if (bytestream2_get_le32(&gb) != MKTAG('W', 'E', 'B', 'P')) { - av_log(avctx, AV_LOG_ERROR, "missing WEBP tag\n"); + for (int i = 0; !s->read_header && i < 4; i++) { + ff_lock_avformat(); + + if (s->read_header) { + ff_unlock_avformat(); + break; + } + + if (chunk_type == MKTAG('R', 'I', 'F', 'F')) { + int left = bytestream2_get_bytes_left(&gb); + if (left < chunk_size && left != 22) { + ff_unlock_avformat(); + return AVERROR_INVALIDDATA; + } + if (bytestream2_get_le32(&gb) != MKTAG('W', 'E', 'B', 'P')) { + av_log(avctx, AV_LOG_ERROR, "missing WEBP tag\n"); + ff_unlock_avformat(); + return AVERROR_INVALIDDATA; + } + s->read_header = 1; + } + + ff_unlock_avformat(); + } + + if (!s->read_header) { + av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n"); return AVERROR_INVALIDDATA; } @@ -1416,6 +1437,8 @@ static int webp_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ret = av_image_check_size(s->width, s->height, 0, avctx); if (ret < 0) return ret; + if (bytestream2_get_bytes_left(&gb) == 0) + return AVERROR(EAGAIN); break; case MKTAG('A', 'L', 'P', 'H'): { int alpha_header, filter_m, compression;