support for Delphine Software .cin files demuxing / audio and video decoding,...

support for Delphine Software .cin files demuxing / audio and video decoding, by Gregory Montoir %cyx A users P sourceforge P net%

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6659 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/Makefile

@@ -65,6 +65,8 @@ OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.o
 OBJS-$(CONFIG_COOK_DECODER)            += cook.o
 OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o lzo.o
 OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
+OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.o
+OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
 OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.o
 OBJS-$(CONFIG_DVBSUB_ENCODER)          += dvbsub.o
 OBJS-$(CONFIG_DVDSUB_DECODER)          += dvdsub.o

libavcodec/allcodecs.c

@@ -548,6 +548,12 @@ void avcodec_register_all(void)
 #ifdef CONFIG_TARGA_DECODER
     register_avcodec(&targa_decoder);
 #endif //CONFIG_TARGA_DECODER
+#ifdef CONFIG_DSICINVIDEO_DECODER
+    register_avcodec(&dsicinvideo_decoder);
+#endif //CONFIG_DSICINVIDEO_DECODER
+#ifdef CONFIG_DSICINAUDIO_DECODER
+    register_avcodec(&dsicinaudio_decoder);
+#endif //CONFIG_DSICINAUDIO_DECODER
 
 #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
 #ifdef CONFIG_AMR_NB_DECODER

libavcodec/avcodec.h

@@ -145,6 +145,7 @@ enum CodecID {
     CODEC_ID_VP6,
     CODEC_ID_VP6F,
     CODEC_ID_TARGA,
+    CODEC_ID_DSICINVIDEO,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -228,6 +229,7 @@ enum CodecID {
     CODEC_ID_SMACKAUDIO,
     CODEC_ID_QCELP,
     CODEC_ID_WAVPACK,
+    CODEC_ID_DSICINAUDIO,
 
     /* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= 0x17000,
@@ -2294,6 +2296,8 @@ extern AVCodec cavs_decoder;
 extern AVCodec vmnc_decoder;
 extern AVCodec wavpack_decoder;
 extern AVCodec targa_decoder;
+extern AVCodec dsicinvideo_decoder;
+extern AVCodec dsicinaudio_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \

libavformat/Makefile

@@ -29,6 +29,7 @@ OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crc.o
 OBJS-$(CONFIG_FRAMECRC_MUXER)            += crc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
+OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
 OBJS-$(CONFIG_DV_DEMUXER)                += dv.o
 OBJS-$(CONFIG_DV_MUXER)                  += dvenc.o
 OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.o

libavformat/allformats.c

@@ -105,6 +105,9 @@ void av_register_all(void)
     av_register_input_format(&dc1394_demuxer);
 #endif
 #endif /* CONFIG_DC1394 */
+#ifdef CONFIG_DSICIN_DEMUXER
+    av_register_input_format(&dsicin_demuxer);
+#endif
 #ifdef CONFIG_DV1394
 #ifdef CONFIG_DV1394_DEMUXER
     av_register_input_format(&dv1394_demuxer);

libavformat/allformats.h

@@ -43,6 +43,7 @@ extern AVOutputFormat crc_muxer;
 extern AVOutputFormat framecrc_muxer;
 extern AVInputFormat daud_demuxer;
 extern AVInputFormat dc1394_demuxer;
+extern AVInputFormat dsicin_demuxer;
 extern AVInputFormat dv1394_demuxer;
 extern AVInputFormat dv_demuxer;
 extern AVOutputFormat dv_muxer;

libavformat/dsicin.c

+/*
+ * Delphine Software International CIN File Demuxer
+ * Copyright (c) 2006 Gregory Montoir (cyx@users.sourceforge.net)
+ *
+ * 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
+ */
+
+/**
+ * @file dsicin.c
+ * Delphine Software International CIN file demuxer
+ */
+
+#include "avformat.h"
+
+
+typedef struct CinFileHeader {
+    int video_frame_size;
+    int video_frame_width;
+    int video_frame_height;
+    int audio_frequency;
+    int audio_bits;
+    int audio_stereo;
+    int audio_frame_size;
+} CinFileHeader;
+
+typedef struct CinFrameHeader {
+    int audio_frame_type;
+    int video_frame_type;
+    int pal_colors_count;
+    int audio_frame_size;
+    int video_frame_size;
+} CinFrameHeader;
+
+typedef struct CinDemuxContext {
+    int audio_stream_index;
+    int video_stream_index;
+    CinFileHeader file_header;
+    int64_t audio_stream_pts;
+    int64_t video_stream_pts;
+    CinFrameHeader frame_header;
+    int audio_buffer_size;
+} CinDemuxContext;
+
+
+static int cin_probe(AVProbeData *p)
+{
+    if (p->buf_size < 18)
+        return 0;
+
+    /* header starts with this special marker */
+    if (LE_32(&p->buf[0]) != 0x55AA0000)
+        return 0;
+
+    /* for accuracy, check some header field values */
+    if (LE_32(&p->buf[12]) != 22050 || p->buf[16] != 16 || p->buf[17] != 0)
+        return 0;
+
+    return AVPROBE_SCORE_MAX;
+}
+
+static int cin_read_file_header(CinDemuxContext *cin, ByteIOContext *pb) {
+    CinFileHeader *hdr = &cin->file_header;
+
+    if (get_le32(pb) != 0x55AA0000)
+        return AVERROR_INVALIDDATA;
+
+    hdr->video_frame_size   = get_le32(pb);
+    hdr->video_frame_width  = get_le16(pb);
+    hdr->video_frame_height = get_le16(pb);
+    hdr->audio_frequency    = get_le32(pb);
+    hdr->audio_bits         = get_byte(pb);
+    hdr->audio_stereo       = get_byte(pb);
+    hdr->audio_frame_size   = get_le16(pb);
+
+    if (hdr->audio_frequency != 22050 || hdr->audio_bits != 16 || hdr->audio_stereo != 0)
+        return AVERROR_INVALIDDATA;
+
+    return 0;
+}
+
+static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+    int rc;
+    CinDemuxContext *cin = (CinDemuxContext *)s->priv_data;
+    CinFileHeader *hdr = &cin->file_header;
+    ByteIOContext *pb = &s->pb;
+    AVStream *st;
+
+    rc = cin_read_file_header(cin, pb);
+    if (rc)
+        return rc;
+
+    cin->video_stream_pts = 0;
+    cin->audio_stream_pts = 0;
+    cin->audio_buffer_size = 0;
+
+    /* initialize the video decoder stream */
+    st = av_new_stream(s, 0);
+    if (!st)
+        return AVERROR_NOMEM;
+
+    av_set_pts_info(st, 32, 1, 12);
+    cin->video_stream_index = st->index;
+    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_id = CODEC_ID_DSICINVIDEO;
+    st->codec->codec_tag = 0;  /* no fourcc */
+    st->codec->width = hdr->video_frame_width;
+    st->codec->height = hdr->video_frame_height;
+
+    /* initialize the audio decoder stream */
+    st = av_new_stream(s, 0);
+    if (!st)
+        return AVERROR_NOMEM;
+
+    av_set_pts_info(st, 32, 1, 22050);
+    cin->audio_stream_index = st->index;
+    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_id = CODEC_ID_DSICINAUDIO;
+    st->codec->codec_tag = 0;  /* no tag */
+    st->codec->channels = 1;
+    st->codec->sample_rate = 22050;
+    st->codec->bits_per_sample = 16;
+    st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample * st->codec->channels;
+    st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
+
+    return 0;
+}
+
+static int cin_read_frame_header(CinDemuxContext *cin, ByteIOContext *pb) {
+    CinFrameHeader *hdr = &cin->frame_header;
+
+    hdr->video_frame_type = get_byte(pb);
+    hdr->audio_frame_type = get_byte(pb);
+    hdr->pal_colors_count = get_le16(pb);
+    hdr->video_frame_size = get_le32(pb);
+    hdr->audio_frame_size = get_le32(pb);
+
+    if (url_feof(pb) || url_ferror(pb))
+        return AVERROR_IO;
+
+    if (get_le32(pb) != 0xAA55AA55)
+        return AVERROR_INVALIDDATA;
+
+    return 0;
+}
+
+static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    CinDemuxContext *cin = (CinDemuxContext *)s->priv_data;
+    ByteIOContext *pb = &s->pb;
+    CinFrameHeader *hdr = &cin->frame_header;
+    int rc, palette_type, pkt_size;
+
+    if (cin->audio_buffer_size == 0) {
+        rc = cin_read_frame_header(cin, pb);
+        if (rc)
+            return rc;
+
+        if ((int16_t)hdr->pal_colors_count < 0) {
+            hdr->pal_colors_count = -(int16_t)hdr->pal_colors_count;
+            palette_type = 1;
+        } else {
+            palette_type = 0;
+        }
+
+        /* palette and video packet */
+        pkt_size = (palette_type + 3) * hdr->pal_colors_count + hdr->video_frame_size;
+
+        if (av_new_packet(pkt, 4 + pkt_size))
+            return AVERROR_NOMEM;
+
+        pkt->stream_index = cin->video_stream_index;
+        pkt->pts = cin->video_stream_pts++;
+
+        pkt->data[0] = palette_type;
+        pkt->data[1] = hdr->pal_colors_count & 0xFF;
+        pkt->data[2] = hdr->pal_colors_count >> 8;
+        pkt->data[3] = hdr->video_frame_type;
+
+        if (get_buffer(pb, &pkt->data[4], pkt_size) != pkt_size)
+            return AVERROR_IO;
+
+        /* sound buffer will be processed on next read_packet() call */
+        cin->audio_buffer_size = hdr->audio_frame_size;
+        return 0;
+    }
+
+    /* audio packet */
+    if (av_new_packet(pkt, cin->audio_buffer_size))
+        return AVERROR_NOMEM;
+
+    pkt->stream_index = cin->audio_stream_index;
+    pkt->pts = cin->audio_stream_pts;
+    cin->audio_stream_pts += cin->audio_buffer_size * 2 / cin->file_header.audio_frame_size;
+
+    if (get_buffer(pb, pkt->data, cin->audio_buffer_size) != cin->audio_buffer_size)
+        return AVERROR_IO;
+
+    cin->audio_buffer_size = 0;
+    return 0;
+}
+
+AVInputFormat dsicin_demuxer = {
+    "dsicin",
+    "Delphine Software International CIN format",
+    sizeof(CinDemuxContext),
+    cin_probe,
+    cin_read_header,
+    cin_read_packet,
+};