#define MOVI_TAG FOURCC_TAG('M', 'O', 'V', 'I')
#define VTRK_TAG FOURCC_TAG('V', 'T', 'R', 'K')
#define STRK_TAG FOURCC_TAG('S', 'T', 'R', 'K')
+#define std__TAG FOURCC_TAG('s', 't', 'd', '_')
#define name_TAG FOURCC_TAG('n', 'a', 'm', 'e')
#define vtrk_TAG FOURCC_TAG('v', 't', 'r', 'k')
#define strk_TAG FOURCC_TAG('s', 't', 'r', 'k')
int bits;
int channels;
int stream_index;
+ int adpcm;
} AudioTrack;
typedef struct FourxmDemuxContext {
AudioTrack *tracks;
int selected_track;
- int64_t pts;
- int last_chunk_was_audio;
- int last_audio_frame_count;
+ int64_t audio_pts;
+ int64_t video_pts;
+ int video_pts_inc;
} FourxmDemuxContext;
+static float get_le_float(unsigned char *buffer)
+{
+ float f;
+ unsigned char *float_buffer = (unsigned char *)&f;
+
+#ifdef WORDS_BIGENDIAN
+ float_buffer[0] = buffer[3];
+ float_buffer[1] = buffer[2];
+ float_buffer[2] = buffer[1];
+ float_buffer[3] = buffer[0];
+#else
+ float_buffer[0] = buffer[0];
+ float_buffer[1] = buffer[1];
+ float_buffer[2] = buffer[2];
+ float_buffer[3] = buffer[3];
+#endif
+
+ return f;
+}
+
static int fourxm_probe(AVProbeData *p)
{
+ if (p->buf_size < 12)
+ return 0;
+
if ((LE_32(&p->buf[0]) != RIFF_TAG) ||
(LE_32(&p->buf[8]) != _4XMV_TAG))
return 0;
int i;
int current_track = -1;
AVStream *st;
+ float fps;
fourxm->track_count = 0;
fourxm->tracks = NULL;
fourcc_tag = LE_32(&header[i]);
size = LE_32(&header[i + 4]);
- if (fourcc_tag == vtrk_TAG) {
+ if (fourcc_tag == std__TAG) {
+ fps = get_le_float(&header[i + 12]);
+ fourxm->video_pts_inc = (int)(90000.0 / fps);
+ } else if (fourcc_tag == vtrk_TAG) {
/* check that there is enough data */
if (size != vtrk_SIZE) {
av_free(header);
return AVERROR_NOMEM;
}
}
+ fourxm->tracks[current_track].adpcm = LE_32(&header[i + 12]);
fourxm->tracks[current_track].channels = LE_32(&header[i + 36]);
fourxm->tracks[current_track].sample_rate = LE_32(&header[i + 40]);
fourxm->tracks[current_track].bits = LE_32(&header[i + 44]);
st->codec.bit_rate = st->codec.channels * st->codec.sample_rate *
st->codec.bits_per_sample;
st->codec.block_align = st->codec.channels * st->codec.bits_per_sample;
- if (st->codec.bits_per_sample == 8)
+ if (fourxm->tracks[current_track].adpcm)
+ st->codec.codec_id = CODEC_ID_ADPCM_4XM;
+ else if (st->codec.bits_per_sample == 8)
st->codec.codec_id = CODEC_ID_PCM_U8;
else
st->codec.codec_id = CODEC_ID_PCM_S16LE;
return AVERROR_INVALIDDATA;
/* initialize context members */
- fourxm->pts = 0;
- fourxm->last_chunk_was_audio = 0;
- fourxm->last_audio_frame_count = 0;
+ fourxm->video_pts = -fourxm->video_pts_inc; /* first frame will push to 0 */
+ fourxm->audio_pts = 0;
/* set the pts reference (1 pts = 1/90000) */
s->pts_num = 1;
FourxmDemuxContext *fourxm = s->priv_data;
ByteIOContext *pb = &s->pb;
unsigned int fourcc_tag;
- unsigned int size;
+ unsigned int size, out_size;
int ret = 0;
int track_number;
int packet_read = 0;
unsigned char header[8];
int64_t pts_inc;
+ int audio_frame_count;
while (!packet_read) {
return ret;
fourcc_tag = LE_32(&header[0]);
size = LE_32(&header[4]);
-
if (url_feof(pb))
return -EIO;
-
switch (fourcc_tag) {
case LIST_TAG:
+ /* this is a good time to bump the video pts */
+ fourxm->video_pts += fourxm->video_pts_inc;
+
/* skip the LIST-* tag and move on to the next fourcc */
get_le32(pb);
break;
case pfrm_TAG:
case cfrm_TAG:{
-int id, whole;
-static int stats[1000];
-
- /* bump the pts if this last data sent out was audio */
- if (fourxm->last_chunk_was_audio) {
- fourxm->last_chunk_was_audio = 0;
- pts_inc = fourxm->last_audio_frame_count;
- pts_inc *= 90000;
- pts_inc /= fourxm->tracks[fourxm->selected_track].sample_rate;
- fourxm->pts += pts_inc;
- }
-
/* allocate 8 more bytes than 'size' to account for fourcc
* and size */
if (av_new_packet(pkt, size + 8))
return -EIO;
pkt->stream_index = fourxm->video_stream_index;
- pkt->pts = fourxm->pts;
+ pkt->pts = fourxm->video_pts;
memcpy(pkt->data, header, 8);
ret = get_buffer(&s->pb, &pkt->data[8], size);
-if (fourcc_tag == cfrm_TAG) {
-id = LE_32(&pkt->data[12]);
-whole = LE_32(&pkt->data[16]);
-stats[id] += size - 12;
-printf(" cfrm chunk id:%d size:%d whole:%d until now:%d\n", id, size, whole, stats[id]);
-}
-
if (ret < 0)
av_free_packet(pkt);
else
}
case snd__TAG:
-printf (" snd_ chunk, ");
track_number = get_le32(pb);
- size = get_le32(pb);
+ out_size= get_le32(pb);
+ size-=8;
+
if (track_number == fourxm->selected_track) {
-printf ("correct track, dispatching...\n");
if (av_new_packet(pkt, size))
return -EIO;
pkt->stream_index =
fourxm->tracks[fourxm->selected_track].stream_index;
- pkt->pts = fourxm->pts;
+ pkt->pts = fourxm->audio_pts;
ret = get_buffer(&s->pb, pkt->data, size);
if (ret < 0)
av_free_packet(pkt);
else
packet_read = 1;
- /* maintain pts info for the benefit of the video track */
- fourxm->last_chunk_was_audio = 1;
- fourxm->last_audio_frame_count = size /
- ((fourxm->tracks[fourxm->selected_track].bits / 8) *
- fourxm->tracks[fourxm->selected_track].channels);
+ /* pts accounting */
+ audio_frame_count = size;
+ if (fourxm->tracks[fourxm->selected_track].adpcm)
+ audio_frame_count -=
+ 2 * (fourxm->tracks[fourxm->selected_track].channels);
+ audio_frame_count /=
+ fourxm->tracks[fourxm->selected_track].channels;
+ if (fourxm->tracks[fourxm->selected_track].adpcm)
+ audio_frame_count *= 2;
+ else
+ audio_frame_count /=
+ (fourxm->tracks[fourxm->selected_track].bits / 8);
+ pts_inc = audio_frame_count;
+ pts_inc *= 90000;
+ pts_inc /= fourxm->tracks[fourxm->selected_track].sample_rate;
+ fourxm->audio_pts += pts_inc;
} else {
-printf ("wrong track, skipping...\n");
url_fseek(pb, size, SEEK_CUR);
}
break;
break;
}
}
-
return ret;
}
projects / libav.git / blobdiff