annotate libmpdemux/demux_viv.c @ 15205:19243f85e164

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