From patchwork Sat Jun 20 01:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 20510 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 95E1D44B0E0 for ; Sat, 20 Jun 2020 04:46:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73A4068B6C7; Sat, 20 Jun 2020 04:46:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15112.mail.126.com (m15112.mail.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E59168B671 for ; Sat, 20 Jun 2020 04:46:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=h/8Bq 0lze6JmeDnwR0rZszWXgprxmZppANqAv40uRFU=; b=pNTsk+dK2Lxf1sqSvnM4l epfsP6YQmdsSU5xMM3N3Gqhsl1MHVYefD/qNI0GMPH9N4KxvPYE6tRJ5lpol//jZ +Vh5r0vEyQ8gk9Sdcwpp2ZCHB04dlAS7aTrO1Zj55v6PQHLfVGtGTeuAHfjWSPpu I4xBjlWBHfwCqWbqGaTOXQ= Received: from localhost.localdomain (unknown [111.34.131.148]) by smtp2 (Coremail) with SMTP id DMmowACXzgBbau1ebM9FEg--.41208S5; Sat, 20 Jun 2020 09:46:05 +0800 (CST) From: hwrenx@126.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Jun 2020 09:45:51 +0800 Message-Id: <20200620014552.806-4-hwrenx@126.com> X-Mailer: git-send-email 2.23.0.windows.1 In-Reply-To: <20200620014552.806-1-hwrenx@126.com> References: <20200620014552.806-1-hwrenx@126.com> MIME-Version: 1.0 X-CM-TRANSID: DMmowACXzgBbau1ebM9FEg--.41208S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw1ktF4rtw45Jw13JFW7twb_yoWrWw48pa nxu3W5Jr1kJ3y29rZ3Jas5JwsYkanYqF17XF97ur1xuFnxXrykXr1kKrWjyryxW34DCrWx XF45ta4Skwn8J3DanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jbrcfUUUUU= X-Originating-IP: [111.34.131.148] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi2x5J6V16HnJfpQAAsU Subject: [FFmpeg-devel] [PATCH v1 3/4] lavf/avs3dec: add raw avs3 demuxer 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 Cc: hwrenx@126.com, hbj Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: hwren Signed-off-by: hbj Signed-off-by: hwren --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/avs3dec.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 libavformat/avs3dec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 26af859..b433a60 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -120,6 +120,7 @@ OBJS-$(CONFIG_AVR_DEMUXER) += avr.o pcm.o OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o vocdec.o voc.o OBJS-$(CONFIG_AVS2_DEMUXER) += davs2.o rawdec.o OBJS-$(CONFIG_AVS2_MUXER) += rawenc.o +OBJS-$(CONFIG_AVS3_DEMUXER) += avs3dec.o rawdec.o OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_BINK_DEMUXER) += bink.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 97fd06d..2d768b8 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -82,6 +82,7 @@ extern AVInputFormat ff_avr_demuxer; extern AVInputFormat ff_avs_demuxer; extern AVInputFormat ff_avs2_demuxer; extern AVOutputFormat ff_avs2_muxer; +extern AVInputFormat ff_avs3_demuxer; extern AVInputFormat ff_bethsoftvid_demuxer; extern AVInputFormat ff_bfi_demuxer; extern AVInputFormat ff_bintext_demuxer; diff --git a/libavformat/avs3dec.c b/libavformat/avs3dec.c new file mode 100644 index 0000000..9758071 --- /dev/null +++ b/libavformat/avs3dec.c @@ -0,0 +1,79 @@ +/* + * RAW AVS3-P2/IEEE1857.10 video demuxer + * Copyright (c) 2020 Zhenyu Wang + * Bingjie Han + * 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 "avformat.h" +#include "rawdec.h" +#include "libavcodec/internal.h" + +#define AVS3_SEQ_START_CODE 0x000001b0 +#define AVS3_PIC_I_START_CODE 0x000001b3 +#define AVS3_UNDEF_START_CODE 0x000001b4 +#define AVS3_PIC_PB_START_CODE 0x000001b6 +#define AVS3_VIDEO_EDIT_CODE 0x000001b7 +#define AVS3_PROFILE_JIZHUN 0x20 +#define AVS3_PROFILE_JIZHUN10 0x22 + +static int avs3video_probe(const AVProbeData *p) +{ + uint32_t code= -1; + int pic=0, seq=0, slice_pos = 0; + const uint8_t *ptr = p->buf, *end = p->buf + p->buf_size; + int ret = 0; + + while (ptr < end) { + ptr = avpriv_find_start_code(ptr, end, &code); + if ((code & 0xffffff00) == 0x100) { + if (code < AVS3_SEQ_START_CODE) { + /* slices have to be consecutive */ + if (code < slice_pos) + return 0; + slice_pos = code; + } else { + slice_pos = 0; + } + if (code == AVS3_SEQ_START_CODE) { + seq++; + /* check for the only currently supported profile */ + if (*ptr != AVS3_PROFILE_JIZHUN && *ptr != AVS3_PROFILE_JIZHUN10) + return 0; + } else if ((code == AVS3_PIC_I_START_CODE) || + (code == AVS3_PIC_PB_START_CODE)) { + pic++; + } else if ((code == AVS3_UNDEF_START_CODE) || + (code > AVS3_VIDEO_EDIT_CODE)) { + return 0; + } + } + } + if (seq && pic) { + if (av_match_ext(p->filename, "avs3")) { + ret = AVPROBE_SCORE_MAX; + } else { + ret = AVPROBE_SCORE_EXTENSION + 1; + } + } + return ret; +} + +FF_DEF_RAWVIDEO_DEMUXER(avs3, "raw AVS3-P2/IEEE1857.10", avs3video_probe, "avs3", AV_CODEC_ID_AVS3) +