*/
/**
- * @file libavformat/electronicarts.c
+ * @file
* Electronic Arts Multimedia file demuxer (WVE/UV2/etc.)
* by Robin Kay (komadori at gekkou.co.uk)
*/
#define fVGT_TAG MKTAG('f', 'V', 'G', 'T') /* TGV p-frame */
#define mTCD_TAG MKTAG('m', 'T', 'C', 'D') /* MDEC */
#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */
+#define MADm_TAG MKTAG('M', 'A', 'D', 'm') /* MAD p-frame */
+#define MADe_TAG MKTAG('M', 'A', 'D', 'e') /* MAD lqp-frame */
#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG2 */
#define TGQs_TAG MKTAG('T', 'G', 'Q', 's') /* TGQ i-frame (appears in .TGQ files) */
#define pQGT_TAG MKTAG('p', 'Q', 'G', 'T') /* TGQ i-frame (appears in .UV files) */
int audio_stream_index;
int audio_frame_counter;
- int64_t audio_pts;
-
int bytes;
int sample_rate;
int num_channels;
switch (byte) {
case 0xFD:
- av_log (s, AV_LOG_INFO, "entered audio subheader\n");
+ av_log (s, AV_LOG_DEBUG, "entered audio subheader\n");
inSubheader = 1;
while (inSubheader) {
uint8_t subbyte;
switch (subbyte) {
case 0x80:
revision = read_arbitary(pb);
- av_log (s, AV_LOG_INFO, "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_INFO, "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_INFO, "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_INFO, "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_INFO, "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_INFO, "element 0x%02x set to 0x%08x\n", subbyte, read_arbitary(pb));
- av_log (s, AV_LOG_INFO, "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_INFO, "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_INFO, "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_INFO, "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_INFO, "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_INFO, "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;
}
}
case 16: ea->audio_codec = CODEC_ID_MP3; break;
case -1: break;
default:
+ ea->audio_codec = CODEC_ID_NONE;
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
return 0;
}
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:
ea->video_codec = CODEC_ID_TQI;
break;
+ case MADk_TAG :
+ ea->video_codec = CODEC_ID_MAD;
+ break;
+
case MVhd_TAG :
err = process_video_header_vp6(s);
break;
case MPCh_TAG:
case MVhd_TAG:
case MVIh_TAG:
- return AVPROBE_SCORE_MAX;
+ break;
+ default:
+ return 0;
}
- return 0;
+ if (AV_RL32(&p->buf[4]) > 0xfffff && AV_RB32(&p->buf[4]) > 0xfffff)
+ return 0;
+ return AVPROBE_SCORE_MAX;
}
static int ea_read_header(AVFormatContext *s,
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;
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_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = ea->audio_codec;
st->codec->codec_tag = 0; /* no tag */
st->codec->channels = ea->num_channels;
int packet_read = 0;
unsigned int chunk_type, chunk_size;
int key = 0;
- int num_samples;
+ int av_uninit(num_samples);
while (!packet_read) {
chunk_type = get_le32(pb);
chunk_size -= 12;
}
ret = av_get_packet(pb, pkt, chunk_size);
- if (ret != chunk_size)
- ret = AVERROR(EIO);
- else {
- 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;
- break;
- case CODEC_ID_PCM_S16LE_PLANAR:
- case CODEC_ID_MP3:
- ea->audio_frame_counter += num_samples;
- break;
- default:
- ea->audio_frame_counter += chunk_size /
- (ea->bytes * ea->num_channels);
- }
+ 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;
+ break;
+ case CODEC_ID_PCM_S16LE_PLANAR:
+ case CODEC_ID_MP3:
+ ea->audio_frame_counter += num_samples;
+ break;
+ default:
+ ea->audio_frame_counter += chunk_size /
+ (ea->bytes * ea->num_channels);
}
packet_read = 1;
case kVGT_TAG:
case pQGT_TAG:
case TGQs_TAG:
- key = PKT_FLAG_KEY;
+ case MADk_TAG:
+ 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
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);
- if (ret != chunk_size)
- ret = AVERROR_IO;
- else {
- pkt->stream_index = ea->video_stream_index;
- pkt->flags |= key;
- }
+ if (ret < 0)
+ return ret;
+ pkt->stream_index = ea->video_stream_index;
+ pkt->flags |= key;
packet_read = 1;
break;