From patchwork Thu Nov 22 20:24:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11125 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 DDA2544BEB2 for ; Thu, 22 Nov 2018 22:30:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6070D689FCE; Thu, 22 Nov 2018 22:30:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C95F689BA6 for ; Thu, 22 Nov 2018 22:30:21 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id r63-v6so10129890wma.4 for ; Thu, 22 Nov 2018 12:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=knOZZtMEN14vpANaMTHHTZR/3kjH0M+nN/Sv3nSN7z4=; b=j1ZH2goOq3Rr+UcWlbhcXtDtITB91w66jZ5IvKYvVRy/3PD6qt9+1eWCXZQOL2IjOS 4PF8BhFJG3BGzmRWo9EdEgbrccGwtrZD5bq83DkMxpAP3/8ZeOd8+bcUIqz0jaNAG0R9 w9XVtTxbSf47mQOmtULNKwMXxQqzpYV3ccDXqKxzLfjpWJyw6q14Q41vOHUvG+KlOVP5 N5ovgkBJbz+yQXvJrFOfJm+0i4Z1xQz6szTUof/+FFtgYshCbBtm3AWdF6zkTsjebUgN fyL0AlIKip37bldQ3M3D+uFM1PveQPpTxssumnpOPCcGQxy95y1FJiz6RJqljLOp5A67 +WtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=knOZZtMEN14vpANaMTHHTZR/3kjH0M+nN/Sv3nSN7z4=; b=YprFEpzgDhemOLDHhB1Yn1b1ZaLH2RES9CbAtBf32rUmi3UMU1FR2luv4sc1z4J5wS +IzJ2RwfGEMK5yaCPrNeYI6ZMzRZD56vJl0wl5LJs26W2i6OCsOICEiygxn2JQ8yIwqS NmVOID+vj65+QL8F8NknCbhdqUSURvm4l+EqWPAon8JNKSyQVbfd2tPP65zXdZbO6Yxf bbHOgi8gLwciW3seObHdif6WqFYy2OebqDV1tV/lB1RJliflRwTZJHe+5iuEnVPWm2m1 UT+5IuB63aZA0fvsWkapDoKMkHmR0TAiBRMdyK9FmE+GFSDYwULYTfeehs7M01Gi421e d1yg== X-Gm-Message-State: AGRZ1gJbIfK4ls/ILTKkSvEUSu3IsPF/SjJtxHgZh/0SP0IWVQ57bmkz DJWMkXUgRRiJu+tMnJB7FX0agsd5 X-Google-Smtp-Source: AFSGD/XlxUid3yKFKp5bzhjd4dXQhILcaQBmWh04QwEhG/525sShQdZwNZtGJfuVEMAPz0PEahkvuQ== X-Received: by 2002:a1c:7ec9:: with SMTP id z192-v6mr10746754wmc.43.1542918272637; Thu, 22 Nov 2018 12:24:32 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h67-v6sm8985530wma.10.2018.11.22.12.24.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 12:24:32 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Nov 2018 21:24:23 +0100 Message-Id: <20181122202423.14452-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat: add DHAV 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" Missing pts handling and correct codec detection. More samples wanted. Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/dhav.c | 136 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 libavformat/dhav.c diff --git a/libavformat/Makefile b/libavformat/Makefile index e4d997c4a0..a6c5ea9aa3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -149,6 +149,7 @@ OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o +OBJS-$(CONFIG_DHAV_DEMUXER) += dhav.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o OBJS-$(CONFIG_DIRAC_MUXER) += rawenc.o OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 498077e1de..5fb5bf17c6 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -110,6 +110,7 @@ extern AVInputFormat ff_daud_demuxer; extern AVOutputFormat ff_daud_muxer; extern AVInputFormat ff_dcstr_demuxer; extern AVInputFormat ff_dfa_demuxer; +extern AVInputFormat ff_dhav_demuxer; extern AVInputFormat ff_dirac_demuxer; extern AVOutputFormat ff_dirac_muxer; extern AVInputFormat ff_dnxhd_demuxer; diff --git a/libavformat/dhav.c b/libavformat/dhav.c new file mode 100644 index 0000000000..ad27949d0f --- /dev/null +++ b/libavformat/dhav.c @@ -0,0 +1,136 @@ +/* + * DHAV demuxer + * + * Copyright (c) 2017 Paul B Mahol + * + * 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 "internal.h" + +typedef struct DHAVContext { + unsigned type; + int64_t apts; + int64_t vpts; +} DHAVContext; + +static int dhav_probe(AVProbeData *p) +{ + if (memcmp(p->buf, "DHAV", 4)) + return 0; + + return AVPROBE_SCORE_MAX; +} + +static int dhav_read_header(AVFormatContext *s) +{ + AVStream *st, *ast; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_H264; + st->need_parsing = AVSTREAM_PARSE_FULL_RAW; + avpriv_set_pts_info(st, 64, 1, 25); + + ast = avformat_new_stream(s, NULL); + if (!ast) + return AVERROR(ENOMEM); + + ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + ast->codecpar->codec_id = AV_CODEC_ID_PCM_ALAW; + ast->codecpar->channels = 1; + ast->codecpar->sample_rate = 8000; + avpriv_set_pts_info(ast, 64, 1, 8000); + + s->ctx_flags |= AVFMTCTX_NOHEADER; + + return 0; +} + +static int read_chunk(AVFormatContext *s) +{ + DHAVContext *dhav = s->priv_data; + unsigned size, skip; + int64_t start, end; + + start = avio_tell(s->pb); + + if (avio_feof(s->pb)) + return AVERROR_EOF; + + if (avio_rl32(s->pb) != MKTAG('D','H','A','V')) + return AVERROR_INVALIDDATA; + + dhav->type = avio_r8(s->pb); + avio_skip(s->pb, 3); + avio_rl32(s->pb); + size = avio_rl32(s->pb); + if (dhav->type == 0xf1) { + avio_skip(s->pb, size - 16); + return 0; + } + + avio_rl32(s->pb); + avio_skip(s->pb, 2); + skip = avio_r8(s->pb); + avio_skip(s->pb, 1); + avio_skip(s->pb, skip); + + end = avio_tell(s->pb); + + return size - 8 - (end - start); +} + +static int dhav_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + DHAVContext *dhav = s->priv_data; + int64_t start; + int ret; + + start = avio_tell(s->pb); + + while ((ret = read_chunk(s)) == 0) + ; + + if (ret < 0) + return ret; + ret = av_get_packet(s->pb, pkt, ret); + if (ret < 0) + return ret; + pkt->stream_index = dhav->type == 0xF0 ? 1 : 0; + pkt->pos = start; + if (avio_rl32(s->pb) != MKTAG('d','h','a','v')) + return AVERROR_INVALIDDATA; + avio_skip(s->pb, 4); + + return ret; +} + +AVInputFormat ff_dhav_demuxer = { + .name = "dhav", + .long_name = NULL_IF_CONFIG_SMALL("DHAV"), + .priv_data_size = sizeof(DHAVContext), + .read_probe = dhav_probe, + .read_header = dhav_read_header, + .read_packet = dhav_read_packet, + .extensions = "dav", + .flags = AVFMT_GENERIC_INDEX, +};