Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'

* commit '8747fce91fca6bb8e9936497f2de05c905cf43b5':
  electronicarts: K&R formatting cosmetics

Conflicts:
	libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/37/head
Michael Niedermayer 11 years ago
commit a87cf3689e
  1. 130
      libavformat/electronicarts.c

@ -78,7 +78,8 @@ typedef struct EaDemuxContext {
int num_samples;
} EaDemuxContext;
static uint32_t read_arbitary(AVIOContext *pb) {
static uint32_t read_arbitary(AVIOContext *pb)
{
uint8_t size, byte;
int i;
uint32_t word;
@ -101,9 +102,9 @@ static uint32_t read_arbitary(AVIOContext *pb) {
*/
static int process_audio_header_elements(AVFormatContext *s)
{
int inHeader = 1;
EaDemuxContext *ea = s->priv_data;
AVIOContext *pb = s->pb;
int inHeader = 1;
int compression_type = -1, revision = -1, revision2 = -1;
ea->bytes = 2;
@ -126,40 +127,56 @@ static int process_audio_header_elements(AVFormatContext *s)
switch (subbyte) {
case 0x80:
revision = read_arbitary(pb);
av_log (s, AV_LOG_DEBUG, "revision (element 0x80) set to 0x%08x\n", revision);
av_log(s, AV_LOG_DEBUG,
"revision (element 0x80) set to 0x%08x\n", revision);
break;
case 0x82:
ea->num_channels = read_arbitary(pb);
av_log (s, AV_LOG_DEBUG, "num_channels (element 0x82) set to 0x%08x\n", ea->num_channels);
av_log(s, AV_LOG_DEBUG,
"num_channels (element 0x82) set to 0x%08x\n",
ea->num_channels);
break;
case 0x83:
compression_type = read_arbitary(pb);
av_log (s, AV_LOG_DEBUG, "compression_type (element 0x83) set to 0x%08x\n", compression_type);
av_log(s, AV_LOG_DEBUG,
"compression_type (element 0x83) set to 0x%08x\n",
compression_type);
break;
case 0x84:
ea->sample_rate = read_arbitary(pb);
av_log (s, AV_LOG_DEBUG, "sample_rate (element 0x84) set to %i\n", ea->sample_rate);
av_log(s, AV_LOG_DEBUG,
"sample_rate (element 0x84) set to %i\n",
ea->sample_rate);
break;
case 0x85:
ea->num_samples = read_arbitary(pb);
av_log (s, AV_LOG_DEBUG, "num_samples (element 0x85) set to 0x%08x\n", ea->num_samples);
av_log(s, AV_LOG_DEBUG,
"num_samples (element 0x85) set to 0x%08x\n",
ea->num_samples);
break;
case 0x8A:
av_log (s, AV_LOG_DEBUG, "element 0x%02x set to 0x%08x\n", subbyte, read_arbitary(pb));
av_log(s, AV_LOG_DEBUG,
"element 0x%02x set to 0x%08x\n",
subbyte, read_arbitary(pb));
av_log(s, AV_LOG_DEBUG, "exited audio subheader\n");
inSubheader = 0;
break;
case 0xA0:
revision2 = read_arbitary(pb);
av_log (s, AV_LOG_DEBUG, "revision2 (element 0xA0) set to 0x%08x\n", revision2);
av_log(s, AV_LOG_DEBUG,
"revision2 (element 0xA0) set to 0x%08x\n",
revision2);
break;
case 0xFF:
av_log (s, AV_LOG_DEBUG, "end of header block reached (within audio subheader)\n");
av_log(s, AV_LOG_DEBUG,
"end of header block reached (within audio subheader)\n");
inSubheader = 0;
inHeader = 0;
break;
default:
av_log (s, AV_LOG_DEBUG, "element 0x%02x set to 0x%08x\n", subbyte, read_arbitary(pb));
av_log(s, AV_LOG_DEBUG,
"element 0x%02x set to 0x%08x\n",
subbyte, read_arbitary(pb));
break;
}
}
@ -169,26 +186,41 @@ static int process_audio_header_elements(AVFormatContext *s)
inHeader = 0;
break;
default:
av_log (s, AV_LOG_DEBUG, "header element 0x%02x set to 0x%08x\n", byte, read_arbitary(pb));
av_log(s, AV_LOG_DEBUG,
"header element 0x%02x set to 0x%08x\n",
byte, read_arbitary(pb));
break;
}
}
switch (compression_type) {
case 0: ea->audio_codec = AV_CODEC_ID_PCM_S16LE; break;
case 7: ea->audio_codec = AV_CODEC_ID_ADPCM_EA; break;
case 0:
ea->audio_codec = AV_CODEC_ID_PCM_S16LE;
break;
case 7:
ea->audio_codec = AV_CODEC_ID_ADPCM_EA;
break;
case -1:
switch (revision) {
case 1: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R1; break;
case 2: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break;
case 3: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R3; break;
case -1: break;
case 1:
ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R1;
break;
case 2:
ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2;
break;
case 3:
ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R3;
break;
case -1:
break;
default:
avpriv_request_sample(s, "stream type; revision=%i", revision);
return 0;
}
switch (revision2) {
case 8: ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR; break;
case 8:
ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR;
break;
case 10:
switch (revision) {
case -1:
@ -199,8 +231,11 @@ static int process_audio_header_elements(AVFormatContext *s)
return 0;
}
break;
case 16: ea->audio_codec = AV_CODEC_ID_MP3; break;
case -1: break;
case 16:
ea->audio_codec = AV_CODEC_ID_MP3;
break;
case -1:
break;
default:
ea->audio_codec = AV_CODEC_ID_NONE;
avpriv_request_sample(s, "stream type; revision2=%i", revision2);
@ -208,7 +243,9 @@ static int process_audio_header_elements(AVFormatContext *s)
}
break;
default:
avpriv_request_sample(s, "stream type; compression_type=%i", compression_type);
avpriv_request_sample(s,
"stream type; compression_type=%i",
compression_type);
return 0;
}
@ -237,14 +274,25 @@ static int process_audio_header_eacs(AVFormatContext *s)
switch (compression_type) {
case 0:
switch (ea->bytes) {
case 1: ea->audio_codec = AV_CODEC_ID_PCM_S8; break;
case 2: ea->audio_codec = AV_CODEC_ID_PCM_S16LE; break;
case 1:
ea->audio_codec = AV_CODEC_ID_PCM_S8;
break;
case 2:
ea->audio_codec = AV_CODEC_ID_PCM_S16LE;
break;
}
break;
case 1: ea->audio_codec = AV_CODEC_ID_PCM_MULAW; ea->bytes = 1; break;
case 2: ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_EACS; break;
case 1:
ea->audio_codec = AV_CODEC_ID_PCM_MULAW;
ea->bytes = 1;
break;
case 2:
ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_EACS;
break;
default:
avpriv_request_sample(s, "stream type; audio compression_type=%i", compression_type);
avpriv_request_sample(s,
"stream type; audio compression_type=%i",
compression_type);
}
return 1;
@ -276,6 +324,7 @@ static int process_video_header_mdec(AVFormatContext *s)
ea->height = avio_rl16(pb);
ea->time_base = (AVRational) { 1, 15 };
ea->video_codec = AV_CODEC_ID_MDEC;
return 1;
}
@ -316,7 +365,8 @@ static int process_video_header_cmv(AVFormatContext *s)
* Process EA file header
* Returns 1 if the EA file is valid and successfully opened, 0 otherwise
*/
static int process_ea_header(AVFormatContext *s) {
static int process_ea_header(AVFormatContext *s)
{
uint32_t blockid, size = 0;
EaDemuxContext *ea = s->priv_data;
AVIOContext *pb = s->pb;
@ -405,7 +455,6 @@ static int process_ea_header(AVFormatContext *s) {
return 1;
}
static int ea_probe(AVProbeData *p)
{
switch (AV_RL32(&p->buf[0])) {
@ -424,6 +473,7 @@ static int ea_probe(AVProbeData *p)
}
if (AV_RL32(&p->buf[4]) > 0xfffff && AV_RB32(&p->buf[4]) > 0xfffff)
return 0;
return AVPROBE_SCORE_MAX;
}
@ -458,17 +508,20 @@ static int ea_read_header(AVFormatContext *s)
if (ea->audio_codec) {
if (ea->num_channels <= 0) {
av_log(s, AV_LOG_WARNING, "Unsupported number of channels: %d\n", ea->num_channels);
av_log(s, AV_LOG_WARNING,
"Unsupported number of channels: %d\n", ea->num_channels);
ea->audio_codec = 0;
return 1;
}
if (ea->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, "Unsupported sample rate: %d\n", ea->sample_rate);
av_log(s, AV_LOG_ERROR,
"Unsupported sample rate: %d\n", ea->sample_rate);
ea->audio_codec = 0;
return 1;
}
if (ea->bytes <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid number of bytes per sample: %d\n", ea->bytes);
av_log(s, AV_LOG_ERROR,
"Invalid number of bytes per sample: %d\n", ea->bytes);
ea->audio_codec = AV_CODEC_ID_NONE;
return 1;
}
@ -484,9 +537,11 @@ static int ea_read_header(AVFormatContext *s)
st->codec->channels = ea->num_channels;
st->codec->sample_rate = ea->sample_rate;
st->codec->bits_per_coded_sample = ea->bytes * 8;
st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
st->codec->bit_rate = st->codec->channels *
st->codec->sample_rate *
st->codec->bits_per_coded_sample / 4;
st->codec->block_align = st->codec->channels*st->codec->bits_per_coded_sample;
st->codec->block_align = st->codec->channels *
st->codec->bits_per_coded_sample;
ea->audio_stream_index = st->index;
st->start_time = 0;
}
@ -494,16 +549,13 @@ static int ea_read_header(AVFormatContext *s)
return 1;
}
static int ea_read_packet(AVFormatContext *s,
AVPacket *pkt)
static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
{
EaDemuxContext *ea = s->priv_data;
AVIOContext *pb = s->pb;
int ret = 0;
int packet_read = 0;
int partial_packet = 0;
unsigned int chunk_type, chunk_size;
int key = 0;
int ret = 0, packet_read = 0, key = 0;
int av_uninit(num_samples);
while (!packet_read || partial_packet) {

Loading…
Cancel
Save