annotate stream/asf_streaming.c @ 30811:50e0f6942e43

Implement Win32 mutexes. Implement Win32 mutexes; they used to just be mapped on top of events, which is not the same thing at all. The implementation is pretty much the obvious one, similar to the current critical section implementation and the semaphore implementation; a single lock count protected by a pthread mutex, and an event lockers can sleep on to know when the mutex is available. Also make CreateMutexA and ReleaseMutex available even if QuickTime codecs support is not configured.
author sesse
date Sat, 06 Mar 2010 10:13:37 +0000
parents 74d39bc2b2c4
children 9494acd724a9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
1 /*
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
2 * This file is part of MPlayer.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
5 * it under the terms of the GNU General Public License as published by
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
7 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
8 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
12 * GNU General Public License for more details.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
13 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
14 * You should have received a copy of the GNU General Public License along
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
17 */
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
18
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
19 #include <stdio.h>
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
20 #include <stdlib.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
21 #include <string.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1340
diff changeset
22 #include <unistd.h>
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
23 #include <errno.h>
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
24 #include <limits.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
25
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
26 #include "config.h"
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
27 #include "mp_msg.h"
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
28 #include "help_mp.h"
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
29
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
30 #if HAVE_WINSOCK2_H
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
31 #include <winsock2.h>
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
32 #endif
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
33
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
34 #include "url.h"
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
35 #include "http.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19271
diff changeset
36 #include "libmpdemux/asf.h"
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
37
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
38 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19271
diff changeset
39 #include "libmpdemux/demuxer.h"
30648
74d39bc2b2c4 Add header for asf_mmst_streaming_start() instead of forward declaring it.
diego
parents: 30633
diff changeset
40 #include "asf_mmst_streaming.h"
4315
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
41 #include "network.h"
19335
2a9d669e5ff6 isolated tcp socket code from network.c to a dedicated file
ben
parents: 19312
diff changeset
42 #include "tcp.h"
4315
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
43
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
44 #include "libavutil/intreadwrite.h"
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
45
26325
890180cde40f Make stream independent of libmpdemux, the asf demuxer and streaming
albeu
parents: 25898
diff changeset
46 #include "libmpdemux/asfguid.h"
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
47
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
48 extern int network_bandwidth;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
49
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
50 static int asf_http_streaming_start(stream_t *stream, int *demuxer_type);
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
51
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
52 static int asf_read_wrapper(int fd, void *buffer, int len, streaming_ctrl_t *stream_ctrl) {
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
53 uint8_t *buf = buffer;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
54 while (len > 0) {
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
55 int got = nop_streaming_read(fd, buf, len, stream_ctrl);
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
56 if (got <= 0) {
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
57 mp_msg(MSGT_NETWORK, MSGL_ERR, MSGTR_MPDEMUX_ASF_ErrReadingNetworkStream);
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
58 return got;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
59 }
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
60 buf += got;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
61 len -= got;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
62 }
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
63 return 1;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
64 }
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
65
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
66 // We can try several protocol for asf streaming
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
67 // * first the UDP protcol, if there is a firewall, UDP
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
68 // packets will not come back, so the mmsu will fail.
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
69 // * Then we can try TCP, but if there is a proxy for
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
70 // internet connection, the TCP connection will not get
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
71 // through
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
72 // * Then we can try HTTP.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
73 //
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
74 // Note: Using WMP sequence MMSU then MMST and then HTTP.
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
75
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
76 static int asf_streaming_start( stream_t *stream, int *demuxer_type) {
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
77 char *proto = stream->streaming_ctrl->url->protocol;
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
78 int fd = -1;
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
79 int port = stream->streaming_ctrl->url->port;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
80
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
81 // Is protocol mms or mmsu?
16112
0aeb954fc11c strncasecmp is not necessary and e.g. strncasecmp(prot, "mms", 3) will
reimar
parents: 15626
diff changeset
82 if (!strcasecmp(proto, "mmsu") || !strcasecmp(proto, "mms"))
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
83 {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
84 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/UDP...\n");
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
85 //fd = asf_mmsu_streaming_start( stream );
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
86 if( fd>-1 ) return fd; //mmsu support is not implemented yet - using this code
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
87 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/UDP failed\n");
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
88 if( fd==-2 ) return -1;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
89 }
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
90
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
91 //Is protocol mms or mmst?
16112
0aeb954fc11c strncasecmp is not necessary and e.g. strncasecmp(prot, "mms", 3) will
reimar
parents: 15626
diff changeset
92 if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
93 {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
94 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
6094
0f4dbbe57c08 Enable mmst support. MMST will be tried if the HTTP support failed.
bertrand
parents: 5915
diff changeset
95 fd = asf_mmst_streaming_start( stream );
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
96 stream->streaming_ctrl->url->port = port;
8823
557d34fe438a 10l bug...
bertrand
parents: 8718
diff changeset
97 if( fd>-1 ) return fd;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
98 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n");
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
99 if( fd==-2 ) return -1;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
100 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
101
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
102 //Is protocol http, http_proxy, or mms?
16112
0aeb954fc11c strncasecmp is not necessary and e.g. strncasecmp(prot, "mms", 3) will
reimar
parents: 15626
diff changeset
103 if (!strcasecmp(proto, "http_proxy") || !strcasecmp(proto, "http") ||
29029
c9db53414b53 Add support for mmsh:// as alias for mmshttp://
reimar
parents: 28402
diff changeset
104 !strcasecmp(proto, "mms") || !strcasecmp(proto, "mmsh") ||
c9db53414b53 Add support for mmsh:// as alias for mmshttp://
reimar
parents: 28402
diff changeset
105 !strcasecmp(proto, "mmshttp"))
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
106 {
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
107 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
108 fd = asf_http_streaming_start( stream, demuxer_type );
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
109 stream->streaming_ctrl->url->port = port;
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
110 if( fd>-1 ) return fd;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
111 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
112 if( fd==-2 ) return -1;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
113 }
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
114
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
115 //everything failed
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
116 return -1;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
117 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
118
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
119 static int asf_streaming(ASF_stream_chunck_t *stream_chunck, int *drop_packet ) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
120 /*
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
121 printf("ASF stream chunck size=%d\n", stream_chunck->size);
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
122 printf("length: %d\n", length );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
123 printf("0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
124 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
125 if( drop_packet!=NULL ) *drop_packet = 0;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
126
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
127 if( stream_chunck->size<8 ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
128 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_StreamChunkSize2Small, stream_chunck->size);
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
129 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
130 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
131 if( stream_chunck->size!=stream_chunck->size_confirm ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
132 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_SizeConfirmMismatch, stream_chunck->size, stream_chunck->size_confirm);
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
133 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
134 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
135 /*
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
136 printf(" type: 0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
137 printf(" size: %d (0x%02X)\n", stream_chunck->size, stream_chunck->size );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
138 printf(" sequence_number: 0x%04X\n", stream_chunck->sequence_number );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
139 printf(" unknown: 0x%02X\n", stream_chunck->unknown );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
140 printf(" size_confirm: 0x%02X\n", stream_chunck->size_confirm );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
141 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
142 switch(stream_chunck->type) {
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
143 case ASF_STREAMING_CLEAR: // $C Clear ASF configuration
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
144 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Clearing ASF stream configuration!\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
145 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
146 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
147 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
148 case ASF_STREAMING_DATA: // $D Data follows
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
149 // printf("=====> Data follows\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
150 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
151 case ASF_STREAMING_END_TRANS: // $E Transfer complete
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
152 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Transfer complete\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
153 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
154 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
155 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
156 case ASF_STREAMING_HEADER: // $H ASF header chunk follows
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
157 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF header chunk follows\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
158 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
159 default:
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
160 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Unknown stream type 0x%x\n", stream_chunck->type );
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
161 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
162 return stream_chunck->size+4;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
163 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
164
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
165 extern int audio_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
166 extern int video_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
167
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
168 static void close_s(stream_t *stream) {
29031
1706acdd3705 change close to closesocket, unifies close streaming code
compn
parents: 29029
diff changeset
169 closesocket(stream->fd);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
170 stream->fd=-1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
171 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
172
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
173 static int max_idx(int s_count, int *s_rates, int bound) {
14639
cb261c423a06 fix for streams that do not send a bitrate
reimar
parents: 14525
diff changeset
174 int i, best = -1, rate = -1;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
175 for (i = 0; i < s_count; i++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
176 if (s_rates[i] > rate && s_rates[i] <= bound) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
177 rate = s_rates[i];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
178 best = i;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
179 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
180 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
181 return best;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
182 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
183
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
184 static int asf_streaming_parse_header(int fd, streaming_ctrl_t* streaming_ctrl) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
185 ASF_stream_chunck_t chunk;
25454
e2bbaf29e61e Remove another useless cast
reimar
parents: 25453
diff changeset
186 asf_http_streaming_ctrl_t* asf_ctrl = streaming_ctrl->data;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
187 char* buffer=NULL, *chunk_buffer=NULL;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
188 int i,r,size,pos = 0;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
189 int start;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
190 int buffer_size = 0;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
191 int chunk_size2read = 0;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
192 int bw = streaming_ctrl->bandwidth;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
193 int *v_rates = NULL, *a_rates = NULL;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
194 int v_rate = 0, a_rate = 0, a_idx = -1, v_idx = -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
195
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
196 if(asf_ctrl == NULL) return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
197
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
198 // The ASF header can be in several network chunks. For example if the content description
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
199 // is big, the ASF header will be split in 2 network chunk.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
200 // So we need to retrieve all the chunk before starting to parse the header.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
201 do {
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
202 if (asf_read_wrapper(fd, &chunk, sizeof(ASF_stream_chunck_t), streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
203 return -1;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
204 // Endian handling of the stream chunk
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
205 le2me_ASF_stream_chunck_t(&chunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
206 size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t);
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
207 if(r) mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_ASF_WarnDropHeader);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
208 if(size < 0){
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
209 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
210 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
211 }
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
212 if (chunk.type != ASF_STREAMING_HEADER) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
213 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_NoHeaderAtFirstChunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
214 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
215 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
216
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17932
diff changeset
217 // audit: do not overflow buffer_size
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17932
diff changeset
218 if (size > SIZE_MAX - buffer_size) return -1;
25451
bc4355ca4326 Remove useless alloc casts
reimar
parents: 25450
diff changeset
219 buffer = malloc(size+buffer_size);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
220 if(buffer == NULL) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
221 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_ASF_BufferMallocFailed,size+buffer_size);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
222 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
223 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
224 if( chunk_buffer!=NULL ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
225 memcpy( buffer, chunk_buffer, buffer_size );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
226 free( chunk_buffer );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
227 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
228 chunk_buffer = buffer;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
229 buffer += buffer_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
230 buffer_size += size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
231
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
232 if (asf_read_wrapper(fd, buffer, size, streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
233 return -1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
234
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
235 if( chunk_size2read==0 ) {
25459
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
236 ASF_header_t *asfh = (ASF_header_t *)buffer;
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
237 if(size < (int)sizeof(ASF_header_t)) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
238 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrChunk2Small);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
239 return -1;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
240 } else mp_msg(MSGT_NETWORK,MSGL_DBG2,"Got chunk\n");
25459
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
241 chunk_size2read = AV_RL64(&asfh->objh.size);
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
242 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Size 2 read=%d\n", chunk_size2read);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
243 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
244 } while( buffer_size<chunk_size2read);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
245 buffer = chunk_buffer;
3551
314987c0aaf4 Fixed the multiple ASF header stream chunk.
bertrand
parents: 3533
diff changeset
246 size = buffer_size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
247
25459
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
248 start = sizeof(ASF_header_t);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
249
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
250 pos = find_asf_guid(buffer, asf_file_header_guid, start, size);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
251 if (pos >= 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
252 ASF_file_header_t *fileh = (ASF_file_header_t *) &buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
253 pos += sizeof(ASF_file_header_t);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
254 if (pos > size) goto len_err_out;
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
255 /*
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
256 if(fileh.packetsize != fileh.packetsize2) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
257 printf("Error packetsize check don't match\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
258 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
259 }
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
260 */
25456
d7e586404846 Avoid some le2me_ASF_* stuff operating directly on buffer, should
reimar
parents: 25454
diff changeset
261 asf_ctrl->packet_size = AV_RL32(&fileh->max_packet_size);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
262 // before playing.
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
263 // preroll: time in ms to bufferize before playing
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
264 streaming_ctrl->prebuffer_size = (unsigned int)(((double)fileh->preroll/1000.0)*((double)fileh->max_bitrate/8.0));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
265 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
266
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
267 pos = start;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
268 while ((pos = find_asf_guid(buffer, asf_stream_header_guid, pos, size)) >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
269 {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
270 ASF_stream_header_t *streamh = (ASF_stream_header_t *)&buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
271 pos += sizeof(ASF_stream_header_t);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
272 if (pos > size) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
273 switch(ASF_LOAD_GUID_PREFIX(streamh->type)) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
274 case 0xF8699E40 : // audio stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
275 if(asf_ctrl->audio_streams == NULL){
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18558
diff changeset
276 asf_ctrl->audio_streams = malloc(sizeof(int));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
277 asf_ctrl->n_audio = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
278 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
279 asf_ctrl->n_audio++;
25451
bc4355ca4326 Remove useless alloc casts
reimar
parents: 25450
diff changeset
280 asf_ctrl->audio_streams = realloc(asf_ctrl->audio_streams,
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
281 asf_ctrl->n_audio*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
282 }
25456
d7e586404846 Avoid some le2me_ASF_* stuff operating directly on buffer, should
reimar
parents: 25454
diff changeset
283 asf_ctrl->audio_streams[asf_ctrl->n_audio-1] = AV_RL16(&streamh->stream_no);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
284 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
285 case 0xBC19EFC0 : // video stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
286 if(asf_ctrl->video_streams == NULL){
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18558
diff changeset
287 asf_ctrl->video_streams = malloc(sizeof(int));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
288 asf_ctrl->n_video = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
289 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
290 asf_ctrl->n_video++;
25451
bc4355ca4326 Remove useless alloc casts
reimar
parents: 25450
diff changeset
291 asf_ctrl->video_streams = realloc(asf_ctrl->video_streams,
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
292 asf_ctrl->n_video*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
293 }
25456
d7e586404846 Avoid some le2me_ASF_* stuff operating directly on buffer, should
reimar
parents: 25454
diff changeset
294 asf_ctrl->video_streams[asf_ctrl->n_video-1] = AV_RL16(&streamh->stream_no);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
295 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
296 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
297 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
298
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
299 // always allocate to avoid lots of ifs later
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
300 v_rates = calloc(asf_ctrl->n_video, sizeof(int));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
301 a_rates = calloc(asf_ctrl->n_audio, sizeof(int));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
302
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
303 pos = find_asf_guid(buffer, asf_stream_group_guid, start, size);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
304 if (pos >= 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
305 // stream bitrate properties object
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
306 int stream_count;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
307 char *ptr = &buffer[pos];
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
308 char *end = &buffer[size];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
309
14262
04ed193d1e32 10l, variable declarations must be before mp_msg.
reimar
parents: 14236
diff changeset
310 mp_msg(MSGT_NETWORK, MSGL_V, "Stream bitrate properties object\n");
25453
7cde1324cf14 100l, buffer bound checks work better when done _before_ access.
reimar
parents: 25452
diff changeset
311 if (ptr + 2 > end) goto len_err_out;
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
312 stream_count = AV_RL16(ptr);
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
313 ptr += 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
314 mp_msg(MSGT_NETWORK, MSGL_V, " stream count=[0x%x][%u]\n",
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
315 stream_count, stream_count );
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
316 for( i=0 ; i<stream_count ; i++ ) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
317 uint32_t rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
318 int id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
319 int j;
25453
7cde1324cf14 100l, buffer bound checks work better when done _before_ access.
reimar
parents: 25452
diff changeset
320 if (ptr + 6 > end) goto len_err_out;
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
321 id = AV_RL16(ptr);
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
322 ptr += 2;
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
323 rate = AV_RL32(ptr);
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
324 ptr += 4;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
325 mp_msg(MSGT_NETWORK, MSGL_V,
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
326 " stream id=[0x%x][%u]\n", id, id);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
327 mp_msg(MSGT_NETWORK, MSGL_V,
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
328 " max bitrate=[0x%x][%u]\n", rate, rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
329 for (j = 0; j < asf_ctrl->n_video; j++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
330 if (id == asf_ctrl->video_streams[j]) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
331 mp_msg(MSGT_NETWORK, MSGL_V, " is video stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
332 v_rates[j] = rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
333 break;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
334 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
335 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
336 for (j = 0; j < asf_ctrl->n_audio; j++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
337 if (id == asf_ctrl->audio_streams[j]) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
338 mp_msg(MSGT_NETWORK, MSGL_V, " is audio stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
339 a_rates[j] = rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
340 break;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
341 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
342 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
343 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
344 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
345 free(buffer);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
346
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
347 // automatic stream selection based on bandwidth
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
348 if (bw == 0) bw = INT_MAX;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
349 mp_msg(MSGT_NETWORK, MSGL_V, "Max bandwidth set to %d\n", bw);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
350
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
351 if (asf_ctrl->n_audio) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
352 // find lowest-bitrate audio stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
353 a_rate = a_rates[0];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
354 a_idx = 0;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
355 for (i = 0; i < asf_ctrl->n_audio; i++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
356 if (a_rates[i] < a_rate) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
357 a_rate = a_rates[i];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
358 a_idx = i;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
359 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
360 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
361 if (max_idx(asf_ctrl->n_video, v_rates, bw - a_rate) < 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
362 // both audio and video are not possible, try video only next
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
363 a_idx = -1;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
364 a_rate = 0;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
365 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
366 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
367 // find best video stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
368 v_idx = max_idx(asf_ctrl->n_video, v_rates, bw - a_rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
369 if (v_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
370 v_rate = v_rates[v_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
371
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
372 // find best audio stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
373 a_idx = max_idx(asf_ctrl->n_audio, a_rates, bw - v_rate);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
374
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
375 free(v_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
376 free(a_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
377
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
378 if (a_idx < 0 && v_idx < 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
379 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_ASF_Bandwidth2SmallCannotPlay);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
380 return -1;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
381 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
382
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
383 if (audio_id > 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
384 // a audio stream was forced
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
385 asf_ctrl->audio_id = audio_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
386 else if (a_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
387 asf_ctrl->audio_id = asf_ctrl->audio_streams[a_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
388 else if (asf_ctrl->n_audio) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
389 mp_msg(MSGT_NETWORK, MSGL_WARN, MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedAudio);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
390 audio_id = -2;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
391 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
392
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
393 if (video_id > 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
394 // a video stream was forced
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
395 asf_ctrl->video_id = video_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
396 else if (v_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
397 asf_ctrl->video_id = asf_ctrl->video_streams[v_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
398 else if (asf_ctrl->n_video) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
399 mp_msg(MSGT_NETWORK, MSGL_WARN, MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedVideo);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
400 video_id = -2;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
401 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
402
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
403 return 1;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
404
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
405 len_err_out:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
406 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_ASF_InvalidLenInHeader);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
407 if (buffer) free(buffer);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
408 if (v_rates) free(v_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
409 if (a_rates) free(a_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
410 return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
411 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
412
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
413 static int asf_http_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
414 static ASF_stream_chunck_t chunk;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
415 int read,chunk_size = 0;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7310
diff changeset
416 static int rest = 0, drop_chunk = 0, waiting = 0;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
417 asf_http_streaming_ctrl_t *asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
418
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
419 while(1) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
420 if (rest == 0 && waiting == 0) {
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
421 if (asf_read_wrapper(fd, &chunk, sizeof(ASF_stream_chunck_t), streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
422 return -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
423
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
424 // Endian handling of the stream chunk
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
425 le2me_ASF_stream_chunck_t(&chunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
426 chunk_size = asf_streaming( &chunk, &drop_chunk );
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
427 if(chunk_size < 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
428 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
429 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
430 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
431 chunk_size -= sizeof(ASF_stream_chunck_t);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
432
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
433 if(chunk.type != ASF_STREAMING_HEADER && (!drop_chunk)) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
434 if (asf_http_ctrl->packet_size < chunk_size) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
435 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrChunkBiggerThanPacket);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
436 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
437 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
438 waiting = asf_http_ctrl->packet_size;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
439 } else {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
440 waiting = chunk_size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
441 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
442
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
443 } else if (rest){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
444 chunk_size = rest;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
445 rest = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
446 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
447
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
448 read = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
449 if ( waiting >= chunk_size) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
450 if (chunk_size > size){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
451 rest = chunk_size - size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
452 chunk_size = size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
453 }
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
454 if (asf_read_wrapper(fd, buffer, chunk_size, streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
455 return -1;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
456 read = chunk_size;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
457 waiting -= read;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
458 if (drop_chunk) continue;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
459 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
460 if (rest == 0 && waiting > 0 && size-read > 0) {
22378
dc9d2940fc05 Replace MIN with FFMIN
reimar
parents: 21537
diff changeset
461 int s = FFMIN(waiting,size-read);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
462 memset(buffer+read,0,s);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
463 waiting -= s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
464 read += s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
465 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
466 break;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
467 }
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
468
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
469 return read;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
470 }
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
471
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
472 static int asf_http_streaming_seek( int fd, off_t pos, streaming_ctrl_t *streaming_ctrl ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
473 return -1;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
474 // to shut up gcc warning
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
475 fd++;
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
476 pos++;
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
477 streaming_ctrl=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
478 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
479
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
480 static int asf_header_check( HTTP_header_t *http_hdr ) {
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
481 ASF_obj_header_t *objh;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
482 if( http_hdr==NULL ) return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
483 if( http_hdr->body==NULL || http_hdr->body_size<sizeof(ASF_obj_header_t) ) return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
484
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
485 objh = (ASF_obj_header_t*)http_hdr->body;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
486 if( ASF_LOAD_GUID_PREFIX(objh->guid)==0x75B22630 ) return 0;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
487 return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
488 }
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
489
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
490 static int asf_http_streaming_type(char *content_type, char *features, HTTP_header_t *http_hdr ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
491 if( content_type==NULL ) return ASF_Unknown_e;
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
492 if( !strcasecmp(content_type, "application/octet-stream") ||
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
493 !strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") || // New in Corona, first request
11349
786407b1bc78 Accept video/x-ms-asf as the MIME type for ASF as well. Patch by Dominique Andre Gunia <Dominique.Gunia@schunter.etc.tu-bs.de>.
mosu
parents: 10939
diff changeset
494 !strcasecmp(content_type, "application/x-mms-framed") || // New in Corana, second request
29923
88272f3b9b19 mime type [video/x-ms-wmv] is not an ASF redirector.
compn
parents: 29263
diff changeset
495 !strcasecmp(content_type, "video/x-ms-wmv") ||
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
496 !strcasecmp(content_type, "video/x-ms-asf")) {
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
497
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
498 if( strstr(features, "broadcast") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
499 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Live stream\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
500 return ASF_Live_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
501 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
502 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Prerecorded\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
503 return ASF_Prerecorded_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
504 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
505 } else {
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
506 // Ok in a perfect world, web servers should be well configured
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
507 // so we could used mime type to know the stream type,
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
508 // but guess what? All of them are not well configured.
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
509 // So we have to check for an asf header :(, but it works :p
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
510 if( http_hdr->body_size>sizeof(ASF_obj_header_t) ) {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
511 if( asf_header_check( http_hdr )==0 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
512 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
513 return ASF_PlainText_e;
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
514 } else if( (!strcasecmp(content_type, "text/html")) ) {
12654
433c0d389f6f correct spelling
alex
parents: 12535
diff changeset
515 mp_msg(MSGT_NETWORK,MSGL_V,"=====> HTML, MPlayer is not a browser...yet!\n");
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
516 return ASF_Unknown_e;
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
517 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
518 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Redirector\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
519 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
520 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
521 } else {
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
522 if( (!strcasecmp(content_type, "audio/x-ms-wax")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
523 (!strcasecmp(content_type, "audio/x-ms-wma")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
524 (!strcasecmp(content_type, "video/x-ms-asf")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
525 (!strcasecmp(content_type, "video/x-ms-afs")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
526 (!strcasecmp(content_type, "video/x-ms-wmv")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
527 (!strcasecmp(content_type, "video/x-ms-wma")) ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
528 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ASFRedirector);
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
529 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
530 } else if( !strcasecmp(content_type, "text/plain") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
531 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
532 return ASF_PlainText_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
533 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
534 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF unknown content-type: %s\n", content_type );
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
535 return ASF_Unknown_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
536 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
537 }
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
538 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
539 return ASF_Unknown_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
540 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
541
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
542 static HTTP_header_t *asf_http_request(streaming_ctrl_t *streaming_ctrl) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
543 HTTP_header_t *http_hdr;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
544 URL_t *url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
545 URL_t *server_url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
546 asf_http_streaming_ctrl_t *asf_http_ctrl;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
547 char str[250];
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
548 char *ptr;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
549 int i, enable;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
550
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
551 int offset_hi=0, offset_lo=0, length=0;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
552 int asf_nb_stream=0, stream_id;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
553
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
554 // Sanity check
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
555 if( streaming_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
556 url = streaming_ctrl->url;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
557 asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
558 if( url==NULL || asf_http_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
559
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
560 // Common header for all requests.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
561 http_hdr = http_new_header();
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
562 http_set_field( http_hdr, "Accept: */*" );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
563 http_set_field( http_hdr, "User-Agent: NSPlayer/4.1.0.3856" );
6670
70b54c2e0292 Add missing authentication for asf streaming.
atmos4
parents: 6643
diff changeset
564 http_add_basic_authentication( http_hdr, url->username, url->password );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
565
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
566 // Check if we are using a proxy
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
567 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
568 server_url = url_new( (url->file)+1 );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
569 if( server_url==NULL ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
570 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_InvalidProxyURL);
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
571 http_free( http_hdr );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
572 return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
573 }
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
574 http_set_uri( http_hdr, server_url->url );
10939
55c9903bd51c simple fix for buffer overflow (remotely exploitable). feel free to
rfelker
parents: 10625
diff changeset
575 sprintf( str, "Host: %.220s:%d", server_url->hostname, server_url->port );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
576 url_free( server_url );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
577 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
578 http_set_uri( http_hdr, url->file );
10939
55c9903bd51c simple fix for buffer overflow (remotely exploitable). feel free to
rfelker
parents: 10625
diff changeset
579 sprintf( str, "Host: %.220s:%d", url->hostname, url->port );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
580 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
581
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
582 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
583 http_set_field( http_hdr, "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}" );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
584 sprintf(str,
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
585 "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=%u:%u,request-context=%d,max-duration=%u",
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
586 offset_hi, offset_lo, asf_http_ctrl->request, length );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
587 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
588
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
589 switch( asf_http_ctrl->streaming_type ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
590 case ASF_Live_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
591 case ASF_Prerecorded_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
592 http_set_field( http_hdr, "Pragma: xPlayStrm=1" );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
593 ptr = str;
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
594 ptr += sprintf( ptr, "Pragma: stream-switch-entry=");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
595 if(asf_http_ctrl->n_audio > 0) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
596 for( i=0; i<asf_http_ctrl->n_audio ; i++ ) {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
597 stream_id = asf_http_ctrl->audio_streams[i];
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
598 if(stream_id == asf_http_ctrl->audio_id) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
599 enable = 0;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
600 } else {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
601 enable = 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
602 continue;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
603 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
604 asf_nb_stream++;
25898
b61b5a697afc Stream IDs must be written as hex numbers. Fixes
rtogni
parents: 25459
diff changeset
605 ptr += sprintf(ptr, "ffff:%x:%d ", stream_id, enable);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
606 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
607 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
608 if(asf_http_ctrl->n_video > 0) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
609 for( i=0; i<asf_http_ctrl->n_video ; i++ ) {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
610 stream_id = asf_http_ctrl->video_streams[i];
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
611 if(stream_id == asf_http_ctrl->video_id) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
612 enable = 0;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
613 } else {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
614 enable = 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
615 continue;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
616 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
617 asf_nb_stream++;
25898
b61b5a697afc Stream IDs must be written as hex numbers. Fixes
rtogni
parents: 25459
diff changeset
618 ptr += sprintf(ptr, "ffff:%x:%d ", stream_id, enable);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
619 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
620 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
621 http_set_field( http_hdr, str );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
622 sprintf( str, "Pragma: stream-switch-count=%d", asf_nb_stream );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
623 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
624 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
625 case ASF_Redirector_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
626 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
627 case ASF_Unknown_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
628 // First request goes here.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
629 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
630 default:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
631 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_UnknownASFStreamType);
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
632 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
633
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
634 http_set_field( http_hdr, "Connection: Close" );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
635 http_build_request( http_hdr );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
636
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
637 return http_hdr;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
638 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
639
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
640 static int asf_http_parse_response(asf_http_streaming_ctrl_t *asf_http_ctrl, HTTP_header_t *http_hdr ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
641 char *content_type, *pragma;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
642 char features[64] = "\0";
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
643 size_t len;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
644 if( http_response_parse(http_hdr)<0 ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
645 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_Failed2ParseHTTPResponse);
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
646 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
647 }
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
648 switch( http_hdr->status_code ) {
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
649 case 200:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
650 break;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
651 case 401: // Authentication required
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
652 return ASF_Authenticate_e;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
653 default:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
654 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ServerReturn, http_hdr->status_code, http_hdr->reason_phrase);
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
655 return -1;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
656 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
657
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
658 content_type = http_get_field( http_hdr, "Content-Type");
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
659 //printf("Content-Type: [%s]\n", content_type);
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
660
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
661 pragma = http_get_field( http_hdr, "Pragma");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
662 while( pragma!=NULL ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
663 char *comma_ptr=NULL;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
664 char *end;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
665 //printf("Pragma: [%s]\n", pragma );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
666 // The pragma line can get severals attributes
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
667 // separeted with a comma ','.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
668 do {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
669 if( !strncasecmp( pragma, "features=", 9) ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
670 pragma += 9;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
671 end = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
672 if( end==NULL ) {
17837
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
673 len = strlen(pragma);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
674 } else {
17837
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
675 len = (unsigned int)(end-pragma);
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
676 }
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
677 if(len > sizeof(features) - 1) {
17840
42843606bc06 Fix compilation error introduced by last commit
reimar
parents: 17837
diff changeset
678 mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_ASF_ASFHTTPParseWarnCuttedPragma,pragma,len,sizeof(features) - 1);
17837
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
679 len = sizeof(features) - 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
680 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
681 strncpy( features, pragma, len );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
682 features[len]='\0';
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
683 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
684 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
685 comma_ptr = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
686 if( comma_ptr!=NULL ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
687 pragma = comma_ptr+1;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
688 if( pragma[0]==' ' ) pragma++;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
689 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
690 } while( comma_ptr!=NULL );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
691 pragma = http_get_next_field( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
692 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
693 asf_http_ctrl->streaming_type = asf_http_streaming_type( content_type, features, http_hdr );
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
694 return 0;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
695 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
696
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
697 static int asf_http_streaming_start( stream_t *stream, int *demuxer_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
698 HTTP_header_t *http_hdr=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
699 URL_t *url = stream->streaming_ctrl->url;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
700 asf_http_streaming_ctrl_t *asf_http_ctrl;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
701 char buffer[BUFFER_SIZE];
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
702 int i, ret;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
703 int fd = stream->fd;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
704 int done;
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
705 int auth_retry = 0;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
706
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18558
diff changeset
707 asf_http_ctrl = malloc(sizeof(asf_http_streaming_ctrl_t));
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
708 if( asf_http_ctrl==NULL ) {
16907
54a414dd1c0b Changed MSGTR_MPDEMUX_ASF_MallocFailed to MSGTR_MemAllocFailed (msg defined two times inhelp_mp-en.h)
ptt
parents: 16882
diff changeset
709 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
710 return -1;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
711 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
712 asf_http_ctrl->streaming_type = ASF_Unknown_e;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
713 asf_http_ctrl->request = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
714 asf_http_ctrl->audio_streams = asf_http_ctrl->video_streams = NULL;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
715 asf_http_ctrl->n_audio = asf_http_ctrl->n_video = 0;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
716 stream->streaming_ctrl->data = (void*)asf_http_ctrl;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
717
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
718 do {
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
719 done = 1;
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
720 if( fd>0 ) closesocket( fd );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
721
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
722 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
723 if( url->port==0 ) url->port = 8080;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
724 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
725 if( url->port==0 ) url->port = 80;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
726 }
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10281
diff changeset
727 fd = connect2Server( url->hostname, url->port, 1);
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
728 if( fd<0 ) return fd;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
729
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
730 http_hdr = asf_http_request( stream->streaming_ctrl );
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
731 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request [%s]\n", http_hdr->buffer );
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
732 for(i=0; i < (int)http_hdr->buffer_size ; ) {
10206
35e306346e59 Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents: 9749
diff changeset
733 int r = send( fd, http_hdr->buffer+i, http_hdr->buffer_size-i, 0 );
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
734 if(r <0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
735 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_SocketWriteError,strerror(errno));
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
736 goto err_out;
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
737 }
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
738 i += r;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
739 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
740 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
741 http_hdr = http_new_header();
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
742 do {
10206
35e306346e59 Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents: 9749
diff changeset
743 i = recv( fd, buffer, BUFFER_SIZE, 0 );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
744 //printf("read: %d\n", i );
7310
d8e2623a2ea1 Don't try to reread from the socket if the server says EOF
bertrand
parents: 7252
diff changeset
745 if( i<=0 ) {
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
746 perror("read");
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
747 goto err_out;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
748 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
749 http_response_append( http_hdr, buffer, i );
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
750 } while( !http_is_header_entire( http_hdr ) );
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17840
diff changeset
751 if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
752 http_hdr->buffer[http_hdr->buffer_size]='\0';
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
753 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Response [%s]\n", http_hdr->buffer );
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
754 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
755 ret = asf_http_parse_response(asf_http_ctrl, http_hdr);
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
756 if( ret<0 ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
757 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_HeaderParseFailed);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
758 goto err_out;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
759 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
760 switch( asf_http_ctrl->streaming_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
761 case ASF_Live_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
762 case ASF_Prerecorded_e:
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
763 case ASF_PlainText_e:
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
764 if( http_hdr->body_size>0 ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
765 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
766 goto err_out;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
767 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
768 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
769 if( asf_http_ctrl->request==1 ) {
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
770 if( asf_http_ctrl->streaming_type!=ASF_PlainText_e ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
771 // First request, we only got the ASF header.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
772 ret = asf_streaming_parse_header(fd,stream->streaming_ctrl);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
773 if(ret < 0) goto err_out;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
774 if(asf_http_ctrl->n_audio == 0 && asf_http_ctrl->n_video == 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
775 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_NoStreamFound);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
776 goto err_out;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
777 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
778 asf_http_ctrl->request++;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
779 done = 0;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
780 } else {
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
781 done = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
782 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
783 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
784 break;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
785 case ASF_Redirector_e:
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
786 if( http_hdr->body_size>0 ) {
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
787 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
788 goto err_out;
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
789 }
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
790 }
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
791 *demuxer_type = DEMUXER_TYPE_PLAYLIST;
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
792 done = 1;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
793 break;
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
794 case ASF_Authenticate_e:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
795 if( http_authenticate( http_hdr, url, &auth_retry)<0 ) return -1;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
796 asf_http_ctrl->streaming_type = ASF_Unknown_e;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
797 done = 0;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
798 break;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
799 case ASF_Unknown_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
800 default:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
801 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_UnknownASFStreamingType);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
802 goto err_out;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
803 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
804 // Check if we got a redirect.
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
805 } while(!done);
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
806
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
807 stream->fd = fd;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
808 if( asf_http_ctrl->streaming_type==ASF_PlainText_e || asf_http_ctrl->streaming_type==ASF_Redirector_e ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
809 stream->streaming_ctrl->streaming_read = nop_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
810 stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
811 } else {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
812 stream->streaming_ctrl->streaming_read = asf_http_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
813 stream->streaming_ctrl->streaming_seek = asf_http_streaming_seek;
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
814 stream->streaming_ctrl->buffering = 1;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
815 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
816 stream->streaming_ctrl->status = streaming_playing_e;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
817 stream->close = close_s;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
818
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
819 http_free( http_hdr );
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
820 return 0;
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
821
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
822 err_out:
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
823 if (fd > 0)
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
824 closesocket(fd);
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
825 stream->fd = -1;
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
826 http_free(http_hdr);
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
827 return -1;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
828 }
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
829
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
830 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
831 URL_t *url;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
832
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
833 stream->streaming_ctrl = streaming_ctrl_new();
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
834 if( stream->streaming_ctrl==NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
835 return STREAM_ERROR;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
836 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
837 stream->streaming_ctrl->bandwidth = network_bandwidth;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
838 url = url_new(stream->url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
839 stream->streaming_ctrl->url = check4proxies(url);
16418
264b3b909850 check4proxies always creates a copy, so url should be freed
reimar
parents: 16112
diff changeset
840 url_free(url);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
841
16930
41aeb5e0cb4b Fix bugs/crash introduced by translation patch
reimar
parents: 16907
diff changeset
842 mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_MPDEMUX_ASF_InfoStreamASFURL, stream->url);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
843 if((!strncmp(stream->url, "http", 4)) && (*file_format!=DEMUXER_TYPE_ASF && *file_format!=DEMUXER_TYPE_UNKNOWN)) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
844 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
845 stream->streaming_ctrl = NULL;
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 23675
diff changeset
846 return STREAM_UNSUPPORTED;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
847 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
848
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
849 if(asf_streaming_start(stream, file_format) < 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
850 mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_ASF_StreamingFailed);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
851 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
852 stream->streaming_ctrl = NULL;
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 23675
diff changeset
853 return STREAM_UNSUPPORTED;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
854 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
855
25387
95893c0e5108 do not override *file_format if already set by asf_streaming_start()
ben
parents: 25211
diff changeset
856 if (*file_format != DEMUXER_TYPE_PLAYLIST)
25388
57c207e33831 cosmetic: indent after r25415
ben
parents: 25387
diff changeset
857 *file_format = DEMUXER_TYPE_ASF;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
858 stream->type = STREAMTYPE_STREAM;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
859 fixup_network_stream_cache(stream);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
860 return STREAM_OK;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
861 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
862
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 24257
diff changeset
863 const stream_info_t stream_info_asf = {
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
864 "mms and mms over http streaming",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
865 "null",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
866 "Bertrand, Reimar Doeffinger, Albeu",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
867 "originally based on work by Majormms (is that code still there?)",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
868 open_s,
29029
c9db53414b53 Add support for mmsh:// as alias for mmshttp://
reimar
parents: 28402
diff changeset
869 {"mms", "mmsu", "mmst", "http", "http_proxy", "mmsh", "mmshttp", NULL},
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
870 NULL,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
871 0 // Urls are an option string
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
872 };