#include "avformat.h"
#define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
+#define SEAD_TAG MKTAG('S', 'E', 'A', 'D') /* Sxxx header */
+#define SNDC_TAG MKTAG('S', 'N', 'D', 'C') /* Sxxx data */
+#define SEND_TAG MKTAG('S', 'E', 'N', 'D') /* Sxxx end */
#define ISNh_TAG MKTAG('1', 'S', 'N', 'h') /* 1SNx header */
#define EACS_TAG MKTAG('E', 'A', 'C', 'S')
#define ISNd_TAG MKTAG('1', 'S', 'N', 'd') /* 1SNx data */
#define GSTR_TAG MKTAG('G', 'S', 'T', 'R')
#define SCDl_TAG MKTAG('S', 'C', 'D', 'l')
#define SCEl_TAG MKTAG('S', 'C', 'E', 'l')
+#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV i-frame */
+#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */
+#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG2 */
#define MVhd_TAG MKTAG('M', 'V', 'h', 'd')
#define MV0K_TAG MKTAG('M', 'V', '0', 'K')
#define MV0F_TAG MKTAG('M', 'V', '0', 'F')
+#define MVIh_TAG MKTAG('M', 'V', 'I', 'h') /* CMV header */
typedef struct EaDemuxContext {
int big_endian;
{
int inHeader = 1;
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = &s->pb;
- int compression_type = -1, revision = -1;
+ ByteIOContext *pb = s->pb;
+ int compression_type = -1, revision = -1, revision2 = -1;
ea->bytes = 2;
ea->sample_rate = -1;
av_log (s, AV_LOG_INFO, "exited audio subheader\n");
inSubheader = 0;
break;
+ case 0xA0:
+ revision2 = read_arbitary(pb);
+ av_log (s, AV_LOG_INFO, "revision2 (element 0xA0) set to 0x%08x\n", revision2);
+ break;
case 0xFF:
av_log (s, AV_LOG_INFO, "end of header block reached (within audio subheader)\n");
inSubheader = 0;
case 1: ea->audio_codec = CODEC_ID_ADPCM_EA_R1; break;
case 2: ea->audio_codec = CODEC_ID_ADPCM_EA_R2; break;
case 3: ea->audio_codec = CODEC_ID_ADPCM_EA_R3; break;
+ case -1: break;
default:
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision=%i\n", revision);
return 0;
}
+ switch (revision2) {
+ case 8: ea->audio_codec = CODEC_ID_PCM_S16LE_PLANAR; break;
+ default:
+ av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
+ return 0;
+ }
break;
default:
av_log(s, AV_LOG_ERROR, "unsupported stream type; compression_type=%i\n", compression_type);
static int process_audio_header_eacs(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int compression_type;
ea->sample_rate = ea->big_endian ? get_be32(pb) : get_le32(pb);
}
break;
case 1: ea->audio_codec = CODEC_ID_PCM_MULAW; ea->bytes = 1; break;
+ case 2: ea->audio_codec = CODEC_ID_ADPCM_IMA_EA_EACS; break;
default:
av_log (s, AV_LOG_ERROR, "unsupported stream type; audio compression_type=%i\n", compression_type);
}
return 1;
}
+/*
+ * Process SEAD sound header
+ * return 1 if success, 0 if invalid format, otherwise AVERROR_xxx
+ */
+static int process_audio_header_sead(AVFormatContext *s)
+{
+ EaDemuxContext *ea = s->priv_data;
+ ByteIOContext *pb = s->pb;
+
+ ea->sample_rate = get_le32(pb);
+ ea->bytes = get_le32(pb); /* 1=8-bit, 2=16-bit */
+ ea->num_channels = get_le32(pb);
+ ea->audio_codec = CODEC_ID_ADPCM_IMA_EA_SEAD;
+
+ return 1;
+}
+
static int process_video_header_vp6(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
url_fskip(pb, 16);
ea->time_base.den = get_le32(pb);
static int process_ea_header(AVFormatContext *s) {
uint32_t blockid, size = 0;
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int i;
for (i=0; i<5 && (!ea->audio_codec || !ea->video_codec); i++) {
err = process_audio_header_elements(s);
break;
+ case SEAD_TAG:
+ err = process_audio_header_sead(s);
+ break;
+
case MVhd_TAG :
err = process_video_header_vp6(s);
break;
static int ea_probe(AVProbeData *p)
{
switch (AV_RL32(&p->buf[0])) {
+ case ISNh_TAG:
case SCHl_TAG:
+ case SEAD_TAG:
+ case kVGT_TAG:
+ case MADk_TAG:
+ case MPCh_TAG:
case MVhd_TAG:
+ case MVIh_TAG:
return AVPROBE_SCORE_MAX;
}
return 0;
AVPacket *pkt)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int ret = 0;
int packet_read = 0;
unsigned int chunk_type, chunk_size;
chunk_size -= 32;
case ISNd_TAG:
case SCDl_TAG:
+ case SNDC_TAG:
if (!ea->audio_codec) {
url_fskip(pb, chunk_size);
break;
+ } else if (ea->audio_codec == CODEC_ID_PCM_S16LE_PLANAR) {
+ url_fskip(pb, 12); /* planar header */
+ chunk_size -= 12;
}
ret = av_get_packet(pb, pkt, chunk_size);
if (ret != chunk_size)
case 0:
case ISNe_TAG:
case SCEl_TAG:
+ case SEND_TAG:
ret = AVERROR(EIO);
packet_read = 1;
break;