electronicarts: K&R formatting cosmetics
This commit is contained in:
Diego Biurrun
parent
e8c0defe13
commit
8747fce91f
@ -77,7 +77,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;
|
||||
@ -100,9 +101,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;
|
||||
@ -116,7 +117,7 @@ static int process_audio_header_elements(AVFormatContext *s)
|
||||
|
||||
switch (byte) {
|
||||
case 0xFD:
|
||||
av_log (s, AV_LOG_DEBUG, "entered audio subheader\n");
|
||||
av_log(s, AV_LOG_DEBUG, "entered audio subheader\n");
|
||||
inSubheader = 1;
|
||||
while (!pb->eof_reached && inSubheader) {
|
||||
uint8_t subbyte;
|
||||
@ -125,85 +126,125 @@ 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, "exited audio subheader\n");
|
||||
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;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0xFF:
|
||||
av_log (s, AV_LOG_DEBUG, "end of header block reached\n");
|
||||
av_log(s, AV_LOG_DEBUG, "end of header block reached\n");
|
||||
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:
|
||||
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision=%i\n", revision);
|
||||
av_log(s, AV_LOG_ERROR,
|
||||
"unsupported stream type; revision=%i\n", revision);
|
||||
return 0;
|
||||
}
|
||||
switch (revision2) {
|
||||
case 8: ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR; break;
|
||||
case 10: ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2; break;
|
||||
case 16: ea->audio_codec = AV_CODEC_ID_MP3; break;
|
||||
case -1: break;
|
||||
case 8:
|
||||
ea->audio_codec = AV_CODEC_ID_PCM_S16LE_PLANAR;
|
||||
break;
|
||||
case 10:
|
||||
ea->audio_codec = AV_CODEC_ID_ADPCM_EA_R2;
|
||||
break;
|
||||
case 16:
|
||||
ea->audio_codec = AV_CODEC_ID_MP3;
|
||||
break;
|
||||
case -1:
|
||||
break;
|
||||
default:
|
||||
ea->audio_codec = AV_CODEC_ID_NONE;
|
||||
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
|
||||
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);
|
||||
av_log(s, AV_LOG_ERROR,
|
||||
"unsupported stream type; compression_type=%i\n",
|
||||
compression_type);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ea->sample_rate == -1)
|
||||
ea->sample_rate = revision==3 ? 48000 : 22050;
|
||||
ea->sample_rate = revision == 3 ? 48000 : 22050;
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -227,14 +268,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:
|
||||
av_log (s, AV_LOG_ERROR, "unsupported stream type; audio compression_type=%i\n", compression_type);
|
||||
av_log(s, AV_LOG_ERROR,
|
||||
"unsupported stream type; audio compression_type=%i\n",
|
||||
compression_type);
|
||||
}
|
||||
|
||||
return 1;
|
||||
@ -264,8 +316,9 @@ static int process_video_header_mdec(AVFormatContext *s)
|
||||
avio_skip(pb, 4);
|
||||
ea->width = avio_rl16(pb);
|
||||
ea->height = avio_rl16(pb);
|
||||
ea->time_base = (AVRational){1,15};
|
||||
ea->time_base = (AVRational) { 1, 15 };
|
||||
ea->video_codec = AV_CODEC_ID_MDEC;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -290,7 +343,7 @@ static int process_video_header_cmv(AVFormatContext *s)
|
||||
avio_skip(s->pb, 10);
|
||||
fps = avio_rl16(s->pb);
|
||||
if (fps)
|
||||
ea->time_base = (AVRational){1, fps};
|
||||
ea->time_base = (AVRational) { 1, fps };
|
||||
ea->video_codec = AV_CODEC_ID_CMV;
|
||||
|
||||
return 0;
|
||||
@ -300,13 +353,14 @@ 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;
|
||||
int i;
|
||||
|
||||
for (i=0; i<5 && (!ea->audio_codec || !ea->video_codec); i++) {
|
||||
for (i = 0; i < 5 && (!ea->audio_codec || !ea->video_codec); i++) {
|
||||
unsigned int startpos = avio_tell(pb);
|
||||
int err = 0;
|
||||
|
||||
@ -320,19 +374,19 @@ static int process_ea_header(AVFormatContext *s) {
|
||||
switch (blockid) {
|
||||
case ISNh_TAG:
|
||||
if (avio_rl32(pb) != EACS_TAG) {
|
||||
av_log (s, AV_LOG_ERROR, "unknown 1SNh headerid\n");
|
||||
av_log(s, AV_LOG_ERROR, "unknown 1SNh headerid\n");
|
||||
return 0;
|
||||
}
|
||||
err = process_audio_header_eacs(s);
|
||||
break;
|
||||
|
||||
case SCHl_TAG :
|
||||
case SHEN_TAG :
|
||||
case SCHl_TAG:
|
||||
case SHEN_TAG:
|
||||
blockid = avio_rl32(pb);
|
||||
if (blockid == GSTR_TAG) {
|
||||
avio_skip(pb, 4);
|
||||
} else if ((blockid & 0xFFFF)!=PT00_TAG) {
|
||||
av_log (s, AV_LOG_ERROR, "unknown SCHl headerid\n");
|
||||
} else if ((blockid & 0xFFFF) != PT00_TAG) {
|
||||
av_log(s, AV_LOG_ERROR, "unknown SCHl headerid\n");
|
||||
return 0;
|
||||
}
|
||||
err = process_audio_header_elements(s);
|
||||
@ -342,16 +396,16 @@ static int process_ea_header(AVFormatContext *s) {
|
||||
err = process_audio_header_sead(s);
|
||||
break;
|
||||
|
||||
case MVIh_TAG :
|
||||
case MVIh_TAG:
|
||||
err = process_video_header_cmv(s);
|
||||
break;
|
||||
|
||||
case kVGT_TAG:
|
||||
ea->video_codec = AV_CODEC_ID_TGV;
|
||||
ea->time_base = (AVRational){1, 15};
|
||||
ea->time_base = (AVRational) { 1, 15 };
|
||||
break;
|
||||
|
||||
case mTCD_TAG :
|
||||
case mTCD_TAG:
|
||||
err = process_video_header_mdec(s);
|
||||
break;
|
||||
|
||||
@ -368,11 +422,11 @@ static int process_ea_header(AVFormatContext *s) {
|
||||
ea->video_codec = AV_CODEC_ID_TQI;
|
||||
break;
|
||||
|
||||
case MADk_TAG :
|
||||
case MADk_TAG:
|
||||
ea->video_codec = AV_CODEC_ID_MAD;
|
||||
break;
|
||||
|
||||
case MVhd_TAG :
|
||||
case MVhd_TAG:
|
||||
err = process_video_header_vp6(s);
|
||||
break;
|
||||
}
|
||||
@ -390,7 +444,6 @@ static int process_ea_header(AVFormatContext *s) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static int ea_probe(AVProbeData *p)
|
||||
{
|
||||
switch (AV_RL32(&p->buf[0])) {
|
||||
@ -409,6 +462,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;
|
||||
}
|
||||
|
||||
@ -432,22 +486,26 @@ static int ea_read_header(AVFormatContext *s)
|
||||
st->codec->width = ea->width;
|
||||
st->codec->height = ea->height;
|
||||
avpriv_set_pts_info(st, 33, ea->time_base.num, ea->time_base.den);
|
||||
st->avg_frame_rate = (AVRational){ea->time_base.den, ea->time_base.num};
|
||||
st->avg_frame_rate = (AVRational) { ea->time_base.den,
|
||||
ea->time_base.num };
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
@ -463,9 +521,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;
|
||||
}
|
||||
@ -473,15 +533,12 @@ 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;
|
||||
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) {
|
||||
@ -494,7 +551,7 @@ 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*/
|
||||
/* header chunk also contains data; skip over the header portion */
|
||||
if (chunk_size < 32)
|
||||
return AVERROR_INVALIDDATA;
|
||||
avio_skip(pb, 32);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user