annotate stream/stream.h @ 30666:b20827f16dd0

Output WAVE_FORMAT_EXTENSIBLE extension in wave header when waveheader option is enabled (default) and channels > 2.
author tack
date Mon, 22 Feb 2010 14:24:53 +0000
parents 11eebd7c8879
children 9a49143918aa
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: 30165
diff changeset
1 /*
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
diff changeset
2 * This file is part of MPlayer.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
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: 30165
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: 30165
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: 30165
diff changeset
7 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
diff changeset
8 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
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: 30165
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: 30165
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: 30165
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: 30165
diff changeset
13 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
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: 30165
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: 30165
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: 30165
diff changeset
17 */
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30165
diff changeset
18
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25690
diff changeset
19 #ifndef MPLAYER_STREAM_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25690
diff changeset
20 #define MPLAYER_STREAM_H
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
21
30165
b4cbeff5153e Add a few missing header #includes and #defines.
diego
parents: 29920
diff changeset
22 #include "config.h"
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
23 #include "mp_msg.h"
30655
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
24 #include "url.h"
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
25 #include <string.h>
4029
3c87dee7a324 patch for missing include by Steven M. Schultz <sms@2BSD.COM>
pl
parents: 3998
diff changeset
26 #include <inttypes.h>
5292
1863e0c6af59 sys/types.h required for off_t
arpi
parents: 5133
diff changeset
27 #include <sys/types.h>
4029
3c87dee7a324 patch for missing include by Steven M. Schultz <sms@2BSD.COM>
pl
parents: 3998
diff changeset
28
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
29 #define STREAMTYPE_DUMMY -1 // for placeholders, when the actual reading is handled in the demuxer
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
30 #define STREAMTYPE_FILE 0 // read from seekable file
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
31 #define STREAMTYPE_VCD 1 // raw mode-2 CDROM reading, 2324 bytes/sector
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
32 #define STREAMTYPE_STREAM 2 // same as FILE but no seeking (for net/stdin)
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
33 #define STREAMTYPE_DVD 3 // libdvdread
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
34 #define STREAMTYPE_MEMORY 4 // read data from memory area
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
35 #define STREAMTYPE_PLAYLIST 6 // FIXME!!! same as STREAMTYPE_FILE now
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
36 #define STREAMTYPE_DS 8 // read from a demuxer stream
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
37 #define STREAMTYPE_DVDNAV 9 // we cannot safely "seek" in this...
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
38 #define STREAMTYPE_CDDA 10 // raw audio CD reader
7630
4c51ce16c4a2 smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents: 7412
diff changeset
39 #define STREAMTYPE_SMB 11 // smb:// url, using libsmbclient (samba)
8782
6af7a6595cc9 cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents: 8164
diff changeset
40 #define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 8782
diff changeset
41 #define STREAMTYPE_DVB 13
14836
8b9738526dd7 added a stream module for the vstream client library
joey
parents: 13089
diff changeset
42 #define STREAMTYPE_VSTREAM 14
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14836
diff changeset
43 #define STREAMTYPE_SDP 15
18997
73b8f5ff772d added new pvr:// input for ivtv based cards
ben
parents: 18732
diff changeset
44 #define STREAMTYPE_PVR 16
19295
f6316aa3a7f2 conversion from stream_null to stream_tv was missing stream type
ben
parents: 19271
diff changeset
45 #define STREAMTYPE_TV 17
19301
097e5bc71210 added dedicated file for mf:// input
ben
parents: 19295
diff changeset
46 #define STREAMTYPE_MF 18
19568
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19475
diff changeset
47 #define STREAMTYPE_RADIO 19
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
48
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
49 #define STREAM_BUFFER_SIZE 2048
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
50
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
51 #define VCD_SECTOR_SIZE 2352
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
52 #define VCD_SECTOR_OFFS 24
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
53 #define VCD_SECTOR_DATA 2324
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
54
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
55 /// atm it will always use mode == STREAM_READ
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
56 /// streams that use the new api should check the mode at open
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
57 #define STREAM_READ 0
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
58 #define STREAM_WRITE 1
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
59 /// Seek flags, if not mannualy set and s->seek isn't NULL
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29888
diff changeset
60 /// MP_STREAM_SEEK is automaticly set
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29888
diff changeset
61 #define MP_STREAM_SEEK_BW 2
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29888
diff changeset
62 #define MP_STREAM_SEEK_FW 4
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29888
diff changeset
63 #define MP_STREAM_SEEK (MP_STREAM_SEEK_BW|MP_STREAM_SEEK_FW)
29888
5c39c41f38e8 Deobfuscate the special hack to disable cache for live555.
reimar
parents: 29263
diff changeset
64 /** This is a HACK for live555 that does not respect the
5c39c41f38e8 Deobfuscate the special hack to disable cache for live555.
reimar
parents: 29263
diff changeset
65 separation between stream an demuxer and thus is not
5c39c41f38e8 Deobfuscate the special hack to disable cache for live555.
reimar
parents: 29263
diff changeset
66 actually a stream cache can not be used */
5c39c41f38e8 Deobfuscate the special hack to disable cache for live555.
reimar
parents: 29263
diff changeset
67 #define STREAM_NON_CACHEABLE 8
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
68
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
69 //////////// Open return code
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24297
diff changeset
70 #define STREAM_REDIRECTED -2
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
71 /// This can't open the requested protocol (used by stream wich have a
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
72 /// * protocol when they don't know the requested protocol)
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24079
diff changeset
73 #define STREAM_UNSUPPORTED -1
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
74 #define STREAM_ERROR 0
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
75 #define STREAM_OK 1
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
76
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
77 #define MAX_STREAM_PROTOCOLS 10
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
78
9851
6a348d3ed626 A new control called upon stream reset.
albeu
parents: 9825
diff changeset
79 #define STREAM_CTRL_RESET 0
17696
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17012
diff changeset
80 #define STREAM_CTRL_GET_TIME_LENGTH 1
19434
f2da98669a77 new STREAM_CTRL_SEEK_TO_CHAPTER (will be used by streams dvd[nav], maybe [s]vcd
nicodvb
parents: 19301
diff changeset
81 #define STREAM_CTRL_SEEK_TO_CHAPTER 2
19437
c73bf418b291 new stream_ctrl to get currently playing chapter (needed for stream-driven relative chapter seeking)
nicodvb
parents: 19434
diff changeset
82 #define STREAM_CTRL_GET_CURRENT_CHAPTER 3
19475
1f117b5fb5a1 added STREAM_CTRL_GET_NUM_CHAPTERS to get total number of chapters from the stream reader
nicodvb
parents: 19437
diff changeset
83 #define STREAM_CTRL_GET_NUM_CHAPTERS 4
20744
30091c3ad3cd added definitions of STREAM_CTRL_GET_CURRENT_TIME STREAM_CTRL_SEEK_TO_TIME
nicodvb
parents: 19568
diff changeset
84 #define STREAM_CTRL_GET_CURRENT_TIME 5
30091c3ad3cd added definitions of STREAM_CTRL_GET_CURRENT_TIME STREAM_CTRL_SEEK_TO_TIME
nicodvb
parents: 19568
diff changeset
85 #define STREAM_CTRL_SEEK_TO_TIME 6
21657
5f5ed194b54b new STREAM_CTRL_GET_SIZE to get size of output stream
nicodvb
parents: 21655
diff changeset
86 #define STREAM_CTRL_GET_SIZE 7
24297
a5ae2d4973b8 introduced STREAM_CTRL_GET_ASPECT_RATIO to report the aspect ratio read from the stream layer (if supported)
nicodvb
parents: 24257
diff changeset
87 #define STREAM_CTRL_GET_ASPECT_RATIO 8
25572
f6c0bce13b17 NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
nicodvb
parents: 25547
diff changeset
88 #define STREAM_CTRL_GET_NUM_ANGLES 9
f6c0bce13b17 NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
nicodvb
parents: 25547
diff changeset
89 #define STREAM_CTRL_GET_ANGLE 10
f6c0bce13b17 NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
nicodvb
parents: 25547
diff changeset
90 #define STREAM_CTRL_SET_ANGLE 11
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
91
27753
6c915906bbc6 Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.
diego
parents: 27397
diff changeset
92
30655
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
93 typedef enum {
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
94 streaming_stopped_e,
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
95 streaming_playing_e
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
96 } streaming_status;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
97
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
98 typedef struct streaming_control {
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
99 URL_t *url;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
100 streaming_status status;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
101 int buffering; // boolean
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
102 unsigned int prebuffer_size;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
103 char *buffer;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
104 unsigned int buffer_size;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
105 unsigned int buffer_pos;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
106 unsigned int bandwidth; // The downstream available
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
107 int (*streaming_read)( int fd, char *buffer, int buffer_size, struct streaming_control *stream_ctrl );
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
108 int (*streaming_seek)( int fd, off_t pos, struct streaming_control *stream_ctrl );
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
109 void *data;
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
110 } streaming_ctrl_t;
3043
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
111
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
112 struct stream_st;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
113 typedef struct stream_info_st {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
114 const char *info;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
115 const char *name;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
116 const char *author;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
117 const char *comment;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
118 /// mode isn't used atm (ie always READ) but it shouldn't be ignored
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
119 /// opts is at least in it's defaults settings and may have been
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
120 /// altered by url parsing if enabled and the options string parsing.
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
121 int (*open)(struct stream_st* st, int mode, void* opts, int* file_format);
25690
7b66e1a132de stream_info_t opts and protocols point to constant data as well.
reimar
parents: 25572
diff changeset
122 const char* protocols[MAX_STREAM_PROTOCOLS];
7b66e1a132de stream_info_t opts and protocols point to constant data as well.
reimar
parents: 25572
diff changeset
123 const void* opts;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
124 int opts_url; /* If this is 1 we will parse the url as an option string
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
125 * too. Otherwise options are only parsed from the
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
126 * options string given to open_stream_plugin */
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
127 } stream_info_t;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
128
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 7854
diff changeset
129 typedef struct stream_st {
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
130 // Read
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
131 int (*fill_buffer)(struct stream_st *s, char* buffer, int max_len);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
132 // Write
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
133 int (*write_buffer)(struct stream_st *s, char* buffer, int len);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
134 // Seek
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
135 int (*seek)(struct stream_st *s,off_t pos);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
136 // Control
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
137 // Will be later used to let streams like dvd and cdda report
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
138 // their structure (ie tracks, chapters, etc)
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
139 int (*control)(struct stream_st *s,int cmd,void* arg);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
140 // Close
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
141 void (*close)(struct stream_st *s);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
142
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
143 int fd; // file descriptor, see man open(2)
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
144 int type; // see STREAMTYPE_*
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
145 int flags;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
146 int sector_size; // sector size (seek will be aligned on this size if non 0)
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
147 unsigned int buf_pos,buf_len;
6224
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 5819
diff changeset
148 off_t pos,start_pos,end_pos;
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 5819
diff changeset
149 int eof;
21655
b7e2f8fd263e added member and definitions for output streams
nicodvb
parents: 20744
diff changeset
150 int mode; //STREAM_READ or STREAM_WRITE
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
151 unsigned int cache_pid;
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
152 void* cache_data;
7329
9129781e5939 removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents: 7245
diff changeset
153 void* priv; // used for DVD, TV, RTSP etc
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
154 char* url; // strdup() of filename/url
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27341
diff changeset
155 #ifdef CONFIG_NETWORK
3043
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
156 streaming_ctrl_t *streaming_ctrl;
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
157 #endif
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
158 unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
159 } stream_t;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
160
30655
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
161 #ifdef CONFIG_NETWORK
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
162 #include "network.h"
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
163 #endif
73d7c7884b0c Move struct streaming_control from network.h to stream.h, where it is used.
diego
parents: 30649
diff changeset
164
30649
77cc0ca2c757 Declare stream_fill_buffer() and stream_seek_long() unconditionally.
diego
parents: 30626
diff changeset
165 int stream_fill_buffer(stream_t *s);
77cc0ca2c757 Declare stream_fill_buffer() and stream_seek_long() unconditionally.
diego
parents: 30626
diff changeset
166 int stream_seek_long(stream_t *s, off_t pos);
77cc0ca2c757 Declare stream_fill_buffer() and stream_seek_long() unconditionally.
diego
parents: 30626
diff changeset
167
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26326
diff changeset
168 #ifdef CONFIG_STREAM_CACHE
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4551
diff changeset
169 int stream_enable_cache(stream_t *stream,int size,int min,int prefill);
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
170 int cache_stream_fill_buffer(stream_t *s);
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
171 int cache_stream_seek_long(stream_t *s,off_t pos);
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
172 #else
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
173 // no cache, define wrappers:
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
174 #define cache_stream_fill_buffer(x) stream_fill_buffer(x)
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
175 #define cache_stream_seek_long(x,y) stream_seek_long(x,y)
5292
1863e0c6af59 sys/types.h required for off_t
arpi
parents: 5133
diff changeset
176 #define stream_enable_cache(x,y,z,w) 1
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
177 #endif
21655
b7e2f8fd263e added member and definitions for output streams
nicodvb
parents: 20744
diff changeset
178 int stream_write_buffer(stream_t *s, unsigned char *buf, int len);
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
179
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
180 inline static int stream_read_char(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
181 return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]:
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
182 (cache_stream_fill_buffer(s)?s->buffer[s->buf_pos++]:-256);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
183 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++];
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
184 // stream_fill_buffer(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
185 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++];
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
186 // return 0; // EOF
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
187 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
188
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
189 inline static unsigned int stream_read_word(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
190 int x,y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
191 x=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
192 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
193 return (x<<8)|y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
194 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
195
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
196 inline static unsigned int stream_read_dword(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
197 unsigned int y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
198 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
199 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
200 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
201 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
202 return y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
203 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
204
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4042
diff changeset
205 #define stream_read_fourcc stream_read_dword_le
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4042
diff changeset
206
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
207 inline static unsigned int stream_read_word_le(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
208 int x,y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
209 x=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
210 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
211 return (y<<8)|x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
212 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
213
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
214 inline static unsigned int stream_read_dword_le(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
215 unsigned int y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
216 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
217 y|=stream_read_char(s)<<8;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
218 y|=stream_read_char(s)<<16;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
219 y|=stream_read_char(s)<<24;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
220 return y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
221 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
222
3998
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
223 inline static uint64_t stream_read_qword(stream_t *s){
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
224 uint64_t y;
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
225 y = stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
226 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
227 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
228 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
229 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
230 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
231 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
232 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
233 return y;
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
234 }
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
235
11807
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
236 inline static uint64_t stream_read_qword_le(stream_t *s){
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
237 uint64_t y;
24079
f40ff9321699 Fix a bug in stream_read_qword_le due to sign extension from int to uint64_t.
reimar
parents: 23689
diff changeset
238 y = stream_read_dword_le(s);
f40ff9321699 Fix a bug in stream_read_qword_le due to sign extension from int to uint64_t.
reimar
parents: 23689
diff changeset
239 y|=(uint64_t)stream_read_dword_le(s)<<32;
11807
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
240 return y;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
241 }
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
242
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
243 inline static unsigned int stream_read_int24(stream_t *s){
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
244 unsigned int y;
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
245 y = stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
246 y=(y<<8)|stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
247 y=(y<<8)|stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
248 return y;
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
249 }
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
250
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
251 inline static int stream_read(stream_t *s,char* mem,int total){
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
252 int len=total;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
253 while(len>0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
254 int x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
255 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
256 if(x==0){
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
257 if(!cache_stream_fill_buffer(s)) return total-len; // EOF
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
258 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
259 }
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
260 if(s->buf_pos>s->buf_len) mp_msg(MSGT_DEMUX, MSGL_WARN, "stream_read: WARNING! s->buf_pos>s->buf_len\n");
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
261 if(x>len) x=len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
262 memcpy(mem,&s->buffer[s->buf_pos],x);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
263 s->buf_pos+=x; mem+=x; len-=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
264 }
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
265 return total;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
266 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
267
17879
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
268 inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) {
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
269 int len;
28576
a6b506faeb34 Replace double semicolon by single semicolon.
diego
parents: 27775
diff changeset
270 unsigned char* end,*ptr = mem;
17879
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
271 do {
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
272 len = s->buf_len-s->buf_pos;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
273 // try to fill the buffer
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
274 if(len <= 0 &&
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28576
diff changeset
275 (!cache_stream_fill_buffer(s) ||
17879
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
276 (len = s->buf_len-s->buf_pos) <= 0)) break;
17880
c0fa48581ccf Fix compilation with stupid C++ compilers that shock on valid C
albeu
parents: 17879
diff changeset
277 end = (unsigned char*) memchr((void*)(s->buffer+s->buf_pos),'\n',len);
17879
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
278 if(end) len = end - (s->buffer+s->buf_pos) + 1;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
279 if(len > 0 && max > 1) {
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
280 int l = len > max-1 ? max-1 : len;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
281 memcpy(ptr,s->buffer+s->buf_pos,l);
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
282 max -= l;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
283 ptr += l;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
284 }
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
285 s->buf_pos += len;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
286 } while(!end);
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
287 if(s->eof && ptr == mem) return NULL;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
288 if(max > 0) ptr[0] = 0;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
289 return mem;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
290 }
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
291
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
292
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
293 inline static int stream_eof(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
294 return s->eof;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
295 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
296
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
297 inline static off_t stream_tell(stream_t *s){
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
298 return s->pos+s->buf_pos-s->buf_len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
299 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
300
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
301 inline static int stream_seek(stream_t *s,off_t pos){
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
302
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
303 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%qX\n",(long long)pos);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
304
30626
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30426
diff changeset
305 if(s->eof)
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30426
diff changeset
306 return 0;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
307 if(pos<s->pos){
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
308 off_t x=pos-(s->pos-s->buf_len);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
309 if(x>=0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
310 s->buf_pos=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
311 // putchar('*');fflush(stdout);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
312 return 1;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
313 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
314 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28576
diff changeset
315
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
316 return cache_stream_seek_long(s,pos);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
317 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
318
3962
449fc79d1ae3 stream_skip len s/be off_t
steve
parents: 3753
diff changeset
319 inline static int stream_skip(stream_t *s,off_t len){
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29888
diff changeset
320 if( (len<0 && (s->flags & MP_STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & MP_STREAM_SEEK_FW)) ) {
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
321 // negative or big skip!
1491
41e82ba06d1b return type of stream_seek changed void->int
arpi
parents: 1428
diff changeset
322 return stream_seek(s,stream_tell(s)+len);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
323 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
324 while(len>0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
325 int x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
326 if(x==0){
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
327 if(!cache_stream_fill_buffer(s)) return 0; // EOF
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
328 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
329 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
330 if(x>len) x=len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
331 //memcpy(mem,&s->buf[s->buf_pos],x);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
332 s->buf_pos+=x; len-=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
333 }
1491
41e82ba06d1b return type of stream_seek changed void->int
arpi
parents: 1428
diff changeset
334 return 1;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
335 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
336
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
337 void stream_reset(stream_t *s);
17712
a320248c2450 stream_control() returns int, not void
nicodvb
parents: 17697
diff changeset
338 int stream_control(stream_t *s, int cmd, void *arg);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
339 stream_t* new_stream(int fd,int type);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
340 void free_stream(stream_t *s);
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 1594
diff changeset
341 stream_t* new_memory_stream(unsigned char* data,int len);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
342 stream_t* open_stream(char* filename,char** options,int* file_format);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
343 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format);
21655
b7e2f8fd263e added member and definitions for output streams
nicodvb
parents: 20744
diff changeset
344 stream_t* open_output_stream(char* filename,char** options);
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26029
diff changeset
345 /// Set the callback to be used by libstream to check for user
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26029
diff changeset
346 /// interruption during long blocking operations (cache filling, etc).
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26029
diff changeset
347 void stream_set_interrupt_callback(int (*cb)(int));
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26029
diff changeset
348 /// Call the interrupt checking callback if there is one.
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26029
diff changeset
349 int stream_check_interrupt(int time);
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
350
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
351 extern int dvd_title;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
352 extern int dvd_chapter;
4291
e889d37f25b2 Add option -last-chapter for DVD playing/encoding
kmkaplan
parents: 4189
diff changeset
353 extern int dvd_last_chapter;
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
354 extern int dvd_angle;
998
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
355
6623
7bc4c6ba9485 add -audiofile support for gui
pontscho
parents: 6384
diff changeset
356 extern char * audio_stream;
7bc4c6ba9485 add -audiofile support for gui
pontscho
parents: 6384
diff changeset
357
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
358 typedef struct {
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
359 int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28576
diff changeset
360 int language;
6651
8f49c75a2824 - add icon (nice, but very ugly hakk:)
pontscho
parents: 6623
diff changeset
361 int type;
8f49c75a2824 - add icon (nice, but very ugly hakk:)
pontscho
parents: 6623
diff changeset
362 int channels;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
363 } stream_language_t;
3048
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
364
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25690
diff changeset
365 #endif /* MPLAYER_STREAM_H */