X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Felectronicarts.c;h=0b1f017b6e82caeb7f5c5c91ba73fde9ba240774;hb=b63ba850c1ba80776d4c04f64e1efd02e4f3c913;hp=7aaff86e9d909803d687d1acf09e378b5f4a858c;hpb=597958ada78b8d989130f9fcc670a891cd70dd65;p=ffmpeg diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 7aaff86e9d9..0b1f017b6e8 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -27,29 +27,39 @@ #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 ISNe_TAG MKTAG('1', 'S', 'N', 'e') /* 1SNx end */ #define PT00_TAG MKTAG('P', 'T', 0x0, 0x0) #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 EA_BITS_PER_SAMPLE 16 +#define MVIh_TAG MKTAG('M', 'V', 'I', 'h') /* CMV header */ typedef struct EaDemuxContext { int big_endian; - int video_codec; + enum CodecID video_codec; AVRational time_base; int video_stream_index; - int audio_codec; + enum CodecID audio_codec; int audio_stream_index; int audio_frame_counter; int64_t audio_pts; + int bytes; int sample_rate; int num_channels; int num_samples; @@ -80,9 +90,10 @@ static int process_audio_header_elements(AVFormatContext *s) { 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; ea->num_channels = 1; @@ -125,6 +136,10 @@ static int process_audio_header_elements(AVFormatContext *s) 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; @@ -149,6 +164,23 @@ static int process_audio_header_elements(AVFormatContext *s) switch (compression_type) { case 0: ea->audio_codec = CODEC_ID_PCM_S16LE; break; case 7: ea->audio_codec = CODEC_ID_ADPCM_EA; break; + case -1: + switch (revision) { + 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); return 0; @@ -160,10 +192,59 @@ static int process_audio_header_elements(AVFormatContext *s) return 1; } +/* + * Process EACS sound header + * return 1 if success, 0 if invalid format, otherwise AVERROR_xxx + */ +static int process_audio_header_eacs(AVFormatContext *s) +{ + EaDemuxContext *ea = s->priv_data; + ByteIOContext *pb = s->pb; + int compression_type; + + ea->sample_rate = ea->big_endian ? get_be32(pb) : get_le32(pb); + ea->bytes = get_byte(pb); /* 1=8-bit, 2=16-bit */ + ea->num_channels = get_byte(pb); + compression_type = get_byte(pb); + url_fskip(pb, 13); + + switch (compression_type) { + case 0: + switch (ea->bytes) { + case 1: ea->audio_codec = CODEC_ID_PCM_S8; break; + case 2: ea->audio_codec = CODEC_ID_PCM_S16LE; break; + } + 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); @@ -180,7 +261,7 @@ static int process_video_header_vp6(AVFormatContext *s) 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++) { @@ -195,6 +276,14 @@ static int process_ea_header(AVFormatContext *s) { size = bswap_32(size); switch (blockid) { + case ISNh_TAG: + if (get_le32(pb) != EACS_TAG) { + av_log (s, AV_LOG_ERROR, "unknown 1SNh headerid\n"); + return 0; + } + err = process_audio_header_eacs(s); + break; + case SCHl_TAG : blockid = get_le32(pb); if (blockid == GSTR_TAG) { @@ -206,6 +295,10 @@ static int process_ea_header(AVFormatContext *s) { 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; @@ -227,12 +320,17 @@ static int process_ea_header(AVFormatContext *s) { static int ea_probe(AVProbeData *p) { - uint32_t tag; - - tag = AV_RL32(&p->buf[0]); - if (tag == SCHl_TAG || tag == MVhd_TAG) + 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; } @@ -245,7 +343,7 @@ static int ea_read_header(AVFormatContext *s, if (!process_ea_header(s)) return AVERROR(EIO); - if (ea->time_base.num && ea->time_base.den) { + if (ea->video_codec) { /* initialize the video decoder stream */ st = av_new_stream(s, 0); if (!st) @@ -257,23 +355,24 @@ static int ea_read_header(AVFormatContext *s, st->codec->time_base = ea->time_base; } - /* initialize the audio decoder stream */ - st = av_new_stream(s, 0); - if (!st) - return AVERROR(ENOMEM); - av_set_pts_info(st, 33, 1, ea->sample_rate); - st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = ea->audio_codec; - st->codec->codec_tag = 0; /* no tag */ - st->codec->channels = ea->num_channels; - st->codec->sample_rate = ea->sample_rate; - st->codec->bits_per_sample = EA_BITS_PER_SAMPLE; - st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample / 4; - st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; - - ea->audio_stream_index = st->index; - ea->audio_frame_counter = 0; + if (ea->audio_codec) { + /* initialize the audio decoder stream */ + st = av_new_stream(s, 0); + if (!st) + return AVERROR(ENOMEM); + av_set_pts_info(st, 33, 1, ea->sample_rate); + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = ea->audio_codec; + st->codec->codec_tag = 0; /* no tag */ + st->codec->channels = ea->num_channels; + st->codec->sample_rate = ea->sample_rate; + st->codec->bits_per_sample = ea->bytes * 8; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bits_per_sample / 4; + st->codec->block_align = st->codec->channels*st->codec->bits_per_sample; + ea->audio_stream_index = st->index; + ea->audio_frame_counter = 0; + } return 1; } @@ -282,7 +381,7 @@ static int ea_read_packet(AVFormatContext *s, 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; @@ -294,7 +393,20 @@ static int ea_read_packet(AVFormatContext *s, switch (chunk_type) { /* audio data */ + case ISNh_TAG: + /* header chunk also contains data; skip over the header portion*/ + url_fskip(pb, 32); + 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) ret = AVERROR(EIO); @@ -304,17 +416,27 @@ static int ea_read_packet(AVFormatContext *s, pkt->pts *= ea->audio_frame_counter; pkt->pts /= ea->sample_rate; + switch (ea->audio_codec) { + case CODEC_ID_ADPCM_EA: /* 2 samples/byte, 1 or 2 samples per frame depending * on stereo; chunk also has 12-byte header */ ea->audio_frame_counter += ((chunk_size - 12) * 2) / ea->num_channels; + break; + default: + ea->audio_frame_counter += chunk_size / + (ea->bytes * ea->num_channels); + } } packet_read = 1; break; /* ending tag */ + case 0: + case ISNe_TAG: case SCEl_TAG: + case SEND_TAG: ret = AVERROR(EIO); packet_read = 1; break; @@ -343,7 +465,7 @@ static int ea_read_packet(AVFormatContext *s, AVInputFormat ea_demuxer = { "ea", - "Electronic Arts Multimedia Format", + NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"), sizeof(EaDemuxContext), ea_probe, ea_read_header,