annotate libmpdemux/stream.h @ 18057:0e7291ee4b6b

Replace deprecated function
author nplourde
date Sat, 08 Apr 2006 16:16:48 +0000
parents 976fff94d59c
children bee3186a06f7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
998
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
1 #ifndef __STREAM_H
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
2 #define __STREAM_H
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
3
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
4 #include "mp_msg.h"
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
5 #include <string.h>
4029
3c87dee7a324 patch for missing include by Steven M. Schultz <sms@2BSD.COM>
pl
parents: 3998
diff changeset
6 #include <inttypes.h>
5292
1863e0c6af59 sys/types.h required for off_t
arpi
parents: 5133
diff changeset
7 #include <sys/types.h>
4029
3c87dee7a324 patch for missing include by Steven M. Schultz <sms@2BSD.COM>
pl
parents: 3998
diff changeset
8
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
9 #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
10 #define STREAMTYPE_FILE 0 // read from seekable file
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
11 #define STREAMTYPE_VCD 1 // raw mode-2 CDROM reading, 2324 bytes/sector
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
12 #define STREAMTYPE_STREAM 2 // same as FILE but no seeking (for net/stdin)
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
13 #define STREAMTYPE_DVD 3 // libdvdread
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
14 #define STREAMTYPE_MEMORY 4 // read data from memory area
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
15 #define STREAMTYPE_PLAYLIST 6 // FIXME!!! same as STREAMTYPE_FILE now
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
16 #define STREAMTYPE_DS 8 // read from a demuxer stream
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
17 #define STREAMTYPE_DVDNAV 9 // we cannot safely "seek" in this...
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
18 #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
19 #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
20 #define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 8782
diff changeset
21 #define STREAMTYPE_DVB 13
14836
8b9738526dd7 added a stream module for the vstream client library
joey
parents: 13089
diff changeset
22 #define STREAMTYPE_VSTREAM 14
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14836
diff changeset
23 #define STREAMTYPE_SDP 15
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
24
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
25 #define STREAM_BUFFER_SIZE 2048
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
26
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
27 #define VCD_SECTOR_SIZE 2352
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
28 #define VCD_SECTOR_OFFS 24
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
29 #define VCD_SECTOR_DATA 2324
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
30
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
31 /// atm it will always use mode == STREAM_READ
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
32 /// streams that use the new api should check the mode at open
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
33 #define STREAM_READ 0
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
34 #define STREAM_WRITE 1
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
35 /// Seek flags, if not mannualy set and s->seek isn't NULL
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
36 /// STREAM_SEEK is automaticly set
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
37 #define STREAM_SEEK_BW 2
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
38 #define STREAM_SEEK_FW 4
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
39 #define STREAM_SEEK (STREAM_SEEK_BW|STREAM_SEEK_FW)
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
40
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
41 //////////// Open return code
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
42 /// This can't open the requested protocol (used by stream wich have a
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
43 /// * protocol when they don't know the requested protocol)
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
44 #define STREAM_UNSUPORTED -1
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
45 #define STREAM_ERROR 0
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
46 #define STREAM_OK 1
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
47
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
48 #define MAX_STREAM_PROTOCOLS 10
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
49
9851
6a348d3ed626 A new control called upon stream reset.
albeu
parents: 9825
diff changeset
50 #define STREAM_CTRL_RESET 0
17696
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17012
diff changeset
51 #define STREAM_CTRL_GET_TIME_LENGTH 1
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
52
10121
d42177a0da2a Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents: 9886
diff changeset
53 #ifdef MPLAYER_NETWORK
3043
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
54 #include "network.h"
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
55 #endif
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
56
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
57 struct stream_st;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
58 typedef struct stream_info_st {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
59 const char *info;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
60 const char *name;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
61 const char *author;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
62 const char *comment;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
63 /// 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
64 /// opts is at least in it's defaults settings and may have been
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
65 /// altered by url parsing if enabled and the options string parsing.
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
66 int (*open)(struct stream_st* st, int mode, void* opts, int* file_format);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
67 char* protocols[MAX_STREAM_PROTOCOLS];
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
68 void* opts;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
69 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
70 * too. Otherwise options are only parsed from the
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
71 * options string given to open_stream_plugin */
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
72 } stream_info_t;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
73
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 7854
diff changeset
74 typedef struct stream_st {
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
75 // Read
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
76 int (*fill_buffer)(struct stream_st *s, char* buffer, int max_len);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
77 // Write
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
78 int (*write_buffer)(struct stream_st *s, char* buffer, int len);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
79 // Seek
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
80 int (*seek)(struct stream_st *s,off_t pos);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
81 // Control
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
82 // Will be later used to let streams like dvd and cdda report
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
83 // their structure (ie tracks, chapters, etc)
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
84 int (*control)(struct stream_st *s,int cmd,void* arg);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
85 // Close
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
86 void (*close)(struct stream_st *s);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
87
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
88 int fd; // file descriptor, see man open(2)
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
89 int type; // see STREAMTYPE_*
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
90 int flags;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
91 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
92 unsigned int buf_pos,buf_len;
6224
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 5819
diff changeset
93 off_t pos,start_pos,end_pos;
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 5819
diff changeset
94 int eof;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
95 unsigned int cache_pid;
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
96 void* cache_data;
7329
9129781e5939 removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents: 7245
diff changeset
97 void* priv; // used for DVD, TV, RTSP etc
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
98 char* url; // strdup() of filename/url
10121
d42177a0da2a Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents: 9886
diff changeset
99 #ifdef MPLAYER_NETWORK
3043
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
100 streaming_ctrl_t *streaming_ctrl;
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
101 #endif
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
102 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
103 } stream_t;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
104
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
105 #ifdef USE_STREAM_CACHE
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4551
diff changeset
106 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
107 int cache_stream_fill_buffer(stream_t *s);
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
108 int cache_stream_seek_long(stream_t *s,off_t pos);
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
109 #else
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
110 // no cache, define wrappers:
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
111 #define cache_stream_fill_buffer(x) stream_fill_buffer(x)
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
112 #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
113 #define stream_enable_cache(x,y,z,w) 1
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
114 #endif
15954
341bfd887e36 small warning fix:
rathann
parents: 15585
diff changeset
115 void fixup_network_stream_cache(stream_t *stream);
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
116
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
117 inline static int stream_read_char(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
118 return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]:
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
119 (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
120 // 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
121 // stream_fill_buffer(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
122 // 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
123 // return 0; // EOF
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
124 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
125
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
126 inline static unsigned int stream_read_word(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
127 int x,y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
128 x=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
129 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
130 return (x<<8)|y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
131 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
132
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
133 inline static unsigned int stream_read_dword(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
134 unsigned int y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
135 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
136 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
137 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
138 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
139 return y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
140 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
141
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4042
diff changeset
142 #define stream_read_fourcc stream_read_dword_le
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4042
diff changeset
143
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
144 inline static unsigned int stream_read_word_le(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
145 int x,y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
146 x=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
147 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
148 return (y<<8)|x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
149 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
150
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
151 inline static unsigned int stream_read_dword_le(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
152 unsigned int y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
153 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
154 y|=stream_read_char(s)<<8;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
155 y|=stream_read_char(s)<<16;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
156 y|=stream_read_char(s)<<24;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
157 return y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
158 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
159
3998
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
160 inline static uint64_t stream_read_qword(stream_t *s){
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
161 uint64_t y;
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
162 y = stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
163 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
164 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
165 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
166 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
167 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
168 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
169 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
170 return y;
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
171 }
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
172
11807
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
173 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
174 uint64_t y;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
175 y = stream_read_char(s);
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
176 y|=stream_read_char(s)<<8;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
177 y|=stream_read_char(s)<<16;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
178 y|=stream_read_char(s)<<24;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
179 y|=(uint64_t)stream_read_char(s)<<32;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
180 y|=(uint64_t)stream_read_char(s)<<40;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
181 y|=(uint64_t)stream_read_char(s)<<48;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
182 y|=(uint64_t)stream_read_char(s)<<56;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
183 return y;
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
184 }
9a81d7b4c0b6 Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents: 10594
diff changeset
185
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
186 inline static unsigned int stream_read_int24(stream_t *s){
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
187 unsigned int y;
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
188 y = stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
189 y=(y<<8)|stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
190 y=(y<<8)|stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
191 return y;
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
192 }
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
193
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
194 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
195 int len=total;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
196 while(len>0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
197 int x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
198 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
199 if(x==0){
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
200 if(!cache_stream_fill_buffer(s)) return total-len; // EOF
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
201 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
202 }
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
203 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
204 if(x>len) x=len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
205 memcpy(mem,&s->buffer[s->buf_pos],x);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
206 s->buf_pos+=x; mem+=x; len-=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
207 }
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
208 return total;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
209 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
210
17879
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
211 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
212 int len;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
213 unsigned char* end,*ptr = mem;;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
214 do {
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
215 len = s->buf_len-s->buf_pos;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
216 // try to fill the buffer
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
217 if(len <= 0 &&
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
218 (!cache_stream_fill_buffer(s) ||
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
219 (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
220 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
221 if(end) len = end - (s->buffer+s->buf_pos) + 1;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
222 if(len > 0 && max > 1) {
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
223 int l = len > max-1 ? max-1 : len;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
224 memcpy(ptr,s->buffer+s->buf_pos,l);
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
225 max -= l;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
226 ptr += l;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
227 }
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
228 s->buf_pos += len;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
229 } while(!end);
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
230 if(s->eof && ptr == mem) return NULL;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
231 if(max > 0) ptr[0] = 0;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
232 return mem;
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
233 }
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
234
0ca3fb62d2da Move the subread from FILE to stream_t.
albeu
parents: 17713
diff changeset
235
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
236 inline static int stream_eof(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
237 return s->eof;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
238 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
239
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
240 inline static off_t stream_tell(stream_t *s){
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
241 return s->pos+s->buf_pos-s->buf_len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
242 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
243
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
244 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
245
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
246 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
247
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
248 if(pos<s->pos){
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
249 off_t x=pos-(s->pos-s->buf_len);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
250 if(x>=0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
251 s->buf_pos=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
252 // putchar('*');fflush(stdout);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
253 return 1;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
254 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
255 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
256
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
257 return cache_stream_seek_long(s,pos);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
258 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
259
3962
449fc79d1ae3 stream_skip len s/be off_t
steve
parents: 3753
diff changeset
260 inline static int stream_skip(stream_t *s,off_t len){
12018
2c2fb4457982 Seek in HTTP streams and stdin seek fixes
rtognimp
parents: 11965
diff changeset
261 if( (len<0 && (s->flags & STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK_FW)) ) {
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
262 // negative or big skip!
1491
41e82ba06d1b return type of stream_seek changed void->int
arpi
parents: 1428
diff changeset
263 return stream_seek(s,stream_tell(s)+len);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
264 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
265 while(len>0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
266 int x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
267 if(x==0){
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
268 if(!cache_stream_fill_buffer(s)) return 0; // EOF
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
269 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
270 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
271 if(x>len) x=len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
272 //memcpy(mem,&s->buf[s->buf_pos],x);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
273 s->buf_pos+=x; len-=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
274 }
1491
41e82ba06d1b return type of stream_seek changed void->int
arpi
parents: 1428
diff changeset
275 return 1;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
276 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
277
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
278 void stream_reset(stream_t *s);
17712
a320248c2450 stream_control() returns int, not void
nicodvb
parents: 17697
diff changeset
279 int stream_control(stream_t *s, int cmd, void *arg);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
280 stream_t* new_stream(int fd,int type);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
281 void free_stream(stream_t *s);
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 1594
diff changeset
282 stream_t* new_memory_stream(unsigned char* data,int len);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
283 stream_t* open_stream(char* filename,char** options,int* file_format);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9746
diff changeset
284 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format);
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
285
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
286 //#ifdef USE_DVDREAD
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
287 extern int dvd_title;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
288 extern int dvd_chapter;
4291
e889d37f25b2 Add option -last-chapter for DVD playing/encoding
kmkaplan
parents: 4189
diff changeset
289 extern int dvd_last_chapter;
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
290 extern int dvd_angle;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
291 //#endif
998
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
292
6623
7bc4c6ba9485 add -audiofile support for gui
pontscho
parents: 6384
diff changeset
293 extern char * audio_stream;
7bc4c6ba9485 add -audiofile support for gui
pontscho
parents: 6384
diff changeset
294
5471
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
295 #ifdef USE_DVDNAV
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
296 #include "dvdnav_stream.h"
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
297 #endif
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
298
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
299 #ifdef USE_DVDREAD
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
300
5819
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
301 #ifdef USE_MPDVDKIT
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15954
diff changeset
302 #include "libmpdvdkit2/dvd_reader.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15954
diff changeset
303 #include "libmpdvdkit2/ifo_types.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15954
diff changeset
304 #include "libmpdvdkit2/ifo_read.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15954
diff changeset
305 #include "libmpdvdkit2/nav_read.h"
7196
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
306 #else
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
307 #include <dvdread/dvd_reader.h>
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
308 #include <dvdread/ifo_types.h>
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
309 #include <dvdread/ifo_read.h>
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
310 #include <dvdread/nav_read.h>
5819
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
311 #endif
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
312
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
313 typedef struct {
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
314 int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
315 int language;
6651
8f49c75a2824 - add icon (nice, but very ugly hakk:)
pontscho
parents: 6623
diff changeset
316 int type;
8f49c75a2824 - add icon (nice, but very ugly hakk:)
pontscho
parents: 6623
diff changeset
317 int channels;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
318 } stream_language_t;
3048
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
319
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
320 typedef struct {
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
321 dvd_reader_t *dvd;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
322 dvd_file_t *title;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
323 ifo_handle_t *vmg_file;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
324 tt_srpt_t *tt_srpt;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
325 ifo_handle_t *vts_file;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
326 vts_ptt_srpt_t *vts_ptt_srpt;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
327 pgc_t *cur_pgc;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
328 //
17697
3a56bbef9300 added cur_title to dvd_priv_t in order to keep track of dvd title currently playing (range 1..N)
nicodvb
parents: 17696
diff changeset
329 int cur_title;
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
330 int cur_cell;
4291
e889d37f25b2 Add option -last-chapter for DVD playing/encoding
kmkaplan
parents: 4189
diff changeset
331 int last_cell;
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
332 int cur_pack;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
333 int cell_last_pack;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
334 // Navi:
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
335 int packs_left;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
336 dsi_t dsi_pack;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
337 int angle_seek;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
338 // audio datas
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
339 int nr_of_channels;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
340 stream_language_t audio_streams[32];
3048
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
341 // subtitles
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
342 int nr_of_subtitles;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
343 stream_language_t subtitles[32];
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
344 } dvd_priv_t;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
345
13089
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 12018
diff changeset
346 int dvd_number_of_subs(stream_t *stream);
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 12018
diff changeset
347 int dvd_lang_from_sid(stream_t *stream, int id);
3753
d3fc41a04cb7 dvd language->aid/sid functions
arpi
parents: 3751
diff changeset
348 int dvd_aid_from_lang(stream_t *stream, unsigned char* lang);
d3fc41a04cb7 dvd language->aid/sid functions
arpi
parents: 3751
diff changeset
349 int dvd_sid_from_lang(stream_t *stream, unsigned char* lang);
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7630
diff changeset
350 int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
3753
d3fc41a04cb7 dvd language->aid/sid functions
arpi
parents: 3751
diff changeset
351
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
352 #endif
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
353
998
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
354 #endif // __STREAM_H