diff options
author | Paul B Mahol <onemda@gmail.com> | 2012-02-14 17:36:20 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-02-14 22:32:53 +0100 |
commit | dc4e57489fa0f9cf4faf4c85cc405d6db77d84db (patch) | |
tree | 3bac4e2127c94dc0c1388ceec175aa68992f0b76 /libavformat | |
parent | c1df37e59b516e9da47f0e9f7df748beafb2fc90 (diff) | |
download | ffmpeg-streaming-dc4e57489fa0f9cf4faf4c85cc405d6db77d84db.zip ffmpeg-streaming-dc4e57489fa0f9cf4faf4c85cc405d6db77d84db.tar.gz |
CDXL demuxer and decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/Makefile | 1 | ||||
-rw-r--r-- | libavformat/allformats.c | 1 | ||||
-rw-r--r-- | libavformat/cdxl.c | 170 | ||||
-rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 173 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index dd55e42..aa3cf7c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -55,6 +55,7 @@ OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o mov_chan.o \ OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o +OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o OBJS-$(CONFIG_DAUD_MUXER) += daud.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a60688c..f5be7aa 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -76,6 +76,7 @@ void av_register_all(void) REGISTER_DEMUXER (CAF, caf); REGISTER_MUXDEMUX (CAVSVIDEO, cavsvideo); REGISTER_DEMUXER (CDG, cdg); + REGISTER_DEMUXER (CDXL, cdxl); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); REGISTER_DEMUXER (DFA, dfa); diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c new file mode 100644 index 0000000..f2956dd --- /dev/null +++ b/libavformat/cdxl.c @@ -0,0 +1,170 @@ +/* + * CDXL demuxer + * Copyright (c) 2011-2012 Paul B Mahol + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "libavutil/parseutils.h" +#include "libavutil/opt.h" +#include "avformat.h" +#include "internal.h" + +#define CDXL_HEADER_SIZE 32 + +typedef struct CDXLDemuxContext { + AVClass *class; + int sample_rate; + char *framerate; + AVRational fps; + int read_chunk; + uint8_t header[CDXL_HEADER_SIZE]; + int video_stream_index; + int audio_stream_index; +} CDXLDemuxContext; + +static int cdxl_read_header(AVFormatContext *s) +{ + CDXLDemuxContext *cdxl = s->priv_data; + int ret; + + if ((ret = av_parse_video_rate(&cdxl->fps, cdxl->framerate)) < 0) { + av_log(s, AV_LOG_ERROR, + "Could not parse framerate: %s.\n", cdxl->framerate); + return ret; + } + + cdxl->read_chunk = 0; + cdxl->video_stream_index = -1; + cdxl->audio_stream_index = -1; + + s->ctx_flags |= AVFMTCTX_NOHEADER; + + return 0; +} + +static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + CDXLDemuxContext *cdxl = s->priv_data; + AVIOContext *pb = s->pb; + uint32_t current_size; + uint16_t audio_size, palette_size; + int32_t video_size; + int64_t pos; + int ret; + + if (pb->eof_reached) + return AVERROR_EOF; + + pos = avio_tell(pb); + if (!cdxl->read_chunk && + avio_read(pb, cdxl->header, CDXL_HEADER_SIZE) != CDXL_HEADER_SIZE) + return AVERROR_EOF; + if (cdxl->header[0] != 1) { + av_log(s, AV_LOG_ERROR, "non-standard cdxl file\n"); + return AVERROR_INVALIDDATA; + } + + current_size = AV_RB32(&cdxl->header[2]); + palette_size = AV_RB16(&cdxl->header[20]); + audio_size = AV_RB16(&cdxl->header[22]); + + if (palette_size > 512) + return AVERROR_INVALIDDATA; + if (current_size < audio_size + palette_size + CDXL_HEADER_SIZE) + return AVERROR_INVALIDDATA; + video_size = current_size - audio_size - CDXL_HEADER_SIZE; + + if (cdxl->read_chunk && audio_size) { + if (cdxl->audio_stream_index == -1) { + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_tag = 0; + st->codec->codec_id = CODEC_ID_PCM_S8; + st->codec->channels = cdxl->header[1] & 0x10 ? 2 : 1; + st->codec->sample_rate = cdxl->sample_rate; + cdxl->audio_stream_index = st->index; + avpriv_set_pts_info(st, 32, 1, cdxl->sample_rate); + } + + ret = av_get_packet(pb, pkt, audio_size); + if (ret < 0) + return ret; + pkt->stream_index = cdxl->audio_stream_index; + pkt->pos = pos; + pkt->duration = audio_size; + cdxl->read_chunk = 0; + } else { + if (cdxl->video_stream_index == -1) { + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_tag = 0; + st->codec->codec_id = CODEC_ID_CDXL; + st->codec->width = AV_RB16(&cdxl->header[14]); + st->codec->height = AV_RB16(&cdxl->header[16]); + cdxl->video_stream_index = st->index; + avpriv_set_pts_info(st, 63, cdxl->fps.den, cdxl->fps.num); + } + + if (av_new_packet(pkt, video_size + CDXL_HEADER_SIZE) < 0) + return AVERROR(ENOMEM); + memcpy(pkt->data, cdxl->header, CDXL_HEADER_SIZE); + ret = avio_read(pb, pkt->data + CDXL_HEADER_SIZE, video_size); + if (ret < 0) { + av_free_packet(pkt); + return ret; + } + pkt->stream_index = cdxl->video_stream_index; + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->pos = pos; + cdxl->read_chunk = audio_size; + } + + return ret; +} + +#define OFFSET(x) offsetof(CDXLDemuxContext, x) +static const AVOption cdxl_options[] = { + { "sample_rate", "", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .dbl = 11025 }, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, + { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, { .str = "10" }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, + { NULL }, +}; + +static const AVClass cdxl_demuxer_class = { + .class_name = "CDXL demuxer", + .item_name = av_default_item_name, + .option = cdxl_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_cdxl_demuxer = { + .name = "cdxl", + .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video format"), + .priv_data_size = sizeof(CDXLDemuxContext), + .read_header = cdxl_read_header, + .read_packet = cdxl_read_packet, + .extensions = "cdxl,xl", + .flags = AVFMT_GENERIC_INDEX, + .priv_class = &cdxl_demuxer_class, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 443d752..b944589 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 0 +#define LIBAVFORMAT_VERSION_MINOR 1 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |