From patchwork Tue Jul 3 04:22:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9587 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp679492jad; Mon, 2 Jul 2018 21:22:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfwcIWKIIS1ZLcoZRvoDXiDXB41KxFrHvVqNs1CGy2IjJ3HRLo5iJ3H/9SJZosd56tKkE6P X-Received: by 2002:adf:b2a7:: with SMTP id g36-v6mr20837254wrd.218.1530591752498; Mon, 02 Jul 2018 21:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530591752; cv=none; d=google.com; s=arc-20160816; b=rEurlvrsMFdu1nzyZUawNXTboYEW01Ndc7J8xB4Fk7rwSSUdBzJUXrCttyRf4jT2Hc npuNC8ymjpcu8qlR+A2InPJglAzOz8lGVSpg37Pq1rfvJBqlwP7/QrAdGx3WRkoXs4OO tKRJ5kOxigexVwys3Ia8YFbYbQVrha+Yss14xoY4Ys+n7z5LJ9voL26rHXD+TYF9FZLT Zk2trvLvZjy4itFKoiC/fttvQsZMAfiAqzcnqCityM5pXmThrKUEpcStO+mSMloPQvHQ Di7KzwcNn1Sa+hj6Q43pvL0OhdqwI3gJtbXX7ZX7a6KwDxPTcNrdpgyB0vWkuhVMV/xO Ee0w== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XAUIRdS1ueqfYOyPxpJu0wdh4XELUiFmBQwKYDYZbI4=; b=npbIx0Tw6sVM5sNdrrJzYOncHjD3g/aSV3dMMoY1HaURTALaSRmRI009uilZL8WU3q cjlR/Nb5zBmaxNtx/0/oPRG1eIESNKirMJxSHyHCfeNCnG5vYOq46UxJMVYKkh+MGObd +mDg0pLK9UxPaU80oGJsDPdqS37dhw2nt7kCF4C+Y989pozZ/qEtU0ol6d/lQndfWeYQ DHNq2r06DgLxy3v+OvpxcPBugEZ5RzIZtcayZdUvitric5U7RvjxQgvNwFROn0NHxuqO 2UlDX+pwOunJRRyo62JTcMJrHc0evdtLITxrnh4Pku/Y/rqWqBuJ3kut60qmmoBS6kIw mGkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=ZFLj3guN; 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=NONE dis=NONE) header.from=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t128-v6si322114wma.154.2018.07.02.21.22.32; Mon, 02 Jul 2018 21:22:32 -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=@126.com header.s=s110527 header.b=ZFLj3guN; 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=NONE dis=NONE) header.from=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DAE968A826; Tue, 3 Jul 2018 07:22:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-111.126.com (m15-111.126.com [220.181.15.111]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3646768A81C for ; Tue, 3 Jul 2018 07:22:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=3lXjsdSh61Oj5mc6vH vuUhUKcnOVyjZQN6r882XjpfU=; b=ZFLj3guNzRh2MlYXEW+/Ej530Ft5vAWlfF CeaxwDQcixRDgWmQS6p6YiCXEpIG9JDtp3FUfoDPn6SiREZUZ5MoZCouREiXBC6W b9OT2VYOGLct88Q4aApLo0ky3U5ZXiL75ZMFv9n38VPLgO0IzCaLhVE6nhLii1UX X6iRyUy6g= Received: from localhost.localdomain (unknown [121.195.188.164]) by smtp1 (Coremail) with SMTP id C8mowAC3DY7z+TpbQRINBw--.4762S5; Tue, 03 Jul 2018 12:22:13 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jul 2018 12:22:08 +0800 Message-Id: <1530591729-7202-3-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530591729-7202-1-git-send-email-hwrenx@126.com> References: <1530591729-7202-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: C8mowAC3DY7z+TpbQRINBw--.4762S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw4Utw43Ww4UurWDXr47Arb_yoWrWr4fpa nxu34rJr47tFnak397tF17t3W5Wr95XFyDKFWfXr13trs7Kw18XwnrKFyjk34S9r9YvFy5 ursxW3WUKr1UK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jUWrXUUUUU= X-Originating-IP: [121.195.188.164] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiDxV46VpD5weMWwAAsl Subject: [FFmpeg-devel] [PATCH v6 3/4] lavc: add avs2 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwren --- libavcodec/Makefile | 1 + libavcodec/avs2_parser.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/parser.c | 1 + 3 files changed, 97 insertions(+) create mode 100644 libavcodec/avs2_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3ab071a..6b6d6de 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -994,6 +994,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ mpeg4audio.o OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o +OBJS-$(CONFIG_AVS2_PARSER) += avs2_parser.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c new file mode 100644 index 0000000..209b69e --- /dev/null +++ b/libavcodec/avs2_parser.c @@ -0,0 +1,95 @@ +/* + * AVS2/IEEE 1857.4 video parser. + * Copyright (c) 2018 Huiwen Ren + * + * 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 + */ + +#include "parser.h" + +#define SLICE_MAX_START_CODE 0x000001af + +#define ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) +#define ISUNIT(x) ((x) == 0xB0 || (x) == 0xB1 || (x) == 0xB2 || ISPIC(x)) + +static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) +{ + int pic_found = pc->frame_start_found; + uint32_t state = pc->state; + int i = 0; + + if (!pic_found) { + for (i = 0; i < buf_size; ++i) { + state = (state<<8) | buf[i]; + if (ISUNIT(buf[i])){ + ++i; + pic_found = 1; + break; + } + } + } + + if (pic_found) { + if (!buf_size) + return END_NOT_FOUND; + for (; i < buf_size; ++i) { + state = (state << 8) | buf[i]; + if ((state & 0xFFFFFF00) == 0x100 && state > SLICE_MAX_START_CODE) { + pc->frame_start_found = 0; + pc->state = -1; + return i - 3; + } + } + } + + pc->frame_start_found = pic_found; + pc->state = state; + + return END_NOT_FOUND; +} + +static int avs2_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + ParseContext *pc = s->priv_data; + int next; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { + next = buf_size; + } else { + next = avs2_find_frame_end(pc, buf, buf_size); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +AVCodecParser ff_avs2_parser = { + .codec_ids = { AV_CODEC_ID_AVS2 }, + .priv_data_size = sizeof(ParseContext), + .parser_parse = avs2_parse, + .parser_close = ff_parse_close, + .split = ff_mpeg4video_split, +}; diff --git a/libavcodec/parser.c b/libavcodec/parser.c index f43b197..7f8a451 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -37,6 +37,7 @@ extern AVCodecParser ff_aac_parser; extern AVCodecParser ff_aac_latm_parser; extern AVCodecParser ff_ac3_parser; extern AVCodecParser ff_adx_parser; +extern AVCodecParser ff_avs2_parser; extern AVCodecParser ff_bmp_parser; extern AVCodecParser ff_cavsvideo_parser; extern AVCodecParser ff_cook_parser;