From 7322eab453f7d60c66846d22a14b77d3c9ae5cc3 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 15 Mar 2020 13:55:15 +0100 Subject: [PATCH] avformat: add hca demuxer --- Changelog | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/hca.c | 124 +++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 5 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 libavformat/hca.c diff --git a/Changelog b/Changelog index 8c5b6a89a1..711861bda9 100644 --- a/Changelog +++ b/Changelog @@ -53,6 +53,7 @@ version : - DERF DPCM decoder - DERF demuxer - CRI HCA decoder +- CRI HCA demuxer version 4.2: diff --git a/libavformat/Makefile b/libavformat/Makefile index 9b1f74a5c7..8fd0d43721 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -224,6 +224,7 @@ OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_HASH_MUXER) += hashenc.o +OBJS-$(CONFIG_HCA_DEMUXER) += hca.o OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index af10def88b..39d2c352f5 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -182,6 +182,7 @@ extern AVOutputFormat ff_h263_muxer; extern AVInputFormat ff_h264_demuxer; extern AVOutputFormat ff_h264_muxer; extern AVOutputFormat ff_hash_muxer; +extern AVInputFormat ff_hca_demuxer; extern AVInputFormat ff_hcom_demuxer; extern AVOutputFormat ff_hds_muxer; extern AVInputFormat ff_hevc_demuxer; diff --git a/libavformat/hca.c b/libavformat/hca.c new file mode 100644 index 0000000000..8f55e07204 --- /dev/null +++ b/libavformat/hca.c @@ -0,0 +1,124 @@ +/* + * HCA demuxer + * Copyright (c) 2020 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 "libavutil/intreadwrite.h" +#include "libavcodec/bytestream.h" + +#include "avformat.h" +#include "internal.h" + +static int hca_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('H', 'C', 'A', 0)) + return 0; + + if (AV_RL32(p->buf + 8) != MKTAG('f', 'm', 't', 0)) + return 0; + + return AVPROBE_SCORE_MAX / 3; +} + +static int hca_read_header(AVFormatContext *s) +{ + AVCodecParameters *par; + GetByteContext gb; + AVIOContext *pb = s->pb; + AVStream *st; + uint32_t chunk; + uint16_t version; + uint32_t block_count; + uint16_t block_size; + int ret; + + avio_skip(pb, 4); + version = avio_rb16(pb); + + s->internal->data_offset = avio_rb16(pb); + if (s->internal->data_offset <= 8) + return AVERROR_INVALIDDATA; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + par = st->codecpar; + ret = ff_alloc_extradata(par, s->internal->data_offset); + if (ret < 0) + return ret; + + ret = avio_read(pb, par->extradata + 8, par->extradata_size - 8); + if (ret < par->extradata_size - 8) + return AVERROR(EIO); + AV_WL32(par->extradata, MKTAG('H', 'C', 'A', 0)); + AV_WB16(par->extradata + 4, version); + AV_WB16(par->extradata + 6, s->internal->data_offset); + + bytestream2_init(&gb, par->extradata + 8, par->extradata_size - 8); + + if (bytestream2_get_le32(&gb) != MKTAG('f', 'm', 't', 0)) + return AVERROR_INVALIDDATA; + + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_HCA; + par->codec_tag = 0; + par->channels = bytestream2_get_byte(&gb); + par->sample_rate = bytestream2_get_be24(&gb); + block_count = bytestream2_get_be32(&gb); + bytestream2_skip(&gb, 4); + chunk = bytestream2_get_le32(&gb); + if (chunk == MKTAG('c', 'o', 'm', 'p')) { + block_size = bytestream2_get_be16(&gb); + } else if (chunk == MKTAG('d', 'e', 'c', 0)) { + block_size = bytestream2_get_be16(&gb); + } else { + return AVERROR_INVALIDDATA; + } + + if (block_size < 8) + return AVERROR_INVALIDDATA; + par->block_align = block_size; + st->duration = 1024 * block_count; + + avio_seek(pb, s->internal->data_offset, SEEK_SET); + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + return 0; +} + +static int hca_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVCodecParameters *par = s->streams[0]->codecpar; + int ret; + + ret = av_get_packet(s->pb, pkt, par->block_align); + pkt->duration = 1024; + return ret; +} + +AVInputFormat ff_hca_demuxer = { + .name = "hca", + .long_name = NULL_IF_CONFIG_SMALL("CRI HCA"), + .read_probe = hca_probe, + .read_header = hca_read_header, + .read_packet = hca_read_packet, + .extensions = "hca", + .flags = AVFMT_GENERIC_INDEX, +}; diff --git a/libavformat/version.h b/libavformat/version.h index e815c1f3c4..18c2f5fec2 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 41 +#define LIBAVFORMAT_VERSION_MINOR 42 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \