*/
/**
- * @file electronicarts.c
+ * @file libavformat/electronicarts.c
* Electronic Arts Multimedia file demuxer (WVE/UV2/etc.)
* by Robin Kay (komadori at gekkou.co.uk)
*/
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
#define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
#define SEAD_TAG MKTAG('S', 'E', 'A', 'D') /* Sxxx header */
#define SNDC_TAG MKTAG('S', 'N', 'D', 'C') /* Sxxx data */
#define SEND_TAG MKTAG('S', 'E', 'N', 'D') /* Sxxx end */
+#define SHEN_TAG MKTAG('S', 'H', 'E', 'N') /* SxEN header */
+#define SDEN_TAG MKTAG('S', 'D', 'E', 'N') /* SxEN data */
+#define SEEN_TAG MKTAG('S', 'E', 'E', 'N') /* SxEN end */
#define ISNh_TAG MKTAG('1', 'S', 'N', 'h') /* 1SNx header */
#define EACS_TAG MKTAG('E', 'A', 'C', 'S')
#define ISNd_TAG MKTAG('1', 'S', 'N', 'd') /* 1SNx data */
#define mTCD_TAG MKTAG('m', 'T', 'C', 'D') /* MDEC */
#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-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) */
+#define pIQT_TAG MKTAG('p', 'I', 'Q', 'T') /* TQI/UV2 i-frame (.UV2/.WVE) */
#define MVhd_TAG MKTAG('M', 'V', 'h', 'd')
#define MV0K_TAG MKTAG('M', 'V', '0', 'K')
#define MV0F_TAG MKTAG('M', 'V', '0', 'F')
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;
}
}
}
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 -1: break;
default:
av_log(s, AV_LOG_ERROR, "unsupported stream type; revision2=%i\n", revision2);
break;
case SCHl_TAG :
+ case SHEN_TAG :
blockid = get_le32(pb);
if (blockid == GSTR_TAG) {
url_fskip(pb, 4);
- } else if (blockid != PT00_TAG) {
+ } else if ((blockid & 0xFFFF)!=PT00_TAG) {
av_log (s, AV_LOG_ERROR, "unknown SCHl headerid\n");
return 0;
}
ea->video_codec = CODEC_ID_MPEG2VIDEO;
break;
+ case pQGT_TAG:
+ case TGQs_TAG:
+ ea->video_codec = CODEC_ID_TGQ;
+ break;
+
+ case pIQT_TAG:
+ ea->video_codec = CODEC_ID_TQI;
+ break;
+
case MVhd_TAG :
err = process_video_header_vp6(s);
break;
case ISNh_TAG:
case SCHl_TAG:
case SEAD_TAG:
+ case SHEN_TAG:
case kVGT_TAG:
case MADk_TAG:
case MPCh_TAG:
st->codec->codec_tag = 0; /* no tag */
st->codec->channels = ea->num_channels;
st->codec->sample_rate = ea->sample_rate;
- st->codec->bits_per_sample = ea->bytes * 8;
+ st->codec->bits_per_coded_sample = ea->bytes * 8;
st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
- st->codec->bits_per_sample / 4;
- st->codec->block_align = st->codec->channels*st->codec->bits_per_sample;
+ 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;
}
int packet_read = 0;
unsigned int chunk_type, chunk_size;
int key = 0;
+ int av_uninit(num_samples);
while (!packet_read) {
chunk_type = get_le32(pb);
case ISNd_TAG:
case SCDl_TAG:
case SNDC_TAG:
+ case SDEN_TAG:
if (!ea->audio_codec) {
url_fskip(pb, chunk_size);
break;
- } else if (ea->audio_codec == CODEC_ID_PCM_S16LE_PLANAR) {
- url_fskip(pb, 12); /* planar header */
+ } 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);
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;
- 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 ISNe_TAG:
case SCEl_TAG:
case SEND_TAG:
+ case SEEN_TAG:
ret = AVERROR(EIO);
packet_read = 1;
break;
case MVIh_TAG:
case kVGT_TAG:
+ case pQGT_TAG:
+ case TGQs_TAG:
key = PKT_FLAG_KEY;
case MVIf_TAG:
case fVGT_TAG:
case MV0K_TAG:
case MPCh_TAG:
+ case pIQT_TAG:
key = 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;
projects / frescor / ffmpeg.git / blobdiff