From patchwork Tue Jul 31 15:02:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9849 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp5162758jad; Tue, 31 Jul 2018 08:02:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpchz5ZCoBx6o6ojGtKGRT0JfKdTLhWUMYlcu82VbzHsKj3EnNR9cna/u+yBqJiPSJMyRLb6 X-Received: by 2002:a5d:4cc5:: with SMTP id c5-v6mr21939923wrt.210.1533049359245; Tue, 31 Jul 2018 08:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533049359; cv=none; d=google.com; s=arc-20160816; b=esdIdPqsKweaPeYPvS9UxVFKIxxTsJCxcPSM7vIjPePVMt0CcjitK3sspoW3MQeu4h +MBPI7BOD217FkOy3BDkoo+u3KSOTuhuXbW7HDOp9yU8q0iubNKpGPpCaXwhq3obi0qj 1vUf6lWOjS1anRl7ZIKF5ZDlMI13Rzb6RFozm/AQ0NdRSJ9NhaT4+XmKCKnp8JcDRBIy V6oSaInmTnD7Su67Y2XhT5XigOHXQnMTHjcI9+IkUHLYgjdtrsKYdUZMmhwmOZgSbXFP uxQvcVyhJaf3PKPZzGh8BGohpqMtZdlE1jUQhvc5YJRl5wYqex/Lj6pnt97HPDGAXM6b FeCQ== 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=WLfRoxyOlhZxlyx30z4X/wwiE37si4fLMZSH2qGQD+A=; b=RtkvA7H20Qr+X3EBGz8mepBIMMfHz5MyQ1PDDy4Q2pqPViZXtTysa0q8Syxl6EnP8s nNXUcrdwlplfVMb6sCZfFwiX6HkHSYjQ8Fm2FeA74CdguaTGN+UYY/UbaBezNdKJUMs+ h/OqOdGg/2ZCrXKxXOiuk/hoVL7VqtgJ3tK+n9Yo52qBZ8Fz+YQN0Br4gIbKZeg3xhZd RSQIv2cfFfnmYysOneJLmSQEoBWqSKcyfaj37n26tzx5XHh2eWHCWJ+SmrQwleubz+LU q4A16mXUq819Z5MsldzE/6oip4jVSN380Sb/ZVEexhsuKkGZfqkMtWUt7BxuiV9Ezz4e EP5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=TEYoP9Bi; 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 n11-v6si13355819wro.28.2018.07.31.08.02.38; Tue, 31 Jul 2018 08:02:39 -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=TEYoP9Bi; 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 597D468A20F; Tue, 31 Jul 2018 18:02:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-113.126.com (m15-113.126.com [220.181.15.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D943688297 for ; Tue, 31 Jul 2018 18:02:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=DGk+ZUdWqnqz6VWhZl KOTglAVTzDrG9tIiAyQhdk6JE=; b=TEYoP9Birm69cF8z3twhlac69RYZw/0ZEM Rob7xOrzlFSEgjO16/VSaUFvWxNOT1JqwqKyv0va1K5yB9s9Y/jB0y7qh0mQQjGA T9FaDZutivQfS0oj1/wjV0jiiMdm184pRe8CkZ1AWeRqya0J0esvdGX2wYsl8S4b z6iAMDiys= Received: from localhost.localdomain (unknown [223.96.64.123]) by smtp3 (Coremail) with SMTP id DcmowAAHtub_eWBbrds_EQ--.20409S3; Tue, 31 Jul 2018 23:02:25 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jul 2018 23:02:20 +0800 Message-Id: <1533049340-3864-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DcmowAAHtub_eWBbrds_EQ--.20409S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw4UWFW3Ar1xCry3GF13CFg_yoW5tw1rpa sxu3Z8Gr1kJay2vr93CFW5JFsYyanYgF12gFy3ur1jkrn3Wry8XwnrKFW5Zrn7Wry7Way8 XF45tF42k34UKaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uylk-UUUUU= X-Originating-IP: [223.96.64.123] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiuwGU6VpD6Dy-+gAAsP Subject: [FFmpeg-devel] [PATCH] lavf: add avs2 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwren --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/davs2.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 libavformat/davs2.c diff --git a/libavformat/Makefile b/libavformat/Makefile index f2f3aab..c4534b8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -110,6 +110,7 @@ OBJS-$(CONFIG_AST_DEMUXER) += ast.o astdec.o OBJS-$(CONFIG_AST_MUXER) += ast.o astenc.o OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o OBJS-$(CONFIG_AU_MUXER) += au.o rawenc.o +OBJS-$(CONFIG_AVS2_DEMUXER) += davs2.o rawdec.o OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o mpegtsenc.o avlanguage.o rawutils.o OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o swf.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index adcc8d9..38eaeea 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -76,6 +76,7 @@ extern AVInputFormat ff_avisynth_demuxer; extern AVOutputFormat ff_avm2_muxer; extern AVInputFormat ff_avr_demuxer; extern AVInputFormat ff_avs_demuxer; +extern AVInputFormat ff_avs2_demuxer; extern AVInputFormat ff_bethsoftvid_demuxer; extern AVInputFormat ff_bfi_demuxer; extern AVInputFormat ff_bintext_demuxer; diff --git a/libavformat/davs2.c b/libavformat/davs2.c new file mode 100644 index 0000000..8c90fd8 --- /dev/null +++ b/libavformat/davs2.c @@ -0,0 +1,64 @@ +/* + * AVS2 video stream probe. + * + * 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 "avformat.h" +#include "rawdec.h" +#include "libavcodec/internal.h" +#include "libavutil/intreadwrite.h" + +#define ISSQH(x) ((x) == 0xB0 ) +#define ISEND(x) ((x) == 0xB1 ) +#define ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) +#define ISUNIT(x) ( ISSQH(x) || ISEND(x) || (x) == 0xB2 || ISPIC(x) || (x) == 0xB5 || (x) == 0xB7 ) +#define ISAVS2(x) ((x) == 0x12 || (x) == 0x20 || (x) == 0x22 || (x) == 0x30 || (x) == 0x32 ) + +static int avs2_probe(AVProbeData *p) +{ + uint32_t code= -1; + uint8_t state=0; + const uint8_t *ptr = p->buf, *end = p->buf + p->buf_size, *sqb=0; + + while (ptr < end) { + ptr = avpriv_find_start_code(ptr, end, &code); + state = code & 0xFF; + if ((code & 0xffffff00) == 0x100) { + if (ISUNIT(state)) { + if (sqb) { + break; + } + if (ISSQH(state)) { + if (!ISAVS2(*ptr)) + return 0; + sqb = ptr; + } else if (ISEND(state)) { + return 0; + } + } + } + } + if (sqb && ptr-sqb >= 21){ + return AVPROBE_SCORE_EXTENSION+2; + } + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(avs2, "raw AVS2-P2/IEEE 1857.4", avs2_probe, "avs,avs2", AV_CODEC_ID_AVS2)