From patchwork Thu Jul 5 05:12:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9624 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1486550jad; Wed, 4 Jul 2018 22:12:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfxRPor5LnIwLxzHNIHzAHuTz6LMefiztzgoxSS4KUJ3UzPJJ0iXOngJs2n9aIdpQm+cqY0 X-Received: by 2002:a1c:8893:: with SMTP id k141-v6mr3153974wmd.36.1530767564553; Wed, 04 Jul 2018 22:12:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530767564; cv=none; d=google.com; s=arc-20160816; b=yH9EVkYp7TI6aPH5oKuo1zMvhn240JMPStR/t2kqJcAvLsG0Jez8B5PvrSFwLky53o L+mRNzIflnRe8WmkyxiUEJNuJHtzcepgTXzkPzqRf39DMU2qlPDyr/uvVZgFyD0c57xp JXdIMQ+kiFp8U0RJeyKmAs7tQSdby+uftksI+agldpgZ24Vd1R9njMAJmkN285VLCn9n LUA6+BI7aC9DGEGLpBZFpnaFx754aMY/WELi7u6m4yA7j2/mvJYszKefmZ2D0oD+aPKW dXNf/fGq+yTyxmAWrUKldjXpT9vdJmMfCLJA+JbxbRMTh5rzNz6Z7nlQ+AFEChTr5C1U wI8g== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=zF5u8bt/iHFLVSM6Vln9jjP5ZZdGDzHfCwr2yAqsPbQ=; b=HsiD4OGI8m6jozYrrajSzKxI6NfnoUuOu9qtUyOPyXC6WKK+Vb2MUoIwXIS/8kM144 o5y7UsGv4fLH5E+tAkxwMTjIq5+0Wc1QZNJ3E079/vN1N7oXmF8YGZF0yuv9YMSh+cSD Asqboah2ODgz+R0qNaq+8Rf40seIH9peVLEPuHZ8YtpT55vwz2jkOSVeVFw4p/vZG0ZK iSKBJeUBYq9oNFaruiYycjlMHHrKKqckxAC0I2BexJWppK3hSqhcfuQtax6lMBlqah4p HT0N9GkE1zjzroNzbpLOY9kvquetYocCKgwfml579FeDoxX9HJwrapQ6k8Ou8aNxGkvc mbxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=hN3VyZJ7; 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 h125-v6si3949439wmf.145.2018.07.04.22.12.44; Wed, 04 Jul 2018 22:12: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=@126.com header.s=s110527 header.b=hN3VyZJ7; 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 C36BB68A89A; Thu, 5 Jul 2018 08:12:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m50-112.126.com (m50-112.126.com [123.125.50.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AD6668A6E6 for ; Thu, 5 Jul 2018 08:12:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=kmuvBW6WVcKGo/jHFb 1cK0k/BaSPln/J90Pb1rPNdgE=; b=hN3VyZJ7GoeCorR7PdxOXZq0g6Ljcc55Ci QOcqkR9/SgEA94LnLqnRrWPnHoR27Q3HkrfHEBRLjqfdKIOSj+cuuUnmJyr+C8gz QwLQB2e/mNq/8AfKA9205CDsP7/LWjhRnQRxELKto2dcqv1LccZBVK/gapDQXVRJ 5LQgfUeSA= Received: from localhost.localdomain (unknown [111.203.130.76]) by smtp6 (Coremail) with SMTP id j9KowABXEAy3qD1bgYc7AA--.782S3; Thu, 05 Jul 2018 13:12:24 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jul 2018 13:12:19 +0800 Message-Id: <1530767541-14670-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: j9KowABXEAy3qD1bgYc7AA--.782S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxuw1DJF1xAryUtFW5Jr4xWFg_yoW7Cw48pF sxW34rGrW2qFZak397tF4UJ3W5GryrWFykKayIqr15trsagry8X3sFkFW7Casaqr90qFy5 urs8Z3Wjkr48t3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UWWlPUUUUU= X-Originating-IP: [111.203.130.76] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiqBp66VpD5NBmwQABsq Subject: [FFmpeg-devel] [PATCH v7 1/3] 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/avcodec.h | 1 + libavcodec/avs2_parser.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/codec_desc.c | 7 ++++ libavcodec/parser.c | 1 + libavcodec/version.h | 4 +- 6 files changed, 107 insertions(+), 2 deletions(-) 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/avcodec.h b/libavcodec/avcodec.h index c90166d..1ac9092 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -409,6 +409,7 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, + AV_CODEC_ID_AVS2, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c new file mode 100644 index 0000000..163b297 --- /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 cur = 0; + + if (!pic_found) { + for (; cur < buf_size; ++cur) { + state = (state<<8) | buf[cur]; + if (ISUNIT(buf[cur])){ + ++cur; + pic_found = 1; + break; + } + } + } + + if (pic_found) { + if (!buf_size) + return END_NOT_FOUND; + for (; cur < buf_size; ++cur) { + state = (state << 8) | buf[cur]; + if ((state & 0xFFFFFF00) == 0x100 && state > SLICE_MAX_START_CODE) { + pc->frame_start_found = 0; + pc->state = -1; + return cur - 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/codec_desc.c b/libavcodec/codec_desc.c index 36e9a9b..c0ed4d4 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1395,6 +1395,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_AVS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avs2", + .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, .name = "y41p", 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; diff --git a/libavcodec/version.h b/libavcodec/version.h index 39be9d5..d49317f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 20 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \