annotate libmpdemux/stream_vcd.c @ 17300:335ca842bf7e

Reverse commit 31 Dec 2005 18:56:35 -0000 1.34 This was an incorrect fix made at the codec when it should be done at the demuxer level. static variables in codecs are ALWAYS wrong: the demuxer is supposed to have already removed all the junk Does anyone have an idea of a fix for the demuxer? (discussed on IRC)
author gpoirier
date Tue, 03 Jan 2006 22:06:12 +0000
parents 6ff3379a0862
children d2d9d011203f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
1
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
2 #include "config.h"
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
3
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
4 #ifdef HAVE_VCD
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
5 #include "mp_msg.h"
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
6 #include "stream.h"
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
7 #include "help_mp.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15912
diff changeset
8 #include "m_option.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15912
diff changeset
9 #include "m_struct.h"
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
10
10121
d42177a0da2a Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents: 9886
diff changeset
11 #include <fcntl.h>
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
12 #include <stdlib.h>
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
13 #include <unistd.h>
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
14 #include <sys/ioctl.h>
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
15 #include <errno.h>
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
16
15566
3758536dcef3 DragonFly BSD support
diego
parents: 15057
diff changeset
17 #if defined(__FreeBSD__) || defined(__DragonFly__)
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
18 #include <sys/cdrio.h>
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
19 #include "vcd_read_fbsd.h"
12797
b2419eef04da OpenBSD portability patches from the OpenBSD ports tree
diego
parents: 10591
diff changeset
20 #elif defined(__NetBSD__) || defined (__OpenBSD__)
13678
dc1facd7c7b0 add vcd support to darwin for ppc
nplourde
parents: 12797
diff changeset
21 #include "vcd_read_nbsd.h"
13681
e52daf7f3bcc enable vcd for all darwin based sys not only mac osx
nplourde
parents: 13678
diff changeset
22 #elif defined(SYS_DARWIN)
e52daf7f3bcc enable vcd for all darwin based sys not only mac osx
nplourde
parents: 13678
diff changeset
23 #include "vcd_read_darwin.h"
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
24 #else
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
25 #include "vcd_read.h"
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
26 #endif
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
27
10591
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
28 extern char *cdrom_device;
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
29
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
30 static struct stream_priv_s {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
31 int track;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
32 char* device;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
33 } stream_priv_dflts = {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
34 1,
10591
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
35 NULL
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
36 };
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
37
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
38 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f)
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
39 /// URL definition
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
40 static m_option_t stream_opts_fields[] = {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
41 { "track", ST_OFF(track), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL },
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
42 { "device", ST_OFF(device), CONF_TYPE_STRING, 0, 0 ,0, NULL},
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
43 /// For url parsing
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
44 { "hostname", ST_OFF(track), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL },
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
45 { "filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0 ,0, NULL},
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
46 { NULL, NULL, 0, 0, 0, 0, NULL }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
47 };
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
48 static struct m_struct_st stream_opts = {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
49 "vcd",
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
50 sizeof(struct stream_priv_s),
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
51 &stream_priv_dflts,
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
52 stream_opts_fields
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
53 };
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
54
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
55 static int fill_buffer(stream_t *s, char* buffer, int max_len){
15912
25feca1387e7 don't read past the end of the selected track
nicodvb
parents: 15566
diff changeset
56 if(s->pos > s->end_pos) /// don't past end of current track
25feca1387e7 don't read past the end of the selected track
nicodvb
parents: 15566
diff changeset
57 return 0;
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
58 return vcd_read(s->priv,buffer);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
59 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
60
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
61 static int seek(stream_t *s,off_t newpos) {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
62 s->pos = newpos;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
63 vcd_set_msf(s->priv,s->pos/VCD_SECTOR_DATA);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
64 return 1;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
65 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
66
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
67 static void close_s(stream_t *stream) {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
68 free(stream->priv);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
69 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
70
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
71 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
72 struct stream_priv_s* p = (struct stream_priv_s*)opts;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
73 int ret,ret2,f;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
74 mp_vcd_priv_t* vcd;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
75 #ifdef __FreeBSD__
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
76 int bsize = VCD_SECTOR_SIZE;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
77 #endif
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
78
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
79 if(mode != STREAM_READ) {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
80 m_struct_free(&stream_opts,opts);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
81 return STREAM_UNSUPORTED;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
82 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
83
10591
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
84 if (!p->device) {
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
85 if(cdrom_device)
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
86 p->device = strdup(cdrom_device);
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
87 else
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
88 p->device = strdup(DEFAULT_CDROM_DEVICE);
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
89 }
0d381b648b51 Fix -cdrom-device to work again with cdda and vcd.
albeu
parents: 10121
diff changeset
90
9886
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
91 f=open(p->device,O_RDONLY);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
92 if(f<0){
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
93 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CdDevNotfound,p->device);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
94 m_struct_free(&stream_opts,opts);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
95 return STREAM_ERROR;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
96 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
97
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
98 vcd = vcd_read_toc(f);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
99 if(!vcd) {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
100 mp_msg(MSGT_OPEN,MSGL_ERR,"Failed to get cd toc\n");
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
101 close(f);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
102 m_struct_free(&stream_opts,opts);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
103 return STREAM_ERROR;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
104 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
105 ret2=vcd_get_track_end(vcd,p->track);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
106 if(ret2<0){
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
107 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (get)\n");
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
108 close(f);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
109 free(vcd);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
110 m_struct_free(&stream_opts,opts);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
111 return STREAM_ERROR;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
112 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
113 ret=vcd_seek_to_track(vcd,p->track);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
114 if(ret<0){
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
115 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (seek)\n");
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
116 close(f);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
117 free(vcd);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
118 m_struct_free(&stream_opts,opts);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
119 return STREAM_ERROR;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
120 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
121 mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X end: 0x%X\n",ret,ret2);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
122
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
123 #ifdef __FreeBSD__
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
124 if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
125 mp_msg(MSGT_OPEN,MSGL_WARN,"Error in CDRIOCSETBLOCKSIZE");
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
126 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
127 #endif
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
128
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
129 stream->fd = f;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
130 stream->type = STREAMTYPE_VCD;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
131 stream->sector_size = VCD_SECTOR_DATA;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
132 stream->start_pos=ret;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
133 stream->end_pos=ret2;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
134 stream->priv = vcd;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
135
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
136 stream->fill_buffer = fill_buffer;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
137 stream->seek = seek;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
138 stream->close = close_s;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
139
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
140 m_struct_free(&stream_opts,opts);
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
141 return STREAM_OK;
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
142 }
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
143
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
144 stream_info_t stream_info_vcd = {
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
145 "Video CD",
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
146 "vcd",
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
147 "Albeu",
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
148 "based on the code from ???",
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
149 open_s,
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
150 { "vcd", NULL },
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
151 &stream_opts,
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
152 1 // Urls are an option string
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
153 };
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
154
e578e4375434 Port vcd to the new API
albeu
parents:
diff changeset
155 #endif