annotate libmpdemux/demux_aac.c @ 30529:6ef41a766a74

GUI: #include associated .h files in .c files.
author diego
date Sun, 14 Feb 2010 12:31:24 +0000
parents 0f1b5b68af32
children 928359c13d93
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29238
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
1 /*
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
2 * This file is part of MPlayer.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
3 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
5 * it under the terms of the GNU General Public License as published by
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
7 * (at your option) any later version.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
8 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
12 * GNU General Public License for more details.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
13 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
14 * You should have received a copy of the GNU General Public License along
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
17 */
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 26327
diff changeset
18
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
19 #include <stdio.h>
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
20 #include <stdlib.h>
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
21 #include <string.h>
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
22
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
23 #include "config.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
24 #include "mp_msg.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
25 #include "help_mp.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
26
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 21421
diff changeset
27 #include "stream/stream.h"
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
28 #include "demuxer.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
29 #include "parse_es.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
30 #include "stheader.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
31
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
32 #include "ms_hdr.h"
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
33
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
34 typedef struct {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
35 uint8_t *buf;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
36 uint64_t size; /// amount of time of data packets pushed to demuxer->audio (in bytes)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
37 float time; /// amount of time elapsed based upon samples_per_frame/sample_rate (in milliseconds)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
38 float last_pts; /// last pts seen
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
39 int bitrate; /// bitrate computed as size/time
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
40 } aac_priv_t;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
41
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
42 /// \param srate (out) sample rate
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
43 /// \param num (out) number of audio frames in this ADTS frame
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
44 /// \return size of the ADTS frame in bytes
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
45 /// 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
46 int aac_parse_frame(uint8_t *buf, int *srate, int *num);
15720
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;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
51
15720
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;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
55
15720
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;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
70
15720
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;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
88
15720
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 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
94
15720
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;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
110
15720
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;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
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');
26299
4d56038ec730 Fix lots and lots of other demuxers broken by r26301
reimar
parents: 25883
diff changeset
139 demuxer->audio->id = 0;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
140 demuxer->audio->sh = sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
141
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
142 demuxer->filepos = stream_tell(demuxer->stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
143
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
144 return demuxer;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
145 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
146
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
147 static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
148 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
149 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
150 demux_packet_t *dp;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
151 int c1, c2, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
152 float tm = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
153
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
154 if(demuxer->stream->eof || (demuxer->movi_end && stream_tell(demuxer->stream) >= demuxer->movi_end))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
155 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
156
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
157 while(! demuxer->stream->eof)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
158 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
159 c1 = c2 = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
160 while(c1 != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
161 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
162 c1 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
163 if(c1 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
164 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
165 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
166 c2 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
167 if(c2 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
168 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
169 if((c2 & 0xF6) != 0xF0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
170 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
171
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
172 priv->buf[0] = (unsigned char) c1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
173 priv->buf[1] = (unsigned char) c2;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
174 if(stream_read(demuxer->stream, &(priv->buf[2]), 6) < 6)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
175 return 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
176
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
177 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
178 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
179 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
180 dp = new_demux_packet(len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
181 if(! dp)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
182 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
183 mp_msg(MSGT_DEMUX, MSGL_ERR, "fill_buffer, NEW_ADD_PACKET(%d)FAILED\n", len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
184 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
185 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
186
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
187
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
188 memcpy(dp->buffer, priv->buf, 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
189 stream_read(demuxer->stream, &(dp->buffer[8]), len-8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
190 if(srate)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
191 tm = (float) (num * 1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
192 priv->last_pts += tm;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
193 dp->pts = priv->last_pts;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
194 //fprintf(stderr, "\nPTS: %.3f\n", dp->pts);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
195 ds_add_packet(demuxer->audio, dp);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
196 priv->size += len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
197 priv->time += tm;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
198
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
199 priv->bitrate = (int) (priv->size / priv->time);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
200 demuxer->filepos = stream_tell(demuxer->stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
201
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
202 return len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
203 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
204 else
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
205 stream_skip(demuxer->stream, -6);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
206 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
207
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
208 return 0;
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
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
212 //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
213 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
214 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
215 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
216 demux_stream_t *d_audio=demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
217 sh_audio_t *sh_audio=d_audio->sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
218 float time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
219
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
220 ds_free_packs(d_audio);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
221
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
222 time = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->last_pts : rel_seek_secs;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
223 if(time < 0)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
224 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
225 stream_seek(demuxer->stream, demuxer->movi_start);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
226 time = priv->last_pts + time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
227 priv->last_pts = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
228 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
229
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
230 if(time > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
231 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
232 int len, nf, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
233
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
234 nf = time * sh_audio->samplerate/1024;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
235
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
236 while(nf > 0)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
237 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
238 if(stream_read(demuxer->stream,priv->buf, 8) < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
239 break;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
240 len = aac_parse_frame(priv->buf, &srate, &num);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
241 if(len <= 0)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
242 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
243 stream_skip(demuxer->stream, -7);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
244 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
245 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
246 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
247 priv->last_pts += (float) (num*1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
248 nf -= num;
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 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
252
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
253
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 22605
diff changeset
254 const demuxer_desc_t demuxer_desc_aac = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
255 "AAC demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
256 "aac",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
257 "AAC",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
258 "Nico Sabbi",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
259 "Raw AAC files ",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
260 DEMUXER_TYPE_AAC,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
261 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
262 demux_aac_probe,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
263 demux_aac_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
264 demux_aac_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
265 demux_close_aac,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
266 demux_aac_seek,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
267 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
268 };