* Copyright (c) 2004 The ffmpeg Project
* Copyright (c) 2006-2008 Peter Ross
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavformat/electronicarts.c
+ * @file
* Electronic Arts Multimedia file demuxer (WVE/UV2/etc.)
* by Robin Kay (komadori at gekkou.co.uk)
*/
#include "libavutil/intreadwrite.h"
#include "avformat.h"
+#include "internal.h"
#define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
#define SEAD_TAG MKTAG('S', 'E', 'A', 'D') /* Sxxx header */
typedef struct EaDemuxContext {
int big_endian;
- enum CodecID video_codec;
+ enum AVCodecID video_codec;
AVRational time_base;
int width, height;
int video_stream_index;
- enum CodecID audio_codec;
+ enum AVCodecID audio_codec;
int audio_stream_index;
- int audio_frame_counter;
int bytes;
int sample_rate;
int num_samples;
} EaDemuxContext;
-static uint32_t read_arbitary(ByteIOContext *pb) {
+static uint32_t read_arbitary(AVIOContext *pb) {
uint8_t size, byte;
int i;
uint32_t word;
- size = get_byte(pb);
+ size = avio_r8(pb);
word = 0;
for (i = 0; i < size; i++) {
- byte = get_byte(pb);
+ byte = avio_r8(pb);
word <<= 8;
word |= byte;
}
{
int inHeader = 1;
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
int compression_type = -1, revision = -1, revision2 = -1;
ea->bytes = 2;
ea->sample_rate = -1;
ea->num_channels = 1;
- while (inHeader) {
+ while (!pb->eof_reached && inHeader) {
int inSubheader;
uint8_t byte;
- byte = get_byte(pb);
+ byte = avio_r8(pb);
switch (byte) {
case 0xFD:
av_log (s, AV_LOG_DEBUG, "entered audio subheader\n");
inSubheader = 1;
- while (inSubheader) {
+ while (!pb->eof_reached && inSubheader) {
uint8_t subbyte;
- subbyte = get_byte(pb);
+ subbyte = avio_r8(pb);
switch (subbyte) {
case 0x80:
}
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 = AV_CODEC_ID_NONE;
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
return 0;
}
static int process_audio_header_eacs(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *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);
+ ea->sample_rate = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
+ ea->bytes = avio_r8(pb); /* 1=8-bit, 2=16-bit */
+ ea->num_channels = avio_r8(pb);
+ compression_type = avio_r8(pb);
+ avio_skip(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;
+ 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);
}
static int process_audio_header_sead(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *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;
+ 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 = AV_CODEC_ID_ADPCM_IMA_EA_SEAD;
return 1;
}
static int process_video_header_mdec(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
- url_fskip(pb, 4);
- ea->width = get_le16(pb);
- ea->height = get_le16(pb);
+ AVIOContext *pb = s->pb;
+ avio_skip(pb, 4);
+ 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;
}
static int process_video_header_vp6(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
- url_fskip(pb, 16);
- ea->time_base.den = get_le32(pb);
- ea->time_base.num = get_le32(pb);
- ea->video_codec = CODEC_ID_VP6;
+ avio_skip(pb, 16);
+ ea->time_base.den = avio_rl32(pb);
+ ea->time_base.num = avio_rl32(pb);
+ ea->video_codec = AV_CODEC_ID_VP6;
return 1;
}
+static int process_video_header_cmv(AVFormatContext *s)
+{
+ EaDemuxContext *ea = s->priv_data;
+ int fps;
+
+ avio_skip(s->pb, 10);
+ fps = avio_rl16(s->pb);
+ if (fps)
+ ea->time_base = (AVRational){1, fps};
+ ea->video_codec = AV_CODEC_ID_CMV;
+
+ return 0;
+}
+
/*
* Process EA file header
* Returns 1 if the EA file is valid and successfully opened, 0 otherwise
static int process_ea_header(AVFormatContext *s) {
uint32_t blockid, size = 0;
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
int i;
for (i=0; i<5 && (!ea->audio_codec || !ea->video_codec); i++) {
- unsigned int startpos = url_ftell(pb);
+ unsigned int startpos = avio_tell(pb);
int err = 0;
- blockid = get_le32(pb);
- size = get_le32(pb);
+ blockid = avio_rl32(pb);
+ size = avio_rl32(pb);
if (i == 0)
ea->big_endian = size > 0x000FFFFF;
if (ea->big_endian)
- size = bswap_32(size);
+ size = av_bswap32(size);
switch (blockid) {
case ISNh_TAG:
- if (get_le32(pb) != EACS_TAG) {
+ if (avio_rl32(pb) != EACS_TAG) {
av_log (s, AV_LOG_ERROR, "unknown 1SNh headerid\n");
return 0;
}
case SCHl_TAG :
case SHEN_TAG :
- blockid = get_le32(pb);
+ blockid = avio_rl32(pb);
if (blockid == GSTR_TAG) {
- url_fskip(pb, 4);
+ avio_skip(pb, 4);
} else if ((blockid & 0xFFFF)!=PT00_TAG) {
av_log (s, AV_LOG_ERROR, "unknown SCHl headerid\n");
return 0;
break;
case MVIh_TAG :
- ea->video_codec = CODEC_ID_CMV;
- ea->time_base = (AVRational){0,0};
+ err = process_video_header_cmv(s);
break;
case kVGT_TAG:
- ea->video_codec = CODEC_ID_TGV;
- ea->time_base = (AVRational){0,0};
+ ea->video_codec = AV_CODEC_ID_TGV;
+ ea->time_base = (AVRational){1, 15};
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 :
return err;
}
- url_fseek(pb, startpos + size, SEEK_SET);
+ avio_seek(pb, startpos + size, SEEK_SET);
}
- url_fseek(pb, 0, SEEK_SET);
+ avio_seek(pb, 0, SEEK_SET);
return 1;
}
return AVPROBE_SCORE_MAX;
}
-static int ea_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int ea_read_header(AVFormatContext *s)
{
EaDemuxContext *ea = s->priv_data;
AVStream *st;
if (ea->video_codec) {
/* initialize the video decoder stream */
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
ea->video_stream_index = st->index;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = ea->video_codec;
st->codec->codec_tag = 0; /* no fourcc */
- st->codec->time_base = ea->time_base;
st->codec->width = ea->width;
st->codec->height = ea->height;
+ avpriv_set_pts_info(st, 33, ea->time_base.num, ea->time_base.den);
+#if FF_API_R_FRAME_RATE
+ st->r_frame_rate =
+#endif
+ 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);
+ 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);
+ 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);
+ ea->audio_codec = AV_CODEC_ID_NONE;
+ return 1;
+ }
+
/* initialize the audio decoder stream */
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
- av_set_pts_info(st, 33, 1, ea->sample_rate);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ avpriv_set_pts_info(st, 33, 1, ea->sample_rate);
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = ea->audio_codec;
st->codec->codec_tag = 0; /* no tag */
st->codec->channels = ea->num_channels;
st->codec->bits_per_coded_sample / 4;
st->codec->block_align = st->codec->channels*st->codec->bits_per_coded_sample;
ea->audio_stream_index = st->index;
- ea->audio_frame_counter = 0;
+ st->start_time = 0;
}
return 1;
AVPacket *pkt)
{
EaDemuxContext *ea = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
int ret = 0;
int packet_read = 0;
unsigned int chunk_type, chunk_size;
int av_uninit(num_samples);
while (!packet_read) {
- chunk_type = get_le32(pb);
- chunk_size = (ea->big_endian ? get_be32(pb) : get_le32(pb)) - 8;
+ chunk_type = avio_rl32(pb);
+ chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
+ if (chunk_size <= 8)
+ return AVERROR_INVALIDDATA;
+ chunk_size -= 8;
switch (chunk_type) {
/* audio data */
case ISNh_TAG:
/* header chunk also contains data; skip over the header portion*/
- url_fskip(pb, 32);
+ if (chunk_size < 32)
+ return AVERROR_INVALIDDATA;
+ avio_skip(pb, 32);
chunk_size -= 32;
case ISNd_TAG:
case SCDl_TAG:
case SNDC_TAG:
case SDEN_TAG:
if (!ea->audio_codec) {
- url_fskip(pb, chunk_size);
+ avio_skip(pb, chunk_size);
break;
- } else if (ea->audio_codec == CODEC_ID_PCM_S16LE_PLANAR ||
- ea->audio_codec == CODEC_ID_MP3) {
- num_samples = get_le32(pb);
- url_fskip(pb, 8);
+ } 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;
}
ret = av_get_packet(pb, pkt, chunk_size);
if (ret < 0)
return ret;
pkt->stream_index = ea->audio_stream_index;
- pkt->pts = 90000;
- 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;
+ 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 AV_CODEC_ID_ADPCM_EA_R3:
+ pkt->duration = AV_RB32(pkt->data);
+ break;
+ 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:
- ea->audio_frame_counter += num_samples;
+ case AV_CODEC_ID_PCM_S16LE_PLANAR:
+ case AV_CODEC_ID_MP3:
+ pkt->duration = num_samples;
break;
default:
- ea->audio_frame_counter += chunk_size /
- (ea->bytes * ea->num_channels);
+ pkt->duration = chunk_size / (ea->bytes * ea->num_channels);
}
packet_read = 1;
case pQGT_TAG:
case TGQs_TAG:
case MADk_TAG:
- key = PKT_FLAG_KEY;
+ key = AV_PKT_FLAG_KEY;
case MVIf_TAG:
case fVGT_TAG:
case MADm_TAG:
case MADe_TAG:
- url_fseek(pb, -8, SEEK_CUR); // include chunk preamble
+ avio_seek(pb, -8, SEEK_CUR); // include chunk preamble
chunk_size += 8;
goto get_video_packet;
case mTCD_TAG:
- url_fseek(pb, 8, SEEK_CUR); // skip ea dct header
+ avio_skip(pb, 8); // skip ea dct header
chunk_size -= 8;
goto get_video_packet;
case MV0K_TAG:
case MPCh_TAG:
case pIQT_TAG:
- key = PKT_FLAG_KEY;
+ key = AV_PKT_FLAG_KEY;
case MV0F_TAG:
get_video_packet:
ret = av_get_packet(pb, pkt, chunk_size);
break;
default:
- url_fseek(pb, chunk_size, SEEK_CUR);
+ avio_skip(pb, chunk_size);
break;
}
}
return ret;
}
-AVInputFormat ea_demuxer = {
- "ea",
- NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
- sizeof(EaDemuxContext),
- ea_probe,
- ea_read_header,
- ea_read_packet,
+AVInputFormat ff_ea_demuxer = {
+ .name = "ea",
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia"),
+ .priv_data_size = sizeof(EaDemuxContext),
+ .read_probe = ea_probe,
+ .read_header = ea_read_header,
+ .read_packet = ea_read_packet,
};
projects / ffmpeg / blobdiff