Mercurial > mplayer.hg
annotate libmpdemux/demux_mf.c @ 9301:7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
playlists) This affects also the gui (filenames with space)
patch by Fabian Franz <FabianFranz@gmx.de>
author | arpi |
---|---|
date | Thu, 06 Feb 2003 20:57:25 +0000 |
parents | 946b14a9e743 |
children | 87e03d96a4cd |
rev | line source |
---|---|
4550 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
4 #include <unistd.h> | |
5 #include <sys/types.h> | |
6 #include <sys/stat.h> | |
7 #include <unistd.h> | |
8 | |
9 #include "config.h" | |
10 #include "mp_msg.h" | |
11 #include "help_mp.h" | |
12 | |
13 #include "stream.h" | |
14 #include "demuxer.h" | |
15 #include "stheader.h" | |
16 #include "mf.h" | |
17 | |
18 void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags){ | |
7407 | 19 mf_t * mf = (mf_t *)demuxer->priv; |
4565 | 20 sh_video_t * sh_video = demuxer->video->sh; |
21 int newpos = (flags & 1)?0:mf->curr_frame; | |
22 | |
7407 | 23 if ( flags & 2 ) newpos+=rel_seek_secs*mf->nr_of_files; |
4565 | 24 else newpos+=rel_seek_secs * sh_video->fps; |
25 if ( newpos < 0 ) newpos=0; | |
7407 | 26 if( newpos > mf->nr_of_files) newpos=mf->nr_of_files; |
4565 | 27 mf->curr_frame=newpos; |
4550 | 28 } |
29 | |
30 // return value: | |
31 // 0 = EOF or no stream found | |
32 // 1 = successfully read a packet | |
33 int demux_mf_fill_buffer(demuxer_t *demuxer){ | |
34 mf_t * mf; | |
35 struct stat fs; | |
36 FILE * f; | |
37 | |
7407 | 38 mf=(mf_t*)demuxer->priv; |
39 if ( mf->curr_frame >= mf->nr_of_files ) return 0; | |
4550 | 40 |
7407 | 41 stat( mf->names[mf->curr_frame],&fs ); |
42 // printf( "[demux_mf] frame: %d (%s,%d)\n",mf->curr_frame,mf->names[mf->curr_frame],fs.st_size ); | |
4550 | 43 |
7407 | 44 if ( !( f=fopen( mf->names[mf->curr_frame],"r" ) ) ) return 0; |
4550 | 45 { |
46 sh_video_t * sh_video = demuxer->video->sh; | |
47 demux_packet_t * dp = new_demux_packet( fs.st_size ); | |
4565 | 48 if ( !fread( dp->buffer,fs.st_size,1,f ) ) return 0; |
7407 | 49 dp->pts=mf->curr_frame / sh_video->fps; |
50 dp->pos=mf->curr_frame; | |
4550 | 51 dp->flags=0; |
52 // append packet to DS stream: | |
53 ds_add_packet( demuxer->video,dp ); | |
54 } | |
55 fclose( f ); | |
56 | |
7407 | 57 mf->curr_frame++; |
4550 | 58 return 1; |
59 } | |
60 | |
61 demuxer_t* demux_open_mf(demuxer_t* demuxer){ | |
62 sh_video_t *sh_video = NULL; | |
63 mf_t *mf = NULL; | |
7407 | 64 |
65 if(!demuxer->stream->url) return NULL; | |
9148
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
66 |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
67 if(!mf_type){ |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
68 char* p=strrchr(demuxer->stream->url,'.'); |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
69 if(!p){ |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
70 mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] file type was not set! (try -mf type=xxx)\n" ); |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
71 free( mf ); return NULL; |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
72 } |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
73 mf_type=strdup(p+1); |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
74 mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] file type was not set! trying 'type=%s'...\n", mf_type); |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
75 } |
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
76 |
7407 | 77 mf=open_mf(demuxer->stream->url); |
78 if(!mf) return NULL; | |
79 mf->curr_frame=0; | |
4550 | 80 |
81 demuxer->movi_start = 0; | |
82 demuxer->movi_end = mf->nr_of_files - 1; | |
83 | |
84 // create a new video stream header | |
85 sh_video = new_sh_video(demuxer, 0); | |
86 // make sure the demuxer knows about the new video stream header | |
87 // (even though new_sh_video() ought to take care of it) | |
88 demuxer->video->sh = sh_video; | |
89 | |
90 // make sure that the video demuxer stream header knows about its | |
91 // parent video demuxer stream (this is getting wacky), or else | |
92 // video_read_properties() will choke | |
93 sh_video->ds = demuxer->video; | |
9148
946b14a9e743
type autodetection (from filemask/filelist extension)
arpi
parents:
7407
diff
changeset
|
94 |
4656 | 95 if ( !strcasecmp( mf_type,"jpg" ) || |
5029 | 96 !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('I', 'J', 'P', 'G'); |
7362 | 97 else |
4656 | 98 if ( !strcasecmp( mf_type,"png" )) sh_video->format = mmioFOURCC('M', 'P', 'N', 'G' ); |
7362 | 99 else |
100 if ( !strcasecmp( mf_type,"tga" )) sh_video->format = mmioFOURCC('M', 'T', 'G', 'A' ); | |
7407 | 101 else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( mf ); return NULL; } |
4550 | 102 |
103 sh_video->disp_w = mf_w; | |
104 sh_video->disp_h = mf_h; | |
105 sh_video->fps = mf_fps; | |
106 sh_video->frametime = 1 / sh_video->fps; | |
107 | |
4556 | 108 // emulate BITMAPINFOHEADER: |
109 sh_video->bih=malloc(sizeof(BITMAPINFOHEADER)); | |
110 memset(sh_video->bih,0,sizeof(BITMAPINFOHEADER)); | |
111 sh_video->bih->biSize=40; | |
112 sh_video->bih->biWidth = mf_w; | |
113 sh_video->bih->biHeight = mf_h; | |
114 sh_video->bih->biPlanes=1; | |
115 sh_video->bih->biBitCount=24; | |
116 sh_video->bih->biCompression=sh_video->format; | |
117 sh_video->bih->biSizeImage=sh_video->bih->biWidth*sh_video->bih->biHeight*3; | |
118 | |
4550 | 119 /* disable seeking */ |
4565 | 120 // demuxer->seekable = 0; |
4550 | 121 |
7407 | 122 demuxer->priv=(void*)mf; |
4550 | 123 |
124 return demuxer; | |
125 } | |
5810 | 126 |
127 void demux_close_mf(demuxer_t* demuxer) { | |
7407 | 128 mf_t *mf = demuxer->priv; |
5810 | 129 |
7407 | 130 if(!mf) |
5810 | 131 return; |
7407 | 132 free(mf); |
5810 | 133 } |