annotate libmpdemux/demux_aac.c @ 33179:218edd8fc782

Cosmetic: Format to MPlayer coding style. Additionally: remove needless includes, group and sort includes, group and sort variables, rename gtkAOFakeSurround declaration gtkAOSurround, add #ifdefs to variable declarations, group statements by adding or removing new lines to ease reading, move assignments outside conditions, add parentheses, avoid mixing declaration and code, revise comments and add new ones.
author ib
date Fri, 15 Apr 2011 14:30:58 +0000
parents 8fa2f43cb760
children 92dd1764392a
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"
30574
928359c13d93 Add separate header for aac_parse_frame(); avoids forward declarations.
diego
parents: 29263
diff changeset
31 #include "aac_hdr.h"
15720
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 static int demux_aac_init(demuxer_t *demuxer)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
43 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
44 aac_priv_t *priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
45
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
46 priv = calloc(1, sizeof(aac_priv_t));
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
47 if(!priv)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
48 return 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
49
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30574
diff changeset
50 priv->buf = malloc(8);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
51 if(!priv->buf)
17789
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
52 {
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
53 free(priv);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
54 return 0;
17789
9f0c42967ce5 fix minor (i.e. unlikely to ever happen) leak when init fails
reimar
parents: 17636
diff changeset
55 }
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
56
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
57 demuxer->priv = priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
58 return 1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
59 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
60
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
61 static void demux_close_aac(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
62 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
63 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
64
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
65 if(!priv)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
66 return;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
67
32537
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 31609
diff changeset
68 free(priv->buf);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
69
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
70 free(demuxer->priv);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
71
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
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
75 /// returns DEMUXER_TYPE_AAC if it finds 8 ADTS frames in 32768 bytes, 0 otherwise
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
76 static int demux_aac_probe(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
77 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
78 int cnt = 0, c, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
79 off_t init, probed;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
80 aac_priv_t *priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
81
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
82 if(! demux_aac_init(demuxer))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
83 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
84 mp_msg(MSGT_DEMUX, MSGL_ERR, "COULDN'T INIT aac_demux, exit\n");
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
85 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
86 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
87
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
88 priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
89
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
90 init = probed = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
91 while(probed-init <= 32768 && cnt < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
92 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
93 c = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
94 while(c != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
95 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
96 c = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
97 if(c < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
98 goto fail;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
99 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
100 priv->buf[0] = 0xFF;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
101 if(stream_read(demuxer->stream, &(priv->buf[1]), 7) < 7)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
102 goto fail;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
103
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
104 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
105 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
106 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
107 cnt++;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
108 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
109 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
110 probed = stream_tell(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
111 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
112
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
113 stream_seek(demuxer->stream, init);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
114 if(cnt < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
115 goto fail;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
116
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16175
diff changeset
117 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
118 return DEMUXER_TYPE_AAC;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
119
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
120 fail:
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
121 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
122 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
123 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
124
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
125 static demuxer_t* demux_aac_open(demuxer_t *demuxer)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
126 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
127 sh_audio_t *sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
128
31609
cd81fce1f010 Make the stream language an argument to the stream creation function
reimar
parents: 30702
diff changeset
129 sh = new_sh_audio(demuxer, 0, NULL);
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
130 sh->ds = demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
131 sh->format = mmioFOURCC('M', 'P', '4', 'A');
26299
4d56038ec730 Fix lots and lots of other demuxers broken by r26301
reimar
parents: 25883
diff changeset
132 demuxer->audio->id = 0;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
133 demuxer->audio->sh = sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
134
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
135 demuxer->filepos = stream_tell(demuxer->stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
136
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
137 return demuxer;
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
138 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
139
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
140 static int demux_aac_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
141 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
142 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
143 demux_packet_t *dp;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
144 int c1, c2, len, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
145 float tm = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
146
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
147 if(demuxer->stream->eof || (demuxer->movi_end && stream_tell(demuxer->stream) >= demuxer->movi_end))
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
148 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
149
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
150 while(! demuxer->stream->eof)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
151 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
152 c1 = c2 = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
153 while(c1 != 0xFF)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
154 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
155 c1 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
156 if(c1 < 0)
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 c2 = stream_read_char(demuxer->stream);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
160 if(c2 < 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
161 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
162 if((c2 & 0xF6) != 0xF0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
163 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
164
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
165 priv->buf[0] = (unsigned char) c1;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
166 priv->buf[1] = (unsigned char) c2;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
167 if(stream_read(demuxer->stream, &(priv->buf[2]), 6) < 6)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
168 return 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
169
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
170 len = aac_parse_frame(priv->buf, &srate, &num);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
171 if(len > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
172 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
173 dp = new_demux_packet(len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
174 if(! dp)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
175 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
176 mp_msg(MSGT_DEMUX, MSGL_ERR, "fill_buffer, NEW_ADD_PACKET(%d)FAILED\n", len);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
177 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
178 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
179
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
180
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
181 memcpy(dp->buffer, priv->buf, 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
182 stream_read(demuxer->stream, &(dp->buffer[8]), len-8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
183 if(srate)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
184 tm = (float) (num * 1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
185 priv->last_pts += tm;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
186 dp->pts = priv->last_pts;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
187 //fprintf(stderr, "\nPTS: %.3f\n", dp->pts);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
188 ds_add_packet(demuxer->audio, dp);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
189 priv->size += len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
190 priv->time += tm;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
191
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
192 priv->bitrate = (int) (priv->size / priv->time);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
193 demuxer->filepos = stream_tell(demuxer->stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
194
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
195 return len;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
196 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
197 else
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
198 stream_skip(demuxer->stream, -6);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
199 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
200
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
201 return 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
202 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
203
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
204
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
205 //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
206 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
207 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
208 aac_priv_t *priv = (aac_priv_t *) demuxer->priv;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
209 demux_stream_t *d_audio=demuxer->audio;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
210 sh_audio_t *sh_audio=d_audio->sh;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
211 float time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
212
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
213 ds_free_packs(d_audio);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
214
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
215 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
216 if(time < 0)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
217 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
218 stream_seek(demuxer->stream, demuxer->movi_start);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
219 time = priv->last_pts + time;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
220 priv->last_pts = 0;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
221 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
222
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
223 if(time > 0)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
224 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
225 int len, nf, srate, num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
226
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
227 nf = time * sh_audio->samplerate/1024;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
228
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
229 while(nf > 0)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
230 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
231 if(stream_read(demuxer->stream,priv->buf, 8) < 8)
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
232 break;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
233 len = aac_parse_frame(priv->buf, &srate, &num);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
234 if(len <= 0)
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
235 {
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
236 stream_skip(demuxer->stream, -7);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
237 continue;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
238 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
239 stream_skip(demuxer->stream, len - 8);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
240 priv->last_pts += (float) (num*1024.0/srate);
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
241 nf -= num;
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
242 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
243 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
244 }
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents:
diff changeset
245
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
246
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 22605
diff changeset
247 const demuxer_desc_t demuxer_desc_aac = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
248 "AAC demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
249 "aac",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
250 "AAC",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
251 "Nico Sabbi",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
252 "Raw AAC files ",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
253 DEMUXER_TYPE_AAC,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
254 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
255 demux_aac_probe,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
256 demux_aac_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
257 demux_aac_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
258 demux_close_aac,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
259 demux_aac_seek,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
260 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 15820
diff changeset
261 };