annotate libmpdemux/demux_aac.c @ 25008:fc7167427c7e

fix typo spotted by corey
author compn
date Tue, 13 Nov 2007 21:13:00 +0000
parents 4d81dbdf46b9
children d4fe6e23283e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
1 #include <stdio.h>
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
2 #include <stdlib.h>
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
3 #include <string.h>
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
4
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
5 #include "config.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
6 #include "mp_msg.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
7 #include "help_mp.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
8
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 21421
diff changeset
9 #include "stream/stream.h"
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
10 #include "demuxer.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
11 #include "parse_es.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
12 #include "stheader.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
13
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
14 #include "ms_hdr.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
15
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
16 typedef struct {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
17 uint8_t *buf;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
18 uint64_t size; /// amount of time of data packets pushed to demuxer->audio (in bytes)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
19 float time; /// amount of time elapsed based upon samples_per_frame/sample_rate (in milliseconds)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
20 float last_pts; /// last pts seen
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
21 int bitrate; /// bitrate computed as size/time
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
22 } aac_priv_t;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
23
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
24 /// \param srate (out) sample rate
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
25 /// \param num (out) number of audio frames in this ADTS frame
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
26 /// \return size of the ADTS frame in bytes
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
27 /// aac_parse_frames needs a buffer at least 8 bytes long
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
28 int aac_parse_frame(uint8_t *buf, int *srate, int *num)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
29 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
30 int i = 0, sr, fl = 0, id;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
31 static int srates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0};
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
32
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
33 if((buf[i] != 0xFF) || ((buf[i+1] & 0xF6) != 0xF0))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
34 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
35
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
36 id = (buf[i+1] >> 3) & 0x01; //id=1 mpeg2, 0: mpeg4
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
37 sr = (buf[i+2] >> 2) & 0x0F;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
38 if(sr > 11)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
39 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
40 *srate = srates[sr];
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
41
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
42 fl = ((buf[i+3] & 0x03) << 11) | (buf[i+4] << 3) | ((buf[i+5] >> 5) & 0x07);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
43 *num = (buf[i+6] & 0x02) + 1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
44
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
45 return fl;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
46 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
47
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
48 static int demux_aac_init(demuxer_t *demuxer)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
49 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
50 aac_priv_t *priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
51
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
52 priv = calloc(1, sizeof(aac_priv_t));
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
53 if(!priv)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
54 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
55
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
56 priv->buf = (uint8_t*) malloc(8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
57 if(!priv->buf)
17789
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
58 {
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
59 free(priv);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
60 return 0;
17789
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
61 }
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
62
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
63 demuxer->priv = priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
64 return 1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
65 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
66
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
67 static void demux_close_aac(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
68 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
69 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
70
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
71 if(!priv)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
72 return;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
73
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
74 if(priv->buf)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
75 free(priv->buf);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
76
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
77 free(demuxer->priv);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
78
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
79 return;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
80 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
81
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
82 /// returns DEMUXER_TYPE_AAC if it finds 8 ADTS frames in 32768 bytes, 0 otherwise
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
83 static int demux_aac_probe(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
84 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
85 int cnt = 0, c, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
86 off_t init, probed;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
87 aac_priv_t *priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
88
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
89 if(! demux_aac_init(demuxer))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
90 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
91 mp_msg(MSGT_DEMUX, MSGL_ERR, "COULDN'T INIT aac_demux, exit\n");
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
92 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
93 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
94
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
95 priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
96
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
97 init = probed = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
98 while(probed-init <= 32768 && cnt < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
99 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
100 c = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
101 while(c != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
102 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
103 c = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
104 if(c < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
105 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
106 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
107 priv->buf[0] = 0xFF;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
108 if(stream_read(demuxer->stream, &(priv->buf[1]), 7) < 7)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
109 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
110
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
111 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
112 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
113 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
114 cnt++;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
115 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
116 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
117 probed = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
118 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
119
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
120 stream_seek(demuxer->stream, init);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
121 if(cnt < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
122 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
123
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16175
diff changeset
124 mp_msg(MSGT_DEMUX, MSGL_V, "demux_aac_probe, INIT: %"PRIu64", PROBED: %"PRIu64", cnt: %d\n", init, probed, cnt);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
125 return DEMUXER_TYPE_AAC;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
126
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
127 fail:
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
128 mp_msg(MSGT_DEMUX, MSGL_V, "demux_aac_probe, failed to detect an AAC stream\n");
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
129 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
130 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
131
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
132 static demuxer_t* demux_aac_open(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
133 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
134 sh_audio_t *sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
135
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
136 sh = new_sh_audio(demuxer, 0);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
137 sh->ds = demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
138 sh->format = mmioFOURCC('M', 'P', '4', 'A');
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
139 demuxer->audio->sh = sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
140
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
141 demuxer->filepos = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
142
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
143 return demuxer;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
144 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
145
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
146 static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
147 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
148 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
149 demux_packet_t *dp;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
150 int c1, c2, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
151 float tm = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
152
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
153 if(demuxer->stream->eof || (demuxer->movi_end && stream_tell(demuxer->stream) >= demuxer->movi_end))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
154 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
155
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
156 while(! demuxer->stream->eof)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
157 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
158 c1 = c2 = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
159 while(c1 != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
160 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
161 c1 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
162 if(c1 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
163 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
164 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
165 c2 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
166 if(c2 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
167 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
168 if((c2 & 0xF6) != 0xF0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
169 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
170
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
171 priv->buf[0] = (unsigned char) c1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
172 priv->buf[1] = (unsigned char) c2;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
173 if(stream_read(demuxer->stream, &(priv->buf[2]), 6) < 6)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
174 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
175
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
176 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
177 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
178 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
179 dp = new_demux_packet(len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
180 if(! dp)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
181 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
182 mp_msg(MSGT_DEMUX, MSGL_ERR, "fill_buffer, NEW_ADD_PACKET(%d)FAILED\n", len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
183 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
184 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
185
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
186
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
187 memcpy(dp->buffer, priv->buf, 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
188 stream_read(demuxer->stream, &(dp->buffer[8]), len-8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
189 if(srate)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
190 tm = (float) (num * 1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
191 priv->last_pts += tm;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
192 dp->pts = priv->last_pts;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
193 //fprintf(stderr, "\nPTS: %.3f\n", dp->pts);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
194 ds_add_packet(demuxer->audio, dp);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
195 priv->size += len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
196 priv->time += tm;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
197
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
198 priv->bitrate = (int) (priv->size / priv->time);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
199 demuxer->filepos = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
200
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
201 return len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
202 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
203 else
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
204 stream_skip(demuxer->stream, -6);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
205 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
206
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
207 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
208 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
209
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
210
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
211 //This is an almost verbatim copy of high_res_mp3_seek(), from demux_audio.c
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 16877
diff changeset
212 static void demux_aac_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
213 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
214 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
215 demux_stream_t *d_audio=demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
216 sh_audio_t *sh_audio=d_audio->sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
217 float time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
218
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
219 ds_free_packs(d_audio);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
220
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
221 time = (flags & 1) ? rel_seek_secs - priv->last_pts : rel_seek_secs;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
222 if(time < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
223 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
224 stream_seek(demuxer->stream, demuxer->movi_start);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
225 time = priv->last_pts + time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
226 priv->last_pts = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
227 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
228
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
229 if(time > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
230 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
231 int len, nf, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
232
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
233 nf = time * sh_audio->samplerate/1024;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
234
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
235 while(nf > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
236 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
237 if(stream_read(demuxer->stream,priv->buf, 8) < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
238 break;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
239 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
240 if(len <= 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
241 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
242 stream_skip(demuxer->stream, -7);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
243 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
244 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
245 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
246 priv->last_pts += (float) (num*1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
247 nf -= num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
248 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
249 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
250 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
251
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
252
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
253 demuxer_desc_t demuxer_desc_aac = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
254 "AAC demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
255 "aac",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
256 "AAC",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
257 "Nico Sabbi",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
258 "Raw AAC files ",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
259 DEMUXER_TYPE_AAC,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
260 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
261 demux_aac_probe,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
262 demux_aac_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
263 demux_aac_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
264 demux_close_aac,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
265 demux_aac_seek,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
266 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
267 };