From patchwork Tue Apr 14 00:57:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 18935 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 BAD3C44B038 for ; Tue, 14 Apr 2020 03:58:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9838368B7C4; Tue, 14 Apr 2020 03:58:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8423D68B729 for ; Tue, 14 Apr 2020 03:58:21 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id w29so8443859qtv.3 for ; Mon, 13 Apr 2020 17:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=5cALrphAB+SNr73mKeCGeBMjwjkLTxzLRsoIZrr7rqw=; b=TUURBtIzWGKfzJUmHL3ULs5MTqwTpHbcKK9WJ78jQyIW++FJC/opO0rzwNTLvsIo63 zMWoLuYu+9hLuifAiGHolL0kph4yBfeg3NUL2u98Z3D2ZmrfqRRgPBXTCm8WKEKE8RGV ZhmwnwCRwlItzg3gTS6xrO67nrD9mtJ4HM29/ODE96ugHUdW1XgwiseM8b5AuyEWbxh5 C2Q7RwzKsw6POpucUYYZm3SyGBlk8p5Byd8ExA/R2X0MOAwF3gc21eqjYjj9GnungsHx zR0ofszWiLG9+RXLd42khzwaLVOEvEnvQjrPz43iSprYYk+NrXS9dW++tgxhV+ApGWgw WC2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=5cALrphAB+SNr73mKeCGeBMjwjkLTxzLRsoIZrr7rqw=; b=Fk99fhwu4Jo3BjIkNgBWREtpKa0vc8TY1P0xlCzFMtd70YdfGBOjXeFdbn4cp2fUqx 2TVaxJ6oejRx3QQtorxbKmVYSVIuBzdUIjBka5syohKeKLGSmmLDtjD0qy70Uhz0h/57 ExtieRPTxqb8/CTuHYjXjep4BlyZpv5g0SoouuBJ4lBtoSVEOFBe8NpoEsjAP3l1LgbV cRZASNYNrcQ/+A2yQYlHkgcBQ/jm+CL2c2vujaqoK+Pz7fQd909ZFhPmtsnn30tXAGDz 8x9ZKrTQhiTNP1LQc8P30+rWaXJLIIzOaboHQ4nNnY+iNDEi6+9SIunoEvW7dNqBbbo5 pjRA== X-Gm-Message-State: AGi0PuapcqxhWNH4PN+FgUAHLQi96LSPop2U2Btz8SzB98SX5Og26L86 /36K9WLAipa66BmiPpBr2XmIh2X4 X-Google-Smtp-Source: APiQypL24OzIxo8omDjBrKDrb6AyhPIbsG5PvMLBnwMl+J99Pa3GKrZYy33RFa3M9Kc33kYSQAH6cQ== X-Received: by 2002:ac8:8a:: with SMTP id c10mr14186340qtg.369.1586825899687; Mon, 13 Apr 2020 17:58:19 -0700 (PDT) Received: from localhost.localdomain ([191.83.216.57]) by smtp.gmail.com with ESMTPSA id h19sm10031955qtk.78.2020.04.13.17.58.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 17:58:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Apr 2020 21:57:54 -0300 Message-Id: <20200414005754.22969-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec: add a WebP parser 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" Based on code from the BMP parser. Addresses ticket #8574 Signed-off-by: James Almer --- libavcodec/Makefile | 1 + libavcodec/parsers.c | 1 + libavcodec/webp_parser.c | 112 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 libavcodec/webp_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1970ff027f..88944d9a3a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1084,6 +1084,7 @@ OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o OBJS-$(CONFIG_VP9_PARSER) += vp9_parser.o +OBJS-$(CONFIG_WEBP_PARSER) += webp_parser.o OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o # bitstream filters diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 33a71de8a0..9fbf182594 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -66,6 +66,7 @@ extern AVCodecParser ff_vorbis_parser; extern AVCodecParser ff_vp3_parser; extern AVCodecParser ff_vp8_parser; extern AVCodecParser ff_vp9_parser; +extern AVCodecParser ff_webp_parser; extern AVCodecParser ff_xma_parser; #include "libavcodec/parser_list.c" diff --git a/libavcodec/webp_parser.c b/libavcodec/webp_parser.c new file mode 100644 index 0000000000..98e7988555 --- /dev/null +++ b/libavcodec/webp_parser.c @@ -0,0 +1,112 @@ +/* + * WebP parser + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * WebP parser + */ + +#include "libavutil/bswap.h" +#include "libavutil/common.h" + +#include "parser.h" + +typedef struct WebPParseContext { + ParseContext pc; + uint32_t fsize; + uint32_t remaining_size; +} WebPParseContext; + +static int webp_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + WebPParseContext *ctx = s->priv_data; + uint64_t state = ctx->pc.state64; + int next = END_NOT_FOUND; + int i = 0; + + *poutbuf = NULL; + *poutbuf_size = 0; + +restart: + if (ctx->pc.frame_start_found <= 8) { + for (; i < buf_size; i++) { + state = (state << 8) | buf[i]; + if (ctx->pc.frame_start_found == 0) { + if ((state >> 32) == (('R' << 24) | ('I' << 16) | ('F' << 8) | 'F')) { + ctx->fsize = av_bswap32(state); + if (ctx->fsize > 15 && ctx->fsize <= UINT32_MAX - 10) { + ctx->pc.frame_start_found = 1; + ctx->fsize += 8; + } + } + } else if (ctx->pc.frame_start_found == 8) { + if ((state >> 32) != (('W' << 24) | ('E' << 16) | ('B' << 8) | 'P')) { + ctx->pc.frame_start_found = 0; + continue; + } + ctx->pc.frame_start_found++; + ctx->remaining_size = ctx->fsize + i - 15; + if (ctx->pc.index + i > 15) { + next = i - 15; + state = 0; + break; + } else { + ctx->pc.state64 = 0; + goto restart; + } + } else if (ctx->pc.frame_start_found) + ctx->pc.frame_start_found++; + } + ctx->pc.state64 = state; + } else { + if (ctx->remaining_size) { + i = FFMIN(ctx->remaining_size, buf_size); + ctx->remaining_size -= i; + if (ctx->remaining_size) + goto flush; + + ctx->pc.frame_start_found = 0; + goto restart; + } + } + +flush: + if (ff_combine_frame(&ctx->pc, next, &buf, &buf_size) < 0) + return buf_size; + + if (next != END_NOT_FOUND && next < 0) + ctx->pc.frame_start_found = FFMAX(ctx->pc.frame_start_found - i - 1, 0); + else + ctx->pc.frame_start_found = 0; + + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +AVCodecParser ff_webp_parser = { + .codec_ids = { AV_CODEC_ID_WEBP }, + .priv_data_size = sizeof(WebPParseContext), + .parser_parse = webp_parse, + .parser_close = ff_parse_close, +};