annotate libmpdemux/demux_viv.c @ 33244:cee07c3dbff5

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