annotate libmpdemux/demux_viv.c @ 29418:7acdcd4d512a

move truehd to correct section
author compn
date Thu, 30 Jul 2009 12:08:20 +0000
parents 4a1c217a844b
children 0f5751eb7126
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: 27282
diff changeset
1 /*
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
2 * VIVO file parser
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
3 * copyright (c) 2001 A'rpi
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
4 * VIVO text header parser and audio support by alex
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
5 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
6 * This file is part of MPlayer.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
7 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
8 * MPlayer is free software; you can redistribute it and/or modify
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
9 * 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: 27282
diff changeset
10 * the Free Software Foundation; either version 2 of the License, or
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
11 * (at your option) any later version.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
12 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
13 * MPlayer is distributed in the hope that it will be useful,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
16 * GNU General Public License for more details.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
17 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
18 * 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: 27282
diff changeset
19 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 27282
diff changeset
21 */
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
22
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
23 #include <stdio.h>
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
24 #include <stdlib.h>
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
25 #include <unistd.h>
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
26 #include <string.h> /* strtok */
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
27
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
28 #include "config.h"
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
29 #include "mp_msg.h"
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
30 #include "help_mp.h"
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
31
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 22283
diff changeset
32 #include "stream/stream.h"
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
33 #include "demuxer.h"
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
34 #include "stheader.h"
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
35
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
36 /* parameters ! */
3503
7aed2edd99ab -vivo version option added
alex
parents: 3502
diff changeset
37 int vivo_param_version = -1;
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
38 char *vivo_param_acodec = NULL;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
39 int vivo_param_abitrate = -1;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
40 int vivo_param_samplerate = -1;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
41 int vivo_param_bytesperblock = -1;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
42 int vivo_param_width = -1;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
43 int vivo_param_height = -1;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
44 int vivo_param_vformat = -1;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
45
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
46 /* VIVO audio standards from vivog723.acm:
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
47
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
48 G.723:
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
49 FormatTag = 0x111
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
50 Channels = 1 - mono
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
51 SamplesPerSec = 8000 - 8khz
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
52 AvgBytesPerSec = 800
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
53 BlockAlign (bytes per block) = 24
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
54 BitsPerSample = 8
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
55
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
56 Siren:
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
57 FormatTag = 0x112
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
58 Channels = 1 - mono
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
59 SamplesPerSec = 16000 - 16khz
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
60 AvgBytesPerSec = 2000
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
61 BlockAlign (bytes per block) = 40
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
62 BitsPerSample = 8
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
63 */
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
64
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
65 //enum { VIVO_AUDIO_G723, VIVO_AUDIO_SIREN };
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
66
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
67 #define VIVO_AUDIO_G723 1
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
68 #define VIVO_AUDIO_SIREN 2
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
69
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
70 typedef struct {
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
71 /* generic */
3113
c0e6a39d2ab7 changed to generate fourcc's like: viv<version> -> viv1,viv2
alex
parents: 3069
diff changeset
72 char version;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
73 int supported;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
74 /* info */
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
75 char *title;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
76 char *author;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
77 char *copyright;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
78 char *producer;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
79 /* video */
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
80 float fps;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
81 int width;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
82 int height;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
83 int disp_width;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
84 int disp_height;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
85 /* audio */
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
86 int audio_codec;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
87 int audio_bitrate;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
88 int audio_samplerate;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
89 int audio_bytesperblock;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
90 } vivo_priv_t;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
91
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
92 /* parse all possible extra headers */
22283
bc9e95184521 cosmetics: Fix some common typos, sepErate --> sepArate, deciSSion --> deciSion.
diego
parents: 21421
diff changeset
93 /* (audio headers are separate - mostly with recordtype=3 or 4) */
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
94 #define TEXTPARSE_ALL 1
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
95
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
96 static void vivo_parse_text_header(demuxer_t *demux, int header_len)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
97 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
98 vivo_priv_t* priv = demux->priv;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
99 char *buf;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
100 int i;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
101 char *token;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
102 char *opt, *param;
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
103 int parser_in_audio_block = 0;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
104
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
105 if (!demux->priv)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
106 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
107 priv = malloc(sizeof(vivo_priv_t));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
108 memset(priv, 0, sizeof(vivo_priv_t));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
109 demux->priv = priv;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
110 priv->supported = 0;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
111 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
112
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
113 buf = malloc(header_len);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
114 opt = malloc(header_len);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
115 param = malloc(header_len);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
116 stream_read(demux->stream, buf, header_len);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
117 i=0;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
118 while(i<header_len && buf[i]==0x0D && buf[i+1]==0x0A) i+=2; // skip empty lines
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
119
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
120 token = strtok(buf, (char *)&("\x0d\x0a"));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
121 while (token && (header_len>2))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
122 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
123 header_len -= strlen(token)+2;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
124 if (sscanf(token, "%[^:]:%[^\n]", opt, param) != 2)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
125 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17355
diff changeset
126 mp_msg(MSGT_DEMUX, MSGL_V, "viv_text_header_parser: bad line: '%s' at ~%#"PRIx64"\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17355
diff changeset
127 token, (int64_t)stream_tell(demux->stream));
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
128 break;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
129 }
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
130 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token: '%s' (%d bytes/%d bytes left)\n",
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
131 token, strlen(token), header_len);
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
132 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "token => o: '%s', p: '%s'\n",
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
133 opt, param);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
134
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
135 /* checking versions: only v1 or v2 is suitable (or known?:) */
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
136 if (!strcmp(opt, "Version"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
137 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
138 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Version: %s\n", param);
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
139 if (!strncmp(param, "Vivo/1", 6) || !strncmp(param, "Vivo/2", 6))
3113
c0e6a39d2ab7 changed to generate fourcc's like: viv<version> -> viv1,viv2
alex
parents: 3069
diff changeset
140 {
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
141 priv->supported = 1;
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
142 /* save major version for fourcc */
3113
c0e6a39d2ab7 changed to generate fourcc's like: viv<version> -> viv1,viv2
alex
parents: 3069
diff changeset
143 priv->version = param[5];
c0e6a39d2ab7 changed to generate fourcc's like: viv<version> -> viv1,viv2
alex
parents: 3069
diff changeset
144 }
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
145 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
146
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
147 /* video specific */
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
148 if (!strcmp(opt, "FPS"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
149 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
150 mp_msg(MSGT_DEMUX, MSGL_DBG2, "FPS: %f\n", atof(param));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
151 priv->fps = atof(param);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
152 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
153 if (!strcmp(opt, "Width"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
154 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
155 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Width: %d\n", atoi(param));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
156 priv->width = atoi(param);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
157 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
158 if (!strcmp(opt, "Height"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
159 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
160 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Height: %d\n", atoi(param));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
161 priv->height = atoi(param);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
162 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
163 if (!strcmp(opt, "DisplayWidth"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
164 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
165 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Display Width: %d\n", atoi(param));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
166 priv->disp_width = atoi(param);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
167 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
168 if (!strcmp(opt, "DisplayHeight"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
169 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
170 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Display Height: %d\n", atoi(param));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
171 priv->disp_height = atoi(param);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
172 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
173
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
174 /* audio specific */
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
175 if (!strcmp(opt, "RecordType"))
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
176 {
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
177 /* no audio recordblock by Vivo/1.00, 3 and 4 by Vivo/2.00 */
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
178 if ((atoi(param) == 3) || (atoi(param) == 4))
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
179 parser_in_audio_block = 1;
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
180 else
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
181 parser_in_audio_block = 0;
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
182 }
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
183 if (!strcmp(opt, "NominalBitrate"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
184 {
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
185 priv->audio_bitrate = atoi(param);
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
186 if (priv->audio_bitrate == 2000)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
187 priv->audio_codec = VIVO_AUDIO_SIREN;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
188 if (priv->audio_bitrate == 800)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
189 priv->audio_codec = VIVO_AUDIO_G723;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
190 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
191 if (!strcmp(opt, "SamplingFrequency"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
192 {
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
193 priv->audio_samplerate = atoi(param);
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
194 if (priv->audio_samplerate == 16000)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
195 priv->audio_codec = VIVO_AUDIO_SIREN;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
196 if (priv->audio_samplerate == 8000)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
197 priv->audio_codec = VIVO_AUDIO_G723;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
198 }
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
199 if (!strcmp(opt, "Length") && (parser_in_audio_block == 1))
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
200 {
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
201 priv->audio_bytesperblock = atoi(param); /* 24 or 40 kbps */
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
202 if (priv->audio_bytesperblock == 40)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
203 priv->audio_codec = VIVO_AUDIO_SIREN;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
204 if (priv->audio_bytesperblock == 24)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
205 priv->audio_codec = VIVO_AUDIO_G723;
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
206 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
207
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
208 /* only for displaying some informations about movie*/
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
209 if (!strcmp(opt, "Title"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
210 {
29288
4a1c217a844b In all demux_info_add calls change "name" to "title".
reimar
parents: 29263
diff changeset
211 demux_info_add(demux, "title", param);
3612
a1522fa7728a x = malloc(strlen(s) + c) ... strcpy(x, s)
pl
parents: 3526
diff changeset
212 priv->title = strdup(param);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
213 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
214 if (!strcmp(opt, "Author"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
215 {
3068
572a94255d1e added support for demux_info
alex
parents: 2928
diff changeset
216 demux_info_add(demux, "author", param);
3612
a1522fa7728a x = malloc(strlen(s) + c) ... strcpy(x, s)
pl
parents: 3526
diff changeset
217 priv->author = strdup(param);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
218 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
219 if (!strcmp(opt, "Copyright"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
220 {
3068
572a94255d1e added support for demux_info
alex
parents: 2928
diff changeset
221 demux_info_add(demux, "copyright", param);
3612
a1522fa7728a x = malloc(strlen(s) + c) ... strcpy(x, s)
pl
parents: 3526
diff changeset
222 priv->copyright = strdup(param);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
223 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
224 if (!strcmp(opt, "Producer"))
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
225 {
3069
e6bbc5e6a054 wrote a very annoying bug
alex
parents: 3068
diff changeset
226 demux_info_add(demux, "encoder", param);
3612
a1522fa7728a x = malloc(strlen(s) + c) ... strcpy(x, s)
pl
parents: 3526
diff changeset
227 priv->producer = strdup(param);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
228 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
229
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
230 /* get next token */
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
231 token = strtok(NULL, (char *)&("\x0d\x0a"));
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
232 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
233
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
234 if (buf)
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
235 free(buf);
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
236 if (opt)
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
237 free(opt);
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
238 if (param)
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
239 free(param);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
240 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
241
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
242 static int vivo_check_file(demuxer_t* demuxer){
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
243 int i=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
244 int len;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
245 int c;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
246 unsigned char buf[2048+256];
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
247 vivo_priv_t* priv;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
248 int orig_pos = stream_tell(demuxer->stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
249
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
250 mp_msg(MSGT_DEMUX,MSGL_V,"Checking for VIVO\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
251
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
252 c=stream_read_char(demuxer->stream);
2792
ad82a618b371 checking for EOF
alex
parents: 2788
diff changeset
253 if(c==-256) return 0;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
254 len=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
255 while((c=stream_read_char(demuxer->stream))>=0x80){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
256 len+=0x80*(c-0x80);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
257 if(len>1024) return 0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
258 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
259 len+=c;
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 4407
diff changeset
260 mp_msg(MSGT_DEMUX,MSGL_V,"header block 1 size: %d\n",len);
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
261 //stream_skip(demuxer->stream,len);
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
262
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
263 priv=malloc(sizeof(vivo_priv_t));
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
264 memset(priv,0,sizeof(vivo_priv_t));
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
265 demuxer->priv=priv;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
266
2805
478202620831 disabled vivo2 scaling (decodes some vivo2 files)
alex
parents: 2792
diff changeset
267 #if 0
2785
c70b93e738e1 vivo_check_file uses also new textparser
alex
parents: 2784
diff changeset
268 vivo_parse_text_header(demuxer, len);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
269 if (priv->supported == 0)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
270 return 0;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
271 #else
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
272 /* this is enought for check (for now) */
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
273 stream_read(demuxer->stream,buf,len);
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
274 buf[len]=0;
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
275 // printf("VIVO header: '%s'\n",buf);
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
276
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
277 // parse header:
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
278 i=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
279 while(i<len && buf[i]==0x0D && buf[i+1]==0x0A) i+=2; // skip empty lines
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
280 if(strncmp(buf+i,"Version:Vivo/",13)) return 0; // bad version/type!
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
281 #endif
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
282
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
283 #if 0
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
284 c=stream_read_char(demuxer->stream);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
285 if(c) return 0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
286 len2=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
287 while((c=stream_read_char(demuxer->stream))>=0x80){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
288 len2+=0x80*(c-0x80);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
289 if(len+len2>2048) return 0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
290 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
291 len2+=c;
6139
3898967fcc96 some more output cosmetics, especially for vivo and mov demuxers
arpi
parents: 4407
diff changeset
292 mp_msg(MSGT_DEMUX,MSGL_V,"header block 2 size: %d\n",len2);
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
293 stream_skip(demuxer->stream,len2);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
294 // stream_read(demuxer->stream,buf+len,len2);
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
295 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
296
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
297 // c=stream_read_char(demuxer->stream);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
298 // printf("first packet: %02X\n",c);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
299
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
300 stream_seek(demuxer->stream, orig_pos);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
301
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
302 return DEMUXER_TYPE_VIVO;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
303 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
304
3733
8dcc18663e60 warning fix
pl
parents: 3612
diff changeset
305 static int audio_pos=0;
8dcc18663e60 warning fix
pl
parents: 3612
diff changeset
306 static int audio_rate=0;
3526
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
307
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
308 // return value:
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
309 // 0 = EOF or no stream found
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
310 // 1 = successfully read a packet
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
311 static int demux_vivo_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
312 demux_stream_t *ds=NULL;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
313 int c;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
314 int len=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
315 int seq;
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
316 int prefix=0;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
317 demux->filepos=stream_tell(demux->stream);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
318
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
319 c=stream_read_char(demux->stream);
2792
ad82a618b371 checking for EOF
alex
parents: 2788
diff changeset
320 if (c == -256) /* EOF */
ad82a618b371 checking for EOF
alex
parents: 2788
diff changeset
321 return 0;
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
322 // printf("c=%x,%02X\n",c,c&0xf0);
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
323 if (c == 0x82)
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
324 {
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
325 /* ok, this works, but pts calculating from header is required! */
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
326 #warning "Calculate PTS from picture header!"
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
327 prefix = 1;
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
328 c = stream_read_char(demux->stream);
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
329 mp_msg(MSGT_DEMUX, MSGL_V, "packet 0x82(pos=%u) chunk=%x\n",
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 6139
diff changeset
330 (int)stream_tell(demux->stream), c);
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
331 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
332 switch(c&0xF0){
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
333 case 0x00: // header - skip it!
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
334 {
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
335 len=stream_read_char(demux->stream);
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
336 if(len>=0x80) len=0x80*(len-0x80)+stream_read_char(demux->stream);
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
337 mp_msg(MSGT_DEMUX, MSGL_V, "vivo extra header: %d bytes\n",len);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
338 #ifdef TEXTPARSE_ALL
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
339 {
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
340 int pos;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
341 /* also try to parse all headers */
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
342 pos = stream_tell(demux->stream);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
343 vivo_parse_text_header(demux, len);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
344 stream_seek(demux->stream, pos);
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
345 }
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
346 #endif
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
347 break;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
348 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
349 case 0x10: // video packet
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
350 if (prefix == 1)
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
351 len = stream_read_char(demux->stream);
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
352 else
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
353 len=128;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
354 ds=demux->video;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
355 break;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
356 case 0x20: // video packet
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
357 len=stream_read_char(demux->stream);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
358 ds=demux->video;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
359 break;
3068
572a94255d1e added support for demux_info
alex
parents: 2928
diff changeset
360 case 0x30: // audio packet
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
361 if (prefix == 1)
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
362 len = stream_read_char(demux->stream);
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
363 else
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
364 len=40; /* 40kbps */
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
365 ds=demux->audio;
3526
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
366 audio_pos+=len;
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
367 break;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
368 case 0x40: // audio packet
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
369 if (prefix == 1)
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
370 len = stream_read_char(demux->stream);
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
371 else
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
372 len=24; /* 24kbps */
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
373 ds=demux->audio;
3526
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
374 audio_pos+=len;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
375 break;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
376 default:
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17355
diff changeset
377 mp_msg(MSGT_DEMUX,MSGL_WARN,"VIVO - unknown ID found: %02X at pos %"PRIu64" contact author!\n",
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17355
diff changeset
378 c, (int64_t)stream_tell(demux->stream));
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
379 return 0;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
380 }
3245
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
381
1e2a87b7cae8 added support for packet 0x82 (from vivodump.c by arpi)
alex
parents: 3113
diff changeset
382 // printf("chunk=%x, len=%d\n", c, len);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
383
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
384 if(!ds || ds->id<-1){
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
385 if(len) stream_skip(demux->stream,len);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
386 return 1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
387 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
388
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
389 seq=c&0x0F;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
390
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
391 if(ds->asf_packet){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
392 if(ds->asf_seq!=seq){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
393 // closed segment, finalize packet:
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
394 ds_add_packet(ds,ds->asf_packet);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
395 ds->asf_packet=NULL;
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
396 // printf("packet!\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
397 } else {
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
398 // append data to it!
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
399 demux_packet_t* dp=ds->asf_packet;
27282
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27269
diff changeset
400 if(dp->len + len + MP_INPUT_BUFFER_PADDING_SIZE < 0)
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17366
diff changeset
401 return 0;
27282
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27269
diff changeset
402 dp->buffer=realloc(dp->buffer,dp->len+len+MP_INPUT_BUFFER_PADDING_SIZE);
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27269
diff changeset
403 memset(dp->buffer+dp->len+len, 0, MP_INPUT_BUFFER_PADDING_SIZE);
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
404 //memcpy(dp->buffer+dp->len,data,len);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
405 stream_read(demux->stream,dp->buffer+dp->len,len);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
406 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
407 dp->len+=len;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
408 // we are ready now.
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
409 if((c&0xF0)==0x20) --ds->asf_seq; // hack!
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
410 return 1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
411 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
412 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
413 // create new packet:
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
414 { demux_packet_t* dp;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
415 dp=new_demux_packet(len);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
416 //memcpy(dp->buffer,data,len);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
417 stream_read(demux->stream,dp->buffer,len);
3526
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
418 dp->pts=audio_rate?((float)audio_pos/(float)audio_rate):0;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
419 // dp->flags=keyframe;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
420 // if(ds==demux->video) printf("ASF time: %8d dur: %5d \n",time,dur);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
421 dp->pos=demux->filepos;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
422 ds->asf_packet=dp;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
423 ds->asf_seq=seq;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
424 // we are ready now.
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
425 return 1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
426 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
427
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
428 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
429
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
430 static const short h263_format[8][2] = {
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
431 { 0, 0 },
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
432 { 128, 96 },
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
433 { 176, 144 },
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
434 { 352, 288 },
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
435 { 704, 576 },
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
436 { 1408, 1152 },
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
437 { 320, 240 } // ??????? or 240x180 (found in vivo2) ?
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
438 };
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
439
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
440 static unsigned char* buffer;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
441 static int bufptr=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
442 static int bitcnt=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
443 static unsigned char buf=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
444 static int format, width, height;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
445
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
446 static unsigned int x_get_bits(int n){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
447 unsigned int x=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
448 while(n-->0){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
449 if(!bitcnt){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
450 // fill buff
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
451 buf=buffer[bufptr++];
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
452 bitcnt=8;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
453 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
454 //x=(x<<1)|(buf&1);buf>>=1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
455 x=(x<<1)|(buf>>7);buf<<=1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
456 --bitcnt;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
457 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
458 return x;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
459 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
460
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
461 #define get_bits(xxx,n) x_get_bits(n)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
462 #define get_bits1(xxx) x_get_bits(1)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
463 #define skip_bits(xxx,n) x_get_bits(n)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
464 #define skip_bits1(xxx) x_get_bits(1)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
465
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
466 /* most is hardcoded. should extend to handle all h263 streams */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
467 static int h263_decode_picture_header(unsigned char *b_ptr)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
468 {
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
469 // int i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
470
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
471 // for(i=0;i<16;i++) printf(" %02X",b_ptr[i]); printf("\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
472
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
473 buffer=b_ptr;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
474 bufptr=bitcnt=buf=0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
475
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
476 /* picture header */
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
477 if (get_bits(&s->gb, 22) != 0x20){
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
478 mp_msg(MSGT_DEMUX, MSGL_FATAL, "bad picture header\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
479 return -1;
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
480 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
481 skip_bits(&s->gb, 8); /* picture timestamp */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
482
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
483 if (get_bits1(&s->gb) != 1){
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
484 mp_msg(MSGT_DEMUX, MSGL_FATAL, "bad marker\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
485 return -1; /* marker */
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
486 }
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
487 if (get_bits1(&s->gb) != 0){
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
488 mp_msg(MSGT_DEMUX, MSGL_FATAL, "bad h263 id\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
489 return -1; /* h263 id */
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
490 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
491 skip_bits1(&s->gb); /* split screen off */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
492 skip_bits1(&s->gb); /* camera off */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
493 skip_bits1(&s->gb); /* freeze picture release off */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
494
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
495 format = get_bits(&s->gb, 3);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
496
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
497 if (format != 7) {
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
498 mp_msg(MSGT_DEMUX, MSGL_V, "h263_plus = 0 format = %d\n", format);
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
499 /* H.263v1 */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
500 width = h263_format[format][0];
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
501 height = h263_format[format][1];
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
502 mp_msg(MSGT_DEMUX, MSGL_V, "%d x %d\n", width, height);
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
503 // if (!width) return -1;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
504
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
505 mp_msg(MSGT_DEMUX, MSGL_V, "pict_type=%d\n", get_bits1(&s->gb));
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
506 mp_msg(MSGT_DEMUX, MSGL_V, "unrestricted_mv=%d\n", get_bits1(&s->gb));
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
507 #if 1
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
508 mp_msg(MSGT_DEMUX, MSGL_V, "SAC: %d\n", get_bits1(&s->gb));
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
509 mp_msg(MSGT_DEMUX, MSGL_V, "advanced prediction mode: %d\n", get_bits1(&s->gb));
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
510 mp_msg(MSGT_DEMUX, MSGL_V, "PB frame: %d\n", get_bits1(&s->gb));
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
511 #else
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
512 if (get_bits1(&s->gb) != 0)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
513 return -1; /* SAC: off */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
514 if (get_bits1(&s->gb) != 0)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
515 return -1; /* advanced prediction mode: off */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
516 if (get_bits1(&s->gb) != 0)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
517 return -1; /* not PB frame */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
518 #endif
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
519 mp_msg(MSGT_DEMUX, MSGL_V, "qscale=%d\n", get_bits(&s->gb, 5));
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
520 skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
521 } else {
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
522 mp_msg(MSGT_DEMUX, MSGL_V, "h263_plus = 1\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
523 /* H.263v2 */
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
524 if (get_bits(&s->gb, 3) != 1){
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
525 mp_msg(MSGT_DEMUX, MSGL_FATAL, "H.263v2 A error\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
526 return -1;
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
527 }
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
528 if (get_bits(&s->gb, 3) != 6){ /* custom source format */
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
529 mp_msg(MSGT_DEMUX, MSGL_FATAL, "custom source format\n");
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
530 return -1;
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
531 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
532 skip_bits(&s->gb, 12);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
533 skip_bits(&s->gb, 3);
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
534 mp_msg(MSGT_DEMUX, MSGL_V, "pict_type=%d\n", get_bits(&s->gb, 3) + 1);
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
535 // if (s->pict_type != I_TYPE &&
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
536 // s->pict_type != P_TYPE)
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
537 // return -1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
538 skip_bits(&s->gb, 7);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
539 skip_bits(&s->gb, 4); /* aspect ratio */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
540 width = (get_bits(&s->gb, 9) + 1) * 4;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
541 skip_bits1(&s->gb);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
542 height = get_bits(&s->gb, 9) * 4;
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
543 mp_msg(MSGT_DEMUX, MSGL_V, "%d x %d\n", width, height);
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
544 //if (height == 0)
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
545 // return -1;
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
546 mp_msg(MSGT_DEMUX, MSGL_V, "qscale=%d\n", get_bits(&s->gb, 5));
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
547 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
548
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
549 /* PEI */
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
550 while (get_bits1(&s->gb) != 0) {
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
551 skip_bits(&s->gb, 8);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
552 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
553 // s->f_code = 1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
554 // s->width = width;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
555 // s->height = height;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
556 return 0;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
557 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
558
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
559
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
560
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
561 static demuxer_t* demux_open_vivo(demuxer_t* demuxer){
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
562 vivo_priv_t* priv=demuxer->priv;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
563
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
564 if(!ds_fill_buffer(demuxer->video)){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
565 mp_msg(MSGT_DEMUX,MSGL_ERR,"VIVO: " MSGTR_MissingVideoStreamBug);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
566 return NULL;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
567 }
3526
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
568
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
569 audio_pos=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
570
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
571 h263_decode_picture_header(demuxer->video->buffer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
572
3503
7aed2edd99ab -vivo version option added
alex
parents: 3502
diff changeset
573 if (vivo_param_version != -1)
7aed2edd99ab -vivo version option added
alex
parents: 3502
diff changeset
574 priv->version = '0' + vivo_param_version;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
575
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
576 { sh_video_t* sh=new_sh_video(demuxer,0);
3113
c0e6a39d2ab7 changed to generate fourcc's like: viv<version> -> viv1,viv2
alex
parents: 3069
diff changeset
577
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
578 /* viv1, viv2 (for better codecs.conf) */
3113
c0e6a39d2ab7 changed to generate fourcc's like: viv<version> -> viv1,viv2
alex
parents: 3069
diff changeset
579 sh->format = mmioFOURCC('v', 'i', 'v', priv->version);
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
580 if(!sh->fps)
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
581 {
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
582 if (priv->fps)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
583 sh->fps=priv->fps;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
584 else
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
585 sh->fps=15.0f;
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
586 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
587 sh->frametime=1.0f/sh->fps;
2805
478202620831 disabled vivo2 scaling (decodes some vivo2 files)
alex
parents: 2792
diff changeset
588
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
589 /* XXX: FIXME: can't scale image. */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
590 /* hotfix to disable: */
2805
478202620831 disabled vivo2 scaling (decodes some vivo2 files)
alex
parents: 2792
diff changeset
591 priv->disp_width = priv->width;
478202620831 disabled vivo2 scaling (decodes some vivo2 files)
alex
parents: 2792
diff changeset
592 priv->disp_height = priv->height;
478202620831 disabled vivo2 scaling (decodes some vivo2 files)
alex
parents: 2792
diff changeset
593
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
594 if (vivo_param_width != -1)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
595 priv->disp_width = priv->width = vivo_param_width;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
596
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
597 if (vivo_param_height != -1)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
598 priv->disp_height = priv->height = vivo_param_height;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
599
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
600 if (vivo_param_vformat != -1)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
601 {
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
602 priv->disp_width = priv->width = h263_format[vivo_param_vformat][0];
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
603 priv->disp_height = priv->height = h263_format[vivo_param_vformat][1];
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
604 }
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
605
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
606 if (priv->disp_width)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
607 sh->disp_w = priv->disp_width;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
608 else
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
609 sh->disp_w = width;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
610 if (priv->disp_height)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
611 sh->disp_h = priv->disp_height;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
612 else
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
613 sh->disp_h = height;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
614
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
615 // emulate BITMAPINFOHEADER:
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
616 sh->bih=malloc(sizeof(BITMAPINFOHEADER));
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
617 memset(sh->bih,0,sizeof(BITMAPINFOHEADER));
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
618 sh->bih->biSize=40;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
619 if (priv->width)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
620 sh->bih->biWidth = priv->width;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
621 else
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
622 sh->bih->biWidth = width;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
623 if (priv->height)
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
624 sh->bih->biHeight = priv->height;
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
625 else
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
626 sh->bih->biHeight = height;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
627 sh->bih->biPlanes=1;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
628 sh->bih->biBitCount=24;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
629 sh->bih->biCompression=sh->format;
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
630 sh->bih->biSizeImage=sh->bih->biWidth*sh->bih->biHeight*3;
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
631
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
632 /* insert as stream */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
633 demuxer->video->sh=sh;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
634 sh->ds=demuxer->video;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
635 demuxer->video->id=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
636
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
637 /* disable seeking */
2928
3f8798f1f4bc some minor fixes
alex
parents: 2809
diff changeset
638 demuxer->seekable = 0;
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
639
19075
31da49ce5a58 printf --> mp_msg
diego
parents: 18708
diff changeset
640 mp_msg(MSGT_DEMUX,MSGL_V,"VIVO Video stream %d size: display: %dx%d, codec: %ux%u\n",
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
641 demuxer->video->id, sh->disp_w, sh->disp_h, sh->bih->biWidth,
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
642 sh->bih->biHeight);
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
643 }
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
644
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
645 /* AUDIO init */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
646 if (demuxer->audio->id >= -1){
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
647 if(!ds_fill_buffer(demuxer->audio)){
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
648 mp_msg(MSGT_DEMUX,MSGL_ERR,"VIVO: " MSGTR_MissingAudioStream);
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
649 } else
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
650 { sh_audio_t* sh=new_sh_audio(demuxer,1);
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
651
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
652 /* Select audio codec */
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
653 if (priv->audio_codec == 0)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
654 {
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
655 if (priv->version == '2')
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
656 priv->audio_codec = VIVO_AUDIO_SIREN;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
657 else
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
658 priv->audio_codec = VIVO_AUDIO_G723;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
659 }
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
660 if (vivo_param_acodec != NULL)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
661 {
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
662 if (!strcasecmp(vivo_param_acodec, "g723"))
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
663 priv->audio_codec = VIVO_AUDIO_G723;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
664 if (!strcasecmp(vivo_param_acodec, "siren"))
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
665 priv->audio_codec = VIVO_AUDIO_SIREN;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
666 }
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
667
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
668 if (priv->audio_codec == VIVO_AUDIO_G723)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
669 sh->format = 0x111;
9955
d6be831a5f9a fixed 2 10l-s (bug found in the spring cleanup patch by Raindel Shachar
alex
parents: 8254
diff changeset
670 else if (priv->audio_codec == VIVO_AUDIO_SIREN)
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
671 sh->format = 0x112;
9955
d6be831a5f9a fixed 2 10l-s (bug found in the spring cleanup patch by Raindel Shachar
alex
parents: 8254
diff changeset
672 else
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
673 {
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
674 mp_msg(MSGT_DEMUX, MSGL_ERR, "VIVO: Not support audio codec (%d)\n",
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
675 priv->audio_codec);
18708
9e2b300db17b Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents: 18558
diff changeset
676 free_sh_audio(demuxer, 1);
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
677 goto nosound;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
678 }
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
679
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
680 // Emulate WAVEFORMATEX struct:
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
681 sh->wf=malloc(sizeof(WAVEFORMATEX));
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
682 memset(sh->wf,0,sizeof(WAVEFORMATEX));
3439
192449c155c7 fixed Waveformatheader emu and added vivo1/2 audio detection
alex
parents: 3245
diff changeset
683 sh->wf->wFormatTag=sh->format;
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
684 sh->wf->nChannels=1; /* 1 channels for both Siren and G.723 */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
685
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
686 /* Set bits per sample */
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
687 if (priv->audio_codec == VIVO_AUDIO_SIREN)
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
688 sh->wf->wBitsPerSample = 16;
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
689 else
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
690 if (priv->audio_codec == VIVO_AUDIO_G723)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
691 sh->wf->wBitsPerSample = 8;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
692
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
693 /* Set sampling rate */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
694 if (priv->audio_samplerate) /* got from header */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
695 sh->wf->nSamplesPerSec = priv->audio_samplerate;
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
696 else
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
697 {
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
698 if (priv->audio_codec == VIVO_AUDIO_SIREN)
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
699 sh->wf->nSamplesPerSec = 16000;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
700 if (priv->audio_codec == VIVO_AUDIO_G723)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
701 sh->wf->nSamplesPerSec = 8000;
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
702 }
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
703 if (vivo_param_samplerate != -1)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
704 sh->wf->nSamplesPerSec = vivo_param_samplerate;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
705
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
706 /* Set audio bitrate */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
707 if (priv->audio_bitrate) /* got from header */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
708 sh->wf->nAvgBytesPerSec = priv->audio_bitrate;
2784
6caec0df4189 added text block parser
alex
parents: 2695
diff changeset
709 else
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
710 {
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
711 if (priv->audio_codec == VIVO_AUDIO_SIREN)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
712 sh->wf->nAvgBytesPerSec = 2000;
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
713 if (priv->audio_codec == VIVO_AUDIO_G723)
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
714 sh->wf->nAvgBytesPerSec = 800;
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
715 }
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
716 if (vivo_param_abitrate != -1)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
717 sh->wf->nAvgBytesPerSec = vivo_param_abitrate;
3526
cf787373f0aa vivo A-V sync fixed
arpi
parents: 3503
diff changeset
718 audio_rate=sh->wf->nAvgBytesPerSec;
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
719
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
720 if (!priv->audio_bytesperblock)
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
721 {
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
722 if (priv->audio_codec == VIVO_AUDIO_SIREN)
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
723 sh->wf->nBlockAlign = 40;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
724 if (priv->audio_codec == VIVO_AUDIO_G723)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
725 sh->wf->nBlockAlign = 24;
3471
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
726 }
e5aae38e6a09 hacked audio support to work with acm
alex
parents: 3439
diff changeset
727 else
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
728 sh->wf->nBlockAlign = priv->audio_bytesperblock;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
729 if (vivo_param_bytesperblock != -1)
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
730 sh->wf->nBlockAlign = vivo_param_bytesperblock;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
731
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 7472
diff changeset
732 /*sound_ok:*/
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
733 /* insert as stream */
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
734 demuxer->audio->sh=sh;
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
735 sh->ds=demuxer->audio;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
736 demuxer->audio->id=1;
3502
1ff0ff94ac91 added -vivo subconfig
alex
parents: 3471
diff changeset
737 nosound:
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
738 return demuxer;
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
739 }
2695
af8b2c0e4dad vivo 2.0 compatibility
arpi
parents: 2687
diff changeset
740 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
741 return demuxer;
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
742 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents:
diff changeset
743
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
744 static void demux_close_vivo(demuxer_t *demuxer)
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
745 {
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
746 vivo_priv_t* priv=demuxer->priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
747
2809
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
748 if (priv) {
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
749 if (priv->title)
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
750 free(priv->title);
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
751 if (priv->author)
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
752 free(priv->author);
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
753 if (priv->copyright)
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
754 free(priv->copyright);
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
755 if (priv->producer)
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
756 free(priv->producer);
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
757 free(priv);
2809
b8e0d8204ff2 small fix
pl
parents: 2805
diff changeset
758 }
2788
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
759 return;
4a909be26ea1 freeing up space and some debug
alex
parents: 2785
diff changeset
760 }
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
761
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
762
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 22605
diff changeset
763 const demuxer_desc_t demuxer_desc_vivo = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
764 "Vivo demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
765 "vivo",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
766 "VIVO",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
767 "A'rpi, Alex Beregszasi",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
768 "",
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
769 DEMUXER_TYPE_VIVO,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
770 0, // unsafe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
771 vivo_check_file,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
772 demux_vivo_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
773 demux_open_vivo,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
774 demux_close_vivo,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
775 NULL,
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
776 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 12085
diff changeset
777 };