annotate libmpdemux/demux_audio.c @ 17027:04d66a417413

Use slice-height 16 as default for yuv colorspaces (only relevant if decoder does not support slice rendering).
author reimar
date Tue, 22 Nov 2005 16:18:34 +0000
parents 6ff3379a0862
children 7084d2fbfea4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
1
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
2 #include "config.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16877
diff changeset
3 #include "mp_msg.h"
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
4
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
5 #include <stdlib.h>
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
6 #include <stdio.h>
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
7 #include "stream.h"
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
8 #include "demuxer.h"
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
9 #include "stheader.h"
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
10 #include "genres.h"
6763
e29f95ed5d36 Fix vbr muxing and win32 codec crash on init
albeu
parents: 5812
diff changeset
11 #include "mp3_hdr.h"
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
12
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
13 #include <string.h>
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
14 #ifdef MP_DEBUG
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
15 #include <assert.h>
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
16 #endif
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
17
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
18 #define MP3 1
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
19 #define WAV 2
11004
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
20 #define fLaC 3
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
21
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
22
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
23 #define HDR_SIZE 4
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
24
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
25 typedef struct da_priv {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
26 int frmt;
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
27 float last_pts;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
28 } da_priv_t;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
29
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
30 // how many valid frames in a row we need before accepting as valid MP3
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
31 #define MIN_MP3_HDRS 5
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
32
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
33 //! Used to describe a potential (chain of) MP3 headers we found
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
34 typedef struct mp3_hdr {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
35 off_t frame_pos; // start of first frame in this "chain" of headers
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
36 off_t next_frame_pos; // here we expect the next header with same parameters
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
37 int mp3_chans;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
38 int mp3_freq;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
39 int mpa_spf;
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
40 int mpa_layer;
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
41 int mpa_br;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
42 int cons_hdrs; // if this reaches MIN_MP3_HDRS we accept as MP3 file
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
43 struct mp3_hdr *next;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
44 } mp3_hdr_t;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
45
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
46 extern void free_sh_audio(sh_audio_t* sh);
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8116
diff changeset
47 extern void print_wave_header(WAVEFORMATEX *h);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
48
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7847
diff changeset
49 int hr_mp3_seek = 0;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
50
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
51 /**
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
52 * \brief free a list of MP3 header descriptions
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
53 * \param list pointer to the head-of-list pointer
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
54 */
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
55 static void free_mp3_hdrs(mp3_hdr_t **list) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
56 mp3_hdr_t *tmp;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
57 while (*list) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
58 tmp = (*list)->next;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
59 free(*list);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
60 *list = tmp;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
61 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
62 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
63
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
64 /**
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
65 * \brief add another potential MP3 header to our list
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
66 * If it fits into an existing chain this one is expanded otherwise
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
67 * a new one is created.
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
68 * All entries that expected a MP3 header before the current position
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
69 * are discarded.
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
70 * The list is expected to be and will be kept sorted by next_frame_pos
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
71 * and when those are equal by frame_pos.
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
72 * \param list pointer to the head-of-list pointer
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
73 * \param st_pos stream position where the described header starts
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
74 * \param mp3_chans number of channels as specified by the header (*)
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
75 * \param mp3_freq sampling frequency as specified by the header (*)
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
76 * \param mpa_spf frame size as specified by the header
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
77 * \param mpa_layer layer type ("version") as specified by the header (*)
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
78 * \param mpa_br bitrate as specified by the header
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
79 * \param mp3_flen length of the frame as specified by the header
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
80 * \return If non-null the current file is accepted as MP3 and the
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
81 * mp3_hdr struct describing the valid chain is returned. Must be
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
82 * freed independent of the list.
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
83 *
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
84 * parameters marked by (*) must be the same for all headers in the same chain
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
85 */
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
86 static mp3_hdr_t *add_mp3_hdr(mp3_hdr_t **list, off_t st_pos,
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
87 int mp3_chans, int mp3_freq, int mpa_spf,
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
88 int mpa_layer, int mpa_br, int mp3_flen) {
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
89 mp3_hdr_t *tmp;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
90 int in_list = 0;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
91 while (*list && (*list)->next_frame_pos <= st_pos) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
92 if (((*list)->next_frame_pos < st_pos) || ((*list)->mp3_chans != mp3_chans)
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
93 || ((*list)->mp3_freq != mp3_freq) || ((*list)->mpa_layer != mpa_layer) ) {
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
94 // wasn't valid!
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
95 tmp = (*list)->next;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
96 free(*list);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
97 *list = tmp;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
98 } else {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
99 (*list)->cons_hdrs++;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
100 (*list)->next_frame_pos = st_pos + mp3_flen;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
101 (*list)->mpa_spf = mpa_spf;
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
102 (*list)->mpa_br = mpa_br;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
103 if ((*list)->cons_hdrs >= MIN_MP3_HDRS) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
104 // copy the valid entry, so that the list can be easily freed
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
105 tmp = malloc(sizeof(mp3_hdr_t));
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
106 memcpy(tmp, *list, sizeof(mp3_hdr_t));
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
107 tmp->next = NULL;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
108 return tmp;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
109 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
110 in_list = 1;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
111 list = &((*list)->next);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
112 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
113 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
114 if (!in_list) { // does not belong into an existing chain, insert
15215
db6286839af7 Fix MP3 detection (list of found MP3 headers was not kep sorted).
reimar
parents: 15205
diff changeset
115 // find right position to insert to keep sorting
db6286839af7 Fix MP3 detection (list of found MP3 headers was not kep sorted).
reimar
parents: 15205
diff changeset
116 while (*list && (*list)->next_frame_pos <= st_pos + mp3_flen)
db6286839af7 Fix MP3 detection (list of found MP3 headers was not kep sorted).
reimar
parents: 15205
diff changeset
117 list = &((*list)->next);
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
118 tmp = malloc(sizeof(mp3_hdr_t));
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
119 tmp->frame_pos = st_pos;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
120 tmp->next_frame_pos = st_pos + mp3_flen;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
121 tmp->mp3_chans = mp3_chans;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
122 tmp->mp3_freq = mp3_freq;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
123 tmp->mpa_spf = mpa_spf;
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
124 tmp->mpa_layer = mpa_layer;
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
125 tmp->mpa_br = mpa_br;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
126 tmp->cons_hdrs = 1;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
127 tmp->next = *list;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
128 *list = tmp;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
129 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
130 return NULL;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
131 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
132
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
133 static int demux_audio_open(demuxer_t* demuxer) {
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
134 stream_t *s;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
135 sh_audio_t* sh_audio;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
136 uint8_t hdr[HDR_SIZE];
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
137 int frmt = 0, n = 0, step;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
138 off_t st_pos = 0, next_frame_pos = 0;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
139 // mp3_hdrs list is sorted first by next_frame_pos and then by frame_pos
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
140 mp3_hdr_t *mp3_hdrs = NULL, *mp3_found = NULL;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
141 da_priv_t* priv;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
142 #ifdef MP_DEBUG
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
143 assert(demuxer != NULL);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
144 assert(demuxer->stream != NULL);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
145 #endif
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
146
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
147 s = demuxer->stream;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
148
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
149 stream_read(s, hdr, HDR_SIZE);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
150 while(n < 30000 && !s->eof) {
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
151 int mp3_freq, mp3_chans, mp3_flen, mpa_layer, mpa_spf, mpa_br;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
152 st_pos = stream_tell(s) - HDR_SIZE;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
153 step = 1;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
154
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
155 if( hdr[0] == 'R' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == 'F' ) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
156 stream_skip(s,4);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
157 if(s->eof)
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
158 break;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
159 stream_read(s,hdr,4);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
160 if(s->eof)
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
161 break;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
162 if(hdr[0] != 'W' || hdr[1] != 'A' || hdr[2] != 'V' || hdr[3] != 'E' )
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
163 stream_skip(s,-8);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
164 else
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
165 // We found wav header. Now we can have 'fmt ' or a mp3 header
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
166 // empty the buffer
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
167 step = 4;
8116
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
168 } else if( hdr[0] == 'I' && hdr[1] == 'D' && hdr[2] == '3' && (hdr[3] >= 2)) {
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
169 int len;
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
170 stream_skip(s,2);
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
171 stream_read(s,hdr,4);
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
172 len = (hdr[0]<<21) | (hdr[1]<<14) | (hdr[2]<<7) | hdr[3];
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
173 stream_skip(s,len);
3757669b825b skip id3v2 junk when looking for mp3
rfelker
parents: 8110
diff changeset
174 step = 4;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
175 } else if( hdr[0] == 'f' && hdr[1] == 'm' && hdr[2] == 't' && hdr[3] == ' ' ) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
176 frmt = WAV;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
177 break;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
178 } else if((mp3_flen = mp_get_mp3_header(hdr, &mp3_chans, &mp3_freq,
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
179 &mpa_spf, &mpa_layer, &mpa_br)) > 0) {
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
180 mp3_found = add_mp3_hdr(&mp3_hdrs, st_pos, mp3_chans, mp3_freq,
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
181 mpa_spf, mpa_layer, mpa_br, mp3_flen);
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
182 if (mp3_found) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
183 frmt = MP3;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
184 break;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
185 }
11004
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
186 } else if( hdr[0] == 'f' && hdr[1] == 'L' && hdr[2] == 'a' && hdr[3] == 'C' ) {
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
187 frmt = fLaC;
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
188 stream_skip(s,-4);
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
189 break;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
190 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
191 // Add here some other audio format detection
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
192 if(step < HDR_SIZE)
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
193 memmove(hdr,&hdr[step],HDR_SIZE-step);
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
194 stream_read(s, &hdr[HDR_SIZE - step], step);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
195 n++;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
196 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
197
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
198 free_mp3_hdrs(&mp3_hdrs);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
199
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
200 if(!frmt)
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
201 return 0;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
202
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
203 sh_audio = new_sh_audio(demuxer,0);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
204
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
205 switch(frmt) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
206 case MP3:
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
207 sh_audio->format = (mp3_found->mpa_layer < 3 ? 0x50 : 0x55);
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
208 demuxer->movi_start = mp3_found->frame_pos;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
209 next_frame_pos = mp3_found->next_frame_pos;
6763
e29f95ed5d36 Fix vbr muxing and win32 codec crash on init
albeu
parents: 5812
diff changeset
210 sh_audio->audio.dwSampleSize= 0;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
211 sh_audio->audio.dwScale = mp3_found->mpa_spf;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
212 sh_audio->audio.dwRate = mp3_found->mp3_freq;
6763
e29f95ed5d36 Fix vbr muxing and win32 codec crash on init
albeu
parents: 5812
diff changeset
213 sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
e29f95ed5d36 Fix vbr muxing and win32 codec crash on init
albeu
parents: 5812
diff changeset
214 sh_audio->wf->wFormatTag = sh_audio->format;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
215 sh_audio->wf->nChannels = mp3_found->mp3_chans;
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
216 sh_audio->wf->nSamplesPerSec = mp3_found->mp3_freq;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
217 sh_audio->wf->nAvgBytesPerSec = mp3_found->mpa_br * (1000 / 8);
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
218 sh_audio->wf->nBlockAlign = mp3_found->mpa_spf;
6763
e29f95ed5d36 Fix vbr muxing and win32 codec crash on init
albeu
parents: 5812
diff changeset
219 sh_audio->wf->wBitsPerSample = 16;
e29f95ed5d36 Fix vbr muxing and win32 codec crash on init
albeu
parents: 5812
diff changeset
220 sh_audio->wf->cbSize = 0;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
221 sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
222 free(mp3_found);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
223 mp3_found = NULL;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
224 if(s->end_pos) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
225 char tag[4];
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
226 stream_seek(s,s->end_pos-128);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
227 stream_read(s,tag,3);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
228 tag[3] = '\0';
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
229 if(strcmp(tag,"TAG"))
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
230 demuxer->movi_end = s->end_pos;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
231 else {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
232 char buf[31];
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
233 uint8_t g;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
234 demuxer->movi_end = stream_tell(s)-3;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
235 stream_read(s,buf,30);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
236 buf[30] = '\0';
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
237 demux_info_add(demuxer,"Title",buf);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
238 stream_read(s,buf,30);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
239 buf[30] = '\0';
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
240 demux_info_add(demuxer,"Artist",buf);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
241 stream_read(s,buf,30);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
242 buf[30] = '\0';
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
243 demux_info_add(demuxer,"Album",buf);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
244 stream_read(s,buf,4);
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
245 buf[4] = '\0';
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
246 demux_info_add(demuxer,"Year",buf);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
247 stream_read(s,buf,30);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
248 buf[30] = '\0';
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
249 demux_info_add(demuxer,"Comment",buf);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
250 if(buf[28] == 0 && buf[29] != 0) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
251 uint8_t trk = (uint8_t)buf[29];
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
252 sprintf(buf,"%d",trk);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
253 demux_info_add(demuxer,"Track",buf);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
254 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
255 g = stream_read_char(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
256 demux_info_add(demuxer,"Genre",genres[g]);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
257 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
258 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
259 break;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
260 case WAV: {
4720
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
261 unsigned int chunk_type;
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
262 unsigned int chunk_size;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
263 WAVEFORMATEX* w;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
264 int l;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
265 l = stream_read_dword_le(s);
9596
7b4a17c415fb Same behaviour as old code for short headers
rtognimp
parents: 9591
diff changeset
266 if(l < 16) {
9591
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
267 mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] Bad wav header length: too short (%d)!!!\n",l);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
268 free_sh_audio(sh_audio);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
269 return 0;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
270 }
12213
064cb156d2b7 10l to me: writing outside allocated memory
rtognimp
parents: 11004
diff changeset
271 sh_audio->wf = w = (WAVEFORMATEX*)malloc(l > sizeof(WAVEFORMATEX) ? l : sizeof(WAVEFORMATEX));
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
272 w->wFormatTag = sh_audio->format = stream_read_word_le(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
273 w->nChannels = sh_audio->channels = stream_read_word_le(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
274 w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
275 w->nAvgBytesPerSec = stream_read_dword_le(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
276 w->nBlockAlign = stream_read_word_le(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
277 w->wBitsPerSample = sh_audio->samplesize = stream_read_word_le(s);
9616
a6bbab17a87f 10l cbSize not inited for l=16.\n Could give problem in print_wave_header
rtognimp
parents: 9596
diff changeset
278 w->cbSize = 0;
16162
b5c2254d13f8 set i_bps in demux_audio for WAV and MP3 to avoid division by zero before
reimar
parents: 15215
diff changeset
279 sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
9596
7b4a17c415fb Same behaviour as old code for short headers
rtognimp
parents: 9591
diff changeset
280 l -= 16;
7b4a17c415fb Same behaviour as old code for short headers
rtognimp
parents: 9591
diff changeset
281 if (l > 0) {
9591
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
282 w->cbSize = stream_read_word_le(s);
9596
7b4a17c415fb Same behaviour as old code for short headers
rtognimp
parents: 9591
diff changeset
283 l -= 2;
9655
8809e2be5cea Warning fix, patch by Dominik Mierzejewsky
rtognimp
parents: 9616
diff changeset
284 if (w->cbSize > 0) {
9591
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
285 if (l < w->cbSize) {
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
286 mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] truncated extradata (%d < %d)\n",
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
287 l,w->cbSize);
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
288 stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),l);
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
289 l = 0;
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
290 } else {
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
291 stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),w->cbSize);
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
292 l -= w->cbSize;
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
293 }
9655
8809e2be5cea Warning fix, patch by Dominik Mierzejewsky
rtognimp
parents: 9616
diff changeset
294 }
9596
7b4a17c415fb Same behaviour as old code for short headers
rtognimp
parents: 9591
diff changeset
295 }
9591
3904b95fce8f Read extradata for wav files, based on patch by <dimakar(at)yahoo.com>. Required for truespeech files.
rtognimp
parents: 8359
diff changeset
296
7847
f1e6a68a42f1 dump wav header
arpi
parents: 6763
diff changeset
297 if(verbose>0) print_wave_header(w);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
298 if(l)
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
299 stream_skip(s,l);
4720
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
300 do
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
301 {
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
302 chunk_type = stream_read_fourcc(demuxer->stream);
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
303 chunk_size = stream_read_dword_le(demuxer->stream);
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
304 if (chunk_type != mmioFOURCC('d', 'a', 't', 'a'))
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
305 stream_skip(demuxer->stream, chunk_size);
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
306 } while (chunk_type != mmioFOURCC('d', 'a', 't', 'a'));
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
307 demuxer->movi_start = stream_tell(s);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
308 demuxer->movi_end = s->end_pos;
7847
f1e6a68a42f1 dump wav header
arpi
parents: 6763
diff changeset
309 // printf("wav: %X .. %X\n",(int)demuxer->movi_start,(int)demuxer->movi_end);
13006
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
310 // Check if it contains dts audio
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
311 if((w->wFormatTag == 0x01) && (w->nChannels == 2) && (w->nSamplesPerSec == 44100)) {
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
312 unsigned char buf[16384]; // vlc uses 16384*4 (4 dts frames)
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
313 unsigned int i;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
314 stream_read(s, buf, sizeof(buf));
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
315 for (i = 0; i < sizeof(buf); i += 2) {
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
316 // DTS, 14 bit, LE
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
317 if((buf[i] == 0xff) && (buf[i+1] == 0x1f) && (buf[i+2] == 0x00) &&
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
318 (buf[i+3] == 0xe8) && ((buf[i+4] & 0xfe) == 0xf0) && (buf[i+5] == 0x07)) {
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
319 sh_audio->format = 0x2001;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
320 mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 14 bit, LE\n");
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
321 break;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
322 }
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
323 // DTS, 14 bit, BE
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
324 if((buf[i] == 0x1f) && (buf[i+1] == 0xff) && (buf[i+2] == 0xe8) &&
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
325 (buf[i+3] == 0x00) && (buf[i+4] == 0x07) && ((buf[i+5] & 0xfe) == 0xf0)) {
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
326 sh_audio->format = 0x2001;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
327 mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 14 bit, BE\n");
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
328 break;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
329 }
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
330 // DTS, 16 bit, BE
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
331 if((buf[i] == 0x7f) && (buf[i+1] == 0xfe) && (buf[i+2] == 0x80) &&
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
332 (buf[i+3] == 0x01)) {
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
333 sh_audio->format = 0x2001;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
334 mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 16 bit, BE\n");
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
335 break;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
336 }
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
337 // DTS, 16 bit, LE
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
338 if((buf[i] == 0xfe) && (buf[i+1] == 0x7f) && (buf[i+2] == 0x01) &&
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
339 (buf[i+3] == 0x80)) {
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
340 sh_audio->format = 0x2001;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
341 mp_msg(MSGT_DEMUX,MSGL_V,"[demux_audio] DTS audio in wav, 16 bit, LE\n");
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
342 break;
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
343 }
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
344 }
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
345 if (sh_audio->format == 0x2001)
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
346 mp_msg(MSGT_DEMUX,MSGL_DBG2,"[demux_audio] DTS sync offset = %u\n", i);
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
347
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
348 }
8639d064d3a1 DTS support via lavc and libdts
rtognimp
parents: 12213
diff changeset
349 stream_seek(s,demuxer->movi_start);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
350 } break;
11004
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
351 case fLaC:
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
352 sh_audio->format = mmioFOURCC('f', 'L', 'a', 'C');
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
353 demuxer->movi_start = stream_tell(s);
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
354 demuxer->movi_end = s->end_pos;
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
355 break;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
356 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
357
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
358 priv = (da_priv_t*)malloc(sizeof(da_priv_t));
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
359 priv->frmt = frmt;
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
360 priv->last_pts = -1;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
361 demuxer->priv = priv;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
362 demuxer->audio->id = 0;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
363 demuxer->audio->sh = sh_audio;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
364 sh_audio->ds = demuxer->audio;
10244
a084597140af don't set audio pts to infinity after seeking in mp3 files :)
rfelker
parents: 9655
diff changeset
365 sh_audio->samplerate = sh_audio->audio.dwRate;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
366
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
367 if(stream_tell(s) != demuxer->movi_start)
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
368 {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
369 mp_msg(MSGT_DEMUX, MSGL_V, "demux_audio: seeking from 0x%X to start pos 0x%X\n",
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
370 (int)stream_tell(s), (int)demuxer->movi_start);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
371 stream_seek(s,demuxer->movi_start);
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
372 if (stream_tell(s) != demuxer->movi_start) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
373 mp_msg(MSGT_DEMUX, MSGL_V, "demux_audio: seeking failed, now at 0x%X!\n",
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
374 (int)stream_tell(s));
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
375 if (next_frame_pos) {
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
376 mp_msg(MSGT_DEMUX, MSGL_V, "demux_audio: seeking to 0x%X instead\n",
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
377 (int)next_frame_pos);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
378 stream_seek(s, next_frame_pos);
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
379 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
380 }
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
381 }
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
382
13503
f8347c521898 better, tuneable (via #define) MP3 detection, limit demux_audio to scanning
reimar
parents: 13357
diff changeset
383 mp_msg(MSGT_DEMUX,MSGL_V,"demux_audio: audio data 0x%X - 0x%X \n",(int)demuxer->movi_start,(int)demuxer->movi_end);
4712
9262f4dc332f mp3 position fixed
arpi
parents: 4700
diff changeset
384
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
385 return DEMUXER_TYPE_AUDIO;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
386 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
387
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
388
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
389 static int demux_audio_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) {
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
390 int l;
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
391 demux_packet_t* dp;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
392 sh_audio_t* sh_audio;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
393 demuxer_t* demux;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
394 da_priv_t* priv;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
395 stream_t* s;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
396 #ifdef MP_DEBUG
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
397 assert(ds != NULL);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
398 assert(ds->sh != NULL);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
399 assert(ds->demuxer != NULL);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
400 #endif
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
401 sh_audio = ds->sh;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
402 demux = ds->demuxer;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
403 priv = demux->priv;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
404 s = demux->stream;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
405
16438
871e94131840 Ignore movi_end (except on error) to allow playing growing files.
reimar
parents: 16346
diff changeset
406 if(s->eof)
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
407 return 0;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
408
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
409 switch(priv->frmt) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
410 case MP3 :
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
411 while(1) {
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
412 uint8_t hdr[4];
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
413 stream_read(s,hdr,4);
16438
871e94131840 Ignore movi_end (except on error) to allow playing growing files.
reimar
parents: 16346
diff changeset
414 if (s->eof)
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
415 return 0;
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
416 l = mp_decode_mp3_header(hdr);
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
417 if(l < 0) {
16438
871e94131840 Ignore movi_end (except on error) to allow playing growing files.
reimar
parents: 16346
diff changeset
418 if (demux->movi_end && stream_tell(s) >= demux->movi_end)
871e94131840 Ignore movi_end (except on error) to allow playing growing files.
reimar
parents: 16346
diff changeset
419 return 0; // might be ID3 tag, i.e. EOF
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
420 stream_skip(s,-3);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
421 } else {
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
422 dp = new_demux_packet(l);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
423 memcpy(dp->buffer,hdr,4);
16438
871e94131840 Ignore movi_end (except on error) to allow playing growing files.
reimar
parents: 16346
diff changeset
424 if (stream_read(s,dp->buffer + 4,l-4) != l-4)
871e94131840 Ignore movi_end (except on error) to allow playing growing files.
reimar
parents: 16346
diff changeset
425 return 0;
15199
980910eb6f0c assign correct tag, dwScale and dwBlockAlign to mpeg audio; optionally assign layer and samples_per_frame when parsing mpa header
nicodvb
parents: 14910
diff changeset
426 priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + sh_audio->audio.dwScale/(float)sh_audio->samplerate;
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
427 break;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
428 }
4700
30131db5dfbb Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents: 4694
diff changeset
429 } break;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
430 case WAV : {
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
431 l = sh_audio->wf->nAvgBytesPerSec;
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
432 dp = new_demux_packet(l);
10891
65ed62e138fa Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents: 10882
diff changeset
433 l = stream_read(s,dp->buffer,l);
14910
07be3bc42d47 100l to reimar.. sh_audio->samplerate and sh_audio->i_bps are not the same
rfelker
parents: 14608
diff changeset
434 priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + l/(float)sh_audio->i_bps;
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
435 break;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
436 }
11004
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
437 case fLaC: {
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
438 l = 65535;
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
439 dp = new_demux_packet(l);
11004
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
440 l = stream_read(s,dp->buffer,l);
14910
07be3bc42d47 100l to reimar.. sh_audio->samplerate and sh_audio->i_bps are not the same
rfelker
parents: 14608
diff changeset
441 priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + l/(float)sh_audio->i_bps;
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
442 break;
11004
d48eccbbb984 FLAC decoding support via imported libmpflac.
lumag
parents: 10891
diff changeset
443 }
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
444 default:
4720
10ad330c1733 fixed WAV demuxer so that it skips to the actual start of the audio data
melanson
parents: 4717
diff changeset
445 printf("Audio demuxer : unknown format %d\n",priv->frmt);
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
446 return 0;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
447 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
448
14608
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
449 resize_demux_packet(dp, l);
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
450 ds->pts = priv->last_pts - (ds_tell_pts(demux->audio) -
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
451 sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
452 ds_add_packet(ds, dp);
9595f1de1393 Fix possible hang when playing broken MP3 from linear stream and remove
reimar
parents: 13503
diff changeset
453 return 1;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
454 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
455
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
456 static void high_res_mp3_seek(demuxer_t *demuxer,float time) {
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
457 uint8_t hdr[4];
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
458 int len,nf;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
459 da_priv_t* priv = demuxer->priv;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
460 sh_audio_t* sh = (sh_audio_t*)demuxer->audio->sh;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
461
15199
980910eb6f0c assign correct tag, dwScale and dwBlockAlign to mpeg audio; optionally assign layer and samples_per_frame when parsing mpa header
nicodvb
parents: 14910
diff changeset
462 nf = time*sh->samplerate/sh->audio.dwScale;
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
463 while(nf > 0) {
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
464 stream_read(demuxer->stream,hdr,4);
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
465 len = mp_decode_mp3_header(hdr);
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
466 if(len < 0) {
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
467 stream_skip(demuxer->stream,-3);
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
468 continue;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
469 }
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
470 stream_skip(demuxer->stream,len-4);
15199
980910eb6f0c assign correct tag, dwScale and dwBlockAlign to mpeg audio; optionally assign layer and samples_per_frame when parsing mpa header
nicodvb
parents: 14910
diff changeset
471 priv->last_pts += sh->audio.dwScale/(float)sh->samplerate;
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
472 nf--;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
473 }
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
474 }
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
475
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
476 static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
477 sh_audio_t* sh_audio;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
478 stream_t* s;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
479 int base,pos;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
480 float len;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
481 da_priv_t* priv;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
482
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
483 if(!(sh_audio = demuxer->audio->sh))
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
484 return;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
485 s = demuxer->stream;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
486 priv = demuxer->priv;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
487
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
488 if(priv->frmt == MP3 && hr_mp3_seek && !(flags & 2)) {
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
489 len = (flags & 1) ? rel_seek_secs - priv->last_pts : rel_seek_secs;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
490 if(len < 0) {
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
491 stream_seek(s,demuxer->movi_start);
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
492 len = priv->last_pts + len;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
493 priv->last_pts = 0;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
494 }
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
495 if(len > 0)
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
496 high_res_mp3_seek(demuxer,len);
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 7867
diff changeset
497 sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
498 return;
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
499 }
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
500
5796
7a4b18b787c0 Fix % seeking
albeu
parents: 4764
diff changeset
501 base = flags&1 ? demuxer->movi_start : stream_tell(s);
7a4b18b787c0 Fix % seeking
albeu
parents: 4764
diff changeset
502 if(flags&2)
7a4b18b787c0 Fix % seeking
albeu
parents: 4764
diff changeset
503 pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs);
7a4b18b787c0 Fix % seeking
albeu
parents: 4764
diff changeset
504 else
7a4b18b787c0 Fix % seeking
albeu
parents: 4764
diff changeset
505 pos = base + (rel_seek_secs*sh_audio->i_bps);
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
506
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
507 if(demuxer->movi_end && pos >= demuxer->movi_end) {
8359
a93461f7e5ef fixed mp3 seeking near end of file
arpi
parents: 8123
diff changeset
508 pos = demuxer->movi_end;
a93461f7e5ef fixed mp3 seeking near end of file
arpi
parents: 8123
diff changeset
509 //sh_audio->delay = (stream_tell(s) - demuxer->movi_start)/(float)sh_audio->i_bps;
a93461f7e5ef fixed mp3 seeking near end of file
arpi
parents: 8123
diff changeset
510 //return;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
511 } else if(pos < demuxer->movi_start)
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
512 pos = demuxer->movi_start;
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
513
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
514 priv->last_pts = (pos-demuxer->movi_start)/(float)sh_audio->i_bps;
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 7867
diff changeset
515 sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
516
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
517 switch(priv->frmt) {
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
518 case WAV:
16818
67ce689b5764 Fix seeking in wav files: align relative to start of data, not start of file
reimar
parents: 16438
diff changeset
519 pos -= (pos - demuxer->movi_start) %
67ce689b5764 Fix seeking in wav files: align relative to start of data, not start of file
reimar
parents: 16438
diff changeset
520 (sh_audio->wf->nBlockAlign ? sh_audio->wf->nBlockAlign :
67ce689b5764 Fix seeking in wav files: align relative to start of data, not start of file
reimar
parents: 16438
diff changeset
521 (sh_audio->channels * sh_audio->samplesize));
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
522 // We need to decrease the pts by one step to make it the "last one"
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
523 priv->last_pts -= sh_audio->wf->nAvgBytesPerSec/(float)sh_audio->i_bps;
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
524 break;
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
525 }
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
526
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
527 stream_seek(s,pos);
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents:
diff changeset
528 }
4764
9579496a91db Added pts for mp3 and wav. And perfect seeking for mp3, unless flags & 2
albeu
parents: 4720
diff changeset
529
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
530 static void demux_close_audio(demuxer_t* demuxer) {
5812
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
531 da_priv_t* priv = demuxer->priv;
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
532
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
533 if(!priv)
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
534 return;
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
535 free(priv);
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
536 }
f9d23c2aa6b7 Uninit added
albeu
parents: 5796
diff changeset
537
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
538 static int demux_audio_control(demuxer_t *demuxer,int cmd, void *arg){
10882
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
539 sh_audio_t *sh_audio=demuxer->audio->sh;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
540 int audio_length = demuxer->movi_end / sh_audio->i_bps;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
541 da_priv_t* priv = demuxer->priv;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
542
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
543 switch(cmd) {
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
544 case DEMUXER_CTRL_GET_TIME_LENGTH:
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
545 if (audio_length<=0) return DEMUXER_CTRL_DONTKNOW;
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16175
diff changeset
546 *((double *)arg)=(double)audio_length;
10882
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
547 return DEMUXER_CTRL_GUESS;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
548
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
549 case DEMUXER_CTRL_GET_PERCENT_POS:
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
550 if (audio_length<=0)
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
551 return DEMUXER_CTRL_DONTKNOW;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
552 *((int *)arg)=(int)( (priv->last_pts*100) / audio_length);
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
553 return DEMUXER_CTRL_OK;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
554
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
555 default:
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
556 return DEMUXER_CTRL_NOTIMPL;
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
557 }
e46e5a6c53b8 get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents: 10244
diff changeset
558 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
559
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
560
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
561 demuxer_desc_t demuxer_desc_audio = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
562 "Audio demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
563 "audio",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
564 "Audio file",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
565 "?",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
566 "Audio only files",
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
567 DEMUXER_TYPE_AUDIO,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
568 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
569 demux_audio_open,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
570 demux_audio_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
571 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
572 demux_close_audio,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
573 demux_audio_seek,
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
574 demux_audio_control
6b86089c2edd Demuxer modularization
rtognimp
parents: 16162
diff changeset
575 };