annotate libmpdemux/netstream.h @ 10560:11826d9f90c7

this patch fixes 1) some bugs introduced in the tuner autodetection and in the channel-parsing functions, 3) retries reading when the mplayer/mencoder don't read fast enough (sooner it exited) but especially 4) makes the stream compliant with the new, modular stream api (the one currently in CVS is not and is totally unreachable). [and maybe more, next time please include cvslog in patch! -- A'rpi] patch by Nico <nsabbi@libero.it>
author arpi
date Mon, 11 Aug 2003 00:02:46 +0000
parents 35e306346e59
children 7513f753af91
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9850
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
1
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
2 /*
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
3 * Common stuff for netstream
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
4 * Packets and so on are defined here along with a few helpers
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
5 * wich are used by both the client and the server
9863
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
6 *
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
7 * Data is always low endian
9850
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
8 */
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
9
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
10 typedef struct mp_net_stream_packet_st {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
11 uint16_t len;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
12 uint8_t cmd;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
13 char data[0];
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
14 } __attribute__ ((packed)) mp_net_stream_packet_t;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
15
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
16 #define PACKET_MAX_SIZE 4096
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
17
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
18 // Commands sent by the client
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
19 #define NET_STREAM_OPEN 0
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
20 // data is the url
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
21 #define NET_STREAM_FILL_BUFFER 1
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
22 // data is an uint16 wich is the max len of the data to return
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
23 #define NET_STREAM_SEEK 3
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
24 // data is an uint64 wich the pos where to seek
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
25 #define NET_STREAM_CLOSE 4
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
26 // no data
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
27 #define NET_STREAM_RESET 5
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
28 // no data
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
29
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
30 // Server response
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
31 #define NET_STREAM_OK 128
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
32 // Data returned if open is successful
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
33 typedef struct mp_net_stream_opened_st {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
34 uint32_t file_format;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
35 uint32_t flags;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
36 uint32_t sector_size;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
37 uint64_t start_pos;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
38 uint64_t end_pos;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
39 } __attribute__ ((packed)) mp_net_stream_opened_t;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
40 // FILL_BUFFER return the data
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
41 // CLOSE return nothing
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
42 #define NET_STREAM_ERROR 129
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
43 // Data is the error message (if any ;)
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
44
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
45 static int net_read(int fd, char* buf, int len) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
46 int r = 0;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
47 while(len) {
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: 9863
diff changeset
48 r = recv(fd,buf,len,0);
9850
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
49 if(r <= 0) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
50 if(errno == EINTR) continue;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
51 if(r < 0)
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
52 mp_msg(MSGT_NETST,MSGL_ERR,"Read failed: %s\n",strerror(errno));
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
53 return 0;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
54 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
55 len -= r;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
56 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
57 return 1;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
58 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
59
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
60 static mp_net_stream_packet_t* read_packet(int fd) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
61 uint16_t len;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
62 mp_net_stream_packet_t* pack =
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
63 (mp_net_stream_packet_t*)malloc(sizeof(mp_net_stream_packet_t));
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
64
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
65 if(!net_read(fd,(char*)pack,sizeof(mp_net_stream_packet_t))) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
66 free(pack);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
67 return NULL;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
68 }
9863
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
69 pack->len = le2me_16(pack->len);
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
70
9850
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
71 if(pack->len < sizeof(mp_net_stream_packet_t)) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
72 mp_msg(MSGT_NETST,MSGL_WARN,"Got invalid packet (too small: %d)\n",pack->len);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
73 free(pack);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
74 return NULL;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
75 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
76 if(pack->len > PACKET_MAX_SIZE) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
77 mp_msg(MSGT_NETST,MSGL_WARN,"Got invalid packet (too big: %d)\n",pack->len);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
78 free(pack);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
79 return NULL;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
80 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
81 len = pack->len;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
82 if(len > sizeof(mp_net_stream_packet_t)) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
83 pack = realloc(pack,len);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
84 if(!pack) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
85 mp_msg(MSGT_NETST,MSGL_ERR,"Failed to get memory for the packet (%d bytes)\n",len);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
86 return NULL;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
87 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
88 if(!net_read(fd,pack->data,len - sizeof(mp_net_stream_packet_t)))
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
89 return NULL;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
90 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
91 // printf ("Read packet %d %d %d\n",fd,pack->cmd,pack->len);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
92 return pack;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
93 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
94
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
95 static int net_write(int fd, char* buf, int len) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
96 int w;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
97 while(len) {
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: 9863
diff changeset
98 w = send(fd,buf,len,0);
9850
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
99 if(w <= 0) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
100 if(errno == EINTR) continue;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
101 if(w < 0)
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
102 mp_msg(MSGT_NETST,MSGL_ERR,"Write failed: %s\n",strerror(errno));
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
103 return 0;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
104 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
105 len -= w;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
106 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
107 return 1;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
108 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
109
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
110 static int write_packet(int fd, uint8_t cmd,char* data,int len) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
111 mp_net_stream_packet_t* pack = malloc(len + sizeof(mp_net_stream_packet_t));
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
112
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
113 if(len > 0 && data)
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
114 memcpy(pack->data,data,len);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
115 pack->len = len + sizeof(mp_net_stream_packet_t);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
116 pack->cmd = cmd;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
117
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
118 // printf("Write packet %d %d (%p) %d\n",fd,cmd,data,len);
9863
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
119 pack->len = le2me_16(pack->len);
9850
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
120 if(net_write(fd,(char*)pack,pack->len)) {
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
121 free(pack);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
122 return 1;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
123 }
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
124 free(pack);
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
125 return 0;
564678d0bc15 A new stream wich allow access to MPlayer stream accross the network.
albeu
parents:
diff changeset
126 }
9863
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
127
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
128 static void net_stream_opened_2_me(mp_net_stream_opened_t* o) {
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
129 o->file_format = le2me_32(o->file_format);
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
130 o->flags = le2me_32(o->flags);
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
131 o->sector_size = le2me_32(o->sector_size);
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
132 o->start_pos = le2me_64(o->start_pos);
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
133 o->end_pos = le2me_64(o->end_pos);
4c6c6c361f24 It should now be endian aware. Untested as i only have le box :(
albeu
parents: 9850
diff changeset
134 }