annotate libmpdemux/demux_aac.c @ 27319:09cf111f68b8

Revert to previous dependency checking behavior. Take included header files into account when generating dependency files. This has problems when header files are removed or renamed, but does not silently miscompile files.
author diego
date Sat, 26 Jul 2008 18:36:48 +0000
parents fa91545f01bb
children d643e4643313
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
26327
fa91545f01bb Split the aac header parsing out of aac demuxer to allow using libmpmux
albeu
parents: 26299
diff changeset
28 int aac_parse_frame(uint8_t *buf, int *srate, int *num);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
29
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
30 static int demux_aac_init(demuxer_t *demuxer)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
31 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
32 aac_priv_t *priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
33
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
34 priv = calloc(1, sizeof(aac_priv_t));
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
35 if(!priv)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
36 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
37
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
38 priv->buf = (uint8_t*) malloc(8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
39 if(!priv->buf)
17789
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
40 {
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
41 free(priv);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
42 return 0;
17789
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
43 }
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
44
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
45 demuxer->priv = priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
46 return 1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
47 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
48
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
49 static void demux_close_aac(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
50 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
51 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
52
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
53 if(!priv)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
54 return;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
55
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
56 if(priv->buf)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
57 free(priv->buf);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
58
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
59 free(demuxer->priv);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
60
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
61 return;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
62 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
63
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
64 /// returns DEMUXER_TYPE_AAC if it finds 8 ADTS frames in 32768 bytes, 0 otherwise
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
65 static int demux_aac_probe(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
66 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
67 int cnt = 0, c, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
68 off_t init, probed;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
69 aac_priv_t *priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
70
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
71 if(! demux_aac_init(demuxer))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
72 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
73 mp_msg(MSGT_DEMUX, MSGL_ERR, "COULDN'T INIT aac_demux, exit\n");
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
74 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
75 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
76
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
77 priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
78
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
79 init = probed = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
80 while(probed-init <= 32768 && cnt < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
81 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
82 c = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
83 while(c != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
84 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
85 c = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
86 if(c < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
87 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
88 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
89 priv->buf[0] = 0xFF;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
90 if(stream_read(demuxer->stream, &(priv->buf[1]), 7) < 7)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
91 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
92
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
93 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
94 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
95 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
96 cnt++;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
97 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
98 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
99 probed = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
100 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
101
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
102 stream_seek(demuxer->stream, init);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
103 if(cnt < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
104 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
105
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16175
diff changeset
106 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
107 return DEMUXER_TYPE_AAC;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
108
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
109 fail:
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
110 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
111 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
112 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
113
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
114 static demuxer_t* demux_aac_open(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
115 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
116 sh_audio_t *sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
117
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
118 sh = new_sh_audio(demuxer, 0);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
119 sh->ds = demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
120 sh->format = mmioFOURCC('M', 'P', '4', 'A');
26299
4d56038ec730 Fix lots and lots of other demuxers broken by r26301
reimar
parents: 25883
diff changeset
121 demuxer->audio->id = 0;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
122 demuxer->audio->sh = sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
123
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
124 demuxer->filepos = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
125
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
126 return demuxer;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
127 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
128
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
129 static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
130 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
131 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
132 demux_packet_t *dp;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
133 int c1, c2, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
134 float tm = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
135
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
136 if(demuxer->stream->eof || (demuxer->movi_end && stream_tell(demuxer->stream) >= demuxer->movi_end))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
137 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
138
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
139 while(! demuxer->stream->eof)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
140 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
141 c1 = c2 = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
142 while(c1 != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
143 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
144 c1 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
145 if(c1 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
146 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
147 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
148 c2 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
149 if(c2 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
150 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
151 if((c2 & 0xF6) != 0xF0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
152 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
153
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
154 priv->buf[0] = (unsigned char) c1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
155 priv->buf[1] = (unsigned char) c2;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
156 if(stream_read(demuxer->stream, &(priv->buf[2]), 6) < 6)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
157 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
158
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
159 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
160 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
161 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
162 dp = new_demux_packet(len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
163 if(! dp)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
164 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
165 mp_msg(MSGT_DEMUX, MSGL_ERR, "fill_buffer, NEW_ADD_PACKET(%d)FAILED\n", len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
166 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
167 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
168
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
169
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
170 memcpy(dp->buffer, priv->buf, 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
171 stream_read(demuxer->stream, &(dp->buffer[8]), len-8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
172 if(srate)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
173 tm = (float) (num * 1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
174 priv->last_pts += tm;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
175 dp->pts = priv->last_pts;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
176 //fprintf(stderr, "\nPTS: %.3f\n", dp->pts);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
177 ds_add_packet(demuxer->audio, dp);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
178 priv->size += len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
179 priv->time += tm;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
180
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
181 priv->bitrate = (int) (priv->size / priv->time);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
182 demuxer->filepos = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
183
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
184 return len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
185 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
186 else
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
187 stream_skip(demuxer->stream, -6);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
188 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
189
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
190 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
191 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
192
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
193
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
194 //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
195 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
196 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
197 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
198 demux_stream_t *d_audio=demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
199 sh_audio_t *sh_audio=d_audio->sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
200 float time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
201
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
202 ds_free_packs(d_audio);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
203
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
204 time = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->last_pts : rel_seek_secs;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
205 if(time < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
206 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
207 stream_seek(demuxer->stream, demuxer->movi_start);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
208 time = priv->last_pts + time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
209 priv->last_pts = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
210 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
211
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
212 if(time > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
213 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
214 int len, nf, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
215
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
216 nf = time * sh_audio->samplerate/1024;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
217
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
218 while(nf > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
219 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
220 if(stream_read(demuxer->stream,priv->buf, 8) < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
221 break;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
222 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
223 if(len <= 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
224 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
225 stream_skip(demuxer->stream, -7);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
226 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
227 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
228 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
229 priv->last_pts += (float) (num*1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
230 nf -= num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
231 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
232 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
233 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
234
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
235
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 22605
diff changeset
236 const demuxer_desc_t demuxer_desc_aac = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
237 "AAC demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
238 "aac",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
239 "AAC",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
240 "Nico Sabbi",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
241 "Raw AAC files ",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
242 DEMUXER_TYPE_AAC,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
243 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
244 demux_aac_probe,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
245 demux_aac_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
246 demux_aac_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
247 demux_close_aac,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
248 demux_aac_seek,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
249 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
250 };