typedef struct EaDemuxContext {
int big_endian;
- enum CodecID video_codec;
+ enum AVCodecID video_codec;
AVRational time_base;
int width, height;
int nb_frames;
int video_stream_index;
- enum CodecID audio_codec;
+ enum AVCodecID audio_codec;
int audio_stream_index;
int bytes;
}
switch (compression_type) {
- case 0: ea->audio_codec = CODEC_ID_PCM_S16LE; break;
- case 7: ea->audio_codec = 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 = 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: 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);
return 0;
}
switch (revision2) {
- case 8: ea->audio_codec = CODEC_ID_PCM_S16LE_PLANAR; break;
- case 10: ea->audio_codec = CODEC_ID_ADPCM_EA_R2; break;
- case 16: ea->audio_codec = CODEC_ID_MP3; 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 = CODEC_ID_NONE;
+ ea->audio_codec = AV_CODEC_ID_NONE;
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
return 0;
}
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;
+ 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 = CODEC_ID_PCM_MULAW; ea->bytes = 1; break;
- case 2: ea->audio_codec = 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);
}
ea->sample_rate = avio_rl32(pb);
ea->bytes = avio_rl32(pb); /* 1=8-bit, 2=16-bit */
ea->num_channels = avio_rl32(pb);
- ea->audio_codec = CODEC_ID_ADPCM_IMA_EA_SEAD;
+ ea->audio_codec = AV_CODEC_ID_ADPCM_IMA_EA_SEAD;
return 1;
}
ea->width = avio_rl16(pb);
ea->height = avio_rl16(pb);
ea->time_base = (AVRational){1,15};
- ea->video_codec = CODEC_ID_MDEC;
+ ea->video_codec = AV_CODEC_ID_MDEC;
return 1;
}
avio_skip(pb, 4);
ea->time_base.den = avio_rl32(pb);
ea->time_base.num = avio_rl32(pb);
- ea->video_codec = CODEC_ID_VP6;
+ ea->video_codec = AV_CODEC_ID_VP6;
return 1;
}
fps = avio_rl16(s->pb);
if (fps)
ea->time_base = (AVRational){1, fps};
- ea->video_codec = CODEC_ID_CMV;
+ ea->video_codec = AV_CODEC_ID_CMV;
return 0;
}
break;
case kVGT_TAG:
- ea->video_codec = CODEC_ID_TGV;
+ ea->video_codec = AV_CODEC_ID_TGV;
break;
case mTCD_TAG :
break;
case MPCh_TAG:
- ea->video_codec = CODEC_ID_MPEG2VIDEO;
+ ea->video_codec = AV_CODEC_ID_MPEG2VIDEO;
break;
case pQGT_TAG:
case TGQs_TAG:
- ea->video_codec = CODEC_ID_TGQ;
+ ea->video_codec = AV_CODEC_ID_TGQ;
break;
case pIQT_TAG:
- ea->video_codec = CODEC_ID_TQI;
+ ea->video_codec = AV_CODEC_ID_TQI;
break;
case MADk_TAG :
- ea->video_codec = CODEC_ID_MAD;
+ ea->video_codec = AV_CODEC_ID_MAD;
break;
case MVhd_TAG :
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = ea->video_codec;
// parsing is necessary to make FFmpeg generate correct timestamps
- if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO)
+ if (st->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO)
st->need_parsing = AVSTREAM_PARSE_HEADERS;
st->codec->codec_tag = 0; /* no fourcc */
st->codec->width = ea->width;
st->duration = st->nb_frames = ea->nb_frames;
if (ea->time_base.num)
avpriv_set_pts_info(st, 64, ea->time_base.num, ea->time_base.den);
- st->r_frame_rate = st->avg_frame_rate = (AVRational){ea->time_base.den,
- ea->time_base.num};
+ st->r_frame_rate =
+ st->avg_frame_rate = av_inv_q(ea->time_base);
}
if (ea->audio_codec) {
}
if (ea->bytes <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid number of bytes per sample: %d\n", ea->bytes);
- ea->audio_codec = CODEC_ID_NONE;
+ ea->audio_codec = AV_CODEC_ID_NONE;
return 1;
}
if (!ea->audio_codec) {
avio_skip(pb, chunk_size);
break;
- } else if (ea->audio_codec == CODEC_ID_PCM_S16LE_PLANAR ||
- ea->audio_codec == CODEC_ID_MP3) {
+ } else if (ea->audio_codec == AV_CODEC_ID_PCM_S16LE_PLANAR ||
+ ea->audio_codec == AV_CODEC_ID_MP3) {
num_samples = avio_rl32(pb);
avio_skip(pb, 8);
chunk_size -= 12;
pkt->stream_index = ea->audio_stream_index;
switch (ea->audio_codec) {
- case CODEC_ID_ADPCM_EA:
- case CODEC_ID_ADPCM_EA_R1:
- case CODEC_ID_ADPCM_EA_R2:
- case CODEC_ID_ADPCM_IMA_EA_EACS:
+ case AV_CODEC_ID_ADPCM_EA:
+ case AV_CODEC_ID_ADPCM_EA_R1:
+ case AV_CODEC_ID_ADPCM_EA_R2:
+ case AV_CODEC_ID_ADPCM_IMA_EA_EACS:
pkt->duration = AV_RL32(pkt->data);
break;
- case CODEC_ID_ADPCM_EA_R3:
+ case AV_CODEC_ID_ADPCM_EA_R3:
pkt->duration = AV_RB32(pkt->data);
break;
- case CODEC_ID_ADPCM_IMA_EA_SEAD:
+ case AV_CODEC_ID_ADPCM_IMA_EA_SEAD:
pkt->duration = ret * 2 / ea->num_channels;
break;
- case CODEC_ID_PCM_S16LE_PLANAR:
- case CODEC_ID_MP3:
+ case AV_CODEC_ID_PCM_S16LE_PLANAR:
+ case AV_CODEC_ID_MP3:
pkt->duration = num_samples;
break;
default:
AVInputFormat ff_ea_demuxer = {
.name = "ea",
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia"),
.priv_data_size = sizeof(EaDemuxContext),
.read_probe = ea_probe,
.read_header = ea_read_header,