From patchwork Mon Jul 2 11:25:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9569 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3718569jad; Mon, 2 Jul 2018 04:57:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd2DJKhskQ8FDqLeOmUwOn0w/izuiolWOjOcVvk/5328jnD8KVIHKiBV3wAKWRLsmzAzWXz X-Received: by 2002:a1c:3610:: with SMTP id d16-v6mr8534912wma.126.1530532653414; Mon, 02 Jul 2018 04:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530532653; cv=none; d=google.com; s=arc-20160816; b=SshVXjiCvTpfD0/iB5iebNM65ZB8ONLtSr1wIJ7XkUjRaZ3oIH985weokH7p+5iW1m sWTvpWhPu0Qh+7JAj9ImPD4/yoxCxfCVz0S++YOJmE/ZWlw0l3wOYmdHJOigTrVnojbB pdE//hYnwsdjW8wX7rTSwL1psy1zwELPton/mZWE354iVJYWCxS2a8a7t7xYeuH6cEqd KapR3Gjhevqn8WDA+Z1pSpEmBG3f2A3UJEB5i7AmfWlPAQr+g/FU4W3KDvnTQ/ZoS0ZS PJxH8Mg9/VS6ZswIM39SLMfQyP35I4p67yPJDAEmSUFgNapkqea7XymS5zCIPXRVxZqZ JD6A== 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=0BpmqvqvpknRFsHxyuqSmABRuE4Rl2JaDJ98/F6n49g=; b=iwCUEYqA8XwlqVakzsIS9aslVEneY3eckE+XlQ/6aDfyqgn5YV8qXXtfXb8mtYsR77 cHRb1KO4lFZ8T5pXL53ofhjGrzdfA63UdASz1jVW/IGoevyCwNBAzdBUaGWWmTGP6RH1 N4Df0eD/59fzmg+kOjCLFpomETpZXyDFkkBUkjf5CDTNrhNT34SXMK6C7gnBvTksUcfJ U5TFW1WEXr3rBMm6ICar2mJ6blh+idmTz+k0ims5ax3VnMZlwWjAc/aSvrM1iaiUJ+Lv TXntnQJV+giqYwT77JmnhFI0DV8Ro8h5ZO9zE0m9ne7CGdYEMiWizWVteYJgfM8JzHuY Ufig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=HF4VbPnZ; 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 g206-v6si6008590wma.111.2018.07.02.04.57.33; Mon, 02 Jul 2018 04:57:33 -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=HF4VbPnZ; 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 9A3DD68A31B; Mon, 2 Jul 2018 14:57:11 +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 5937068A2DB for ; Mon, 2 Jul 2018 14:57:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ncS/RY5MTA+G2n8Rbo hmA9YZf6VROmQPTqss55RvGcQ=; b=HF4VbPnZ3VANwhHCOxfVJfnWtZrFQj28JL PvhdKaZpLNfJSAvp9SYb5KAvsPK+HXWXFpTDjy1Avv810xP9dgtX7maiCcLjmxCt VMsk3XECZJs2lrrvTCLuuLuL5Tyu7SSGp8O2r4tuKJsxpLlD73J++14qr7/QLRhx XQbBj+TLw= Received: from localhost.localdomain (unknown [121.195.188.164]) by smtp1 (Coremail) with SMTP id C8mowAAXexHDCzpbVJzkBg--.11122S5; Mon, 02 Jul 2018 19:25:57 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jul 2018 19:25:36 +0800 Message-Id: <1530530737-6032-3-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530530737-6032-1-git-send-email-hwrenx@126.com> References: <1530530737-6032-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: C8mowAAXexHDCzpbVJzkBg--.11122S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw4UJry7Zw4fAr4fCF43Awb_yoWrWw47pa n3CryrJr47tFZak397tF17t3WYgr95XFyDKFWfXr15tws7t34DX3ZrKFyjk34Fgr95ZFy5 uFs8W3WDKr1UK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jUWrXUUUUU= X-Originating-IP: [121.195.188.164] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiYAV36VpD5A2uMAAAsV Subject: [FFmpeg-devel] [PATCH v4 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/libdavs2_parser.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/parser.c | 1 + 3 files changed, 97 insertions(+) create mode 100644 libavcodec/libdavs2_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3ab071a..9198581 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1013,6 +1013,7 @@ OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o +OBJS-$(CONFIG_AVS2_PARSER) += libdavs2_parser.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ diff --git a/libavcodec/libdavs2_parser.c b/libavcodec/libdavs2_parser.c new file mode 100644 index 0000000..0cf57ad --- /dev/null +++ b/libavcodec/libdavs2_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 == 0) + 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;