diff options
| author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-24 23:58:12 +0000 |
|---|---|---|
| committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-24 23:58:12 +0000 |
| commit | 021e4560ce92a3d07e9796dd1db90512d409e687 (patch) | |
| tree | c39999b54c538435a3dd13cab89961e9e60b626e /libmpdemux/demuxer.c | |
| parent | 9fcf817cd7f724b25212e8faa3aaa914e06cb2d1 (diff) | |
| download | mpv-021e4560ce92a3d07e9796dd1db90512d409e687.tar.bz2 mpv-021e4560ce92a3d07e9796dd1db90512d409e687.tar.xz | |
mostly complete support for loading and decoding FLI/FLC animations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3102 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 56e1bc7ac0..c03d49ccba 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -149,6 +149,7 @@ void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t // return value: // 0 = EOF or no stream found or invalid type // 1 = successfully read a packet +int demux_fli_fill_buffer(demuxer_t *demux); int demux_mpg_es_fill_buffer(demuxer_t *demux); int demux_mpg_fill_buffer(demuxer_t *demux); int demux_avi_fill_buffer(demuxer_t *demux); @@ -170,6 +171,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ // Note: parameter 'ds' can be NULL! // printf("demux->type=%d\n",demux->type); switch(demux->type){ + case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux); case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux); case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux); case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux); @@ -354,6 +356,7 @@ demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id); demuxer_t* demux_open_avi(demuxer_t* demuxer); int mov_check_file(demuxer_t* demuxer); int mov_read_header(demuxer_t* demuxer); +int demux_open_fli(demuxer_t* demuxer); extern int vivo_check_file(demuxer_t *demuxer); extern void demux_open_vivo(demuxer_t *demuxer); @@ -381,6 +384,20 @@ if((tv_param_on == 1) && file_format=DEMUXER_TYPE_TV; } #endif +//=============== Try to open as FLI file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id); + { + int size=stream_read_dword_le(demuxer->stream); + int id=stream_read_word_le(demuxer->stream); + // chech for the FLI file magic number + if((id==0xAF11) || (id==0xAF12)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile); + file_format=DEMUXER_TYPE_FLI; + } + } +} + //=============== Try to open as AVI file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id); @@ -481,6 +498,10 @@ d_video=demuxer->video; demuxer->file_format=file_format; switch(file_format){ + case DEMUXER_TYPE_FLI: { + if (!demux_open_fli(demuxer)) return NULL; + break; + } case DEMUXER_TYPE_MOV: { if(!mov_read_header(demuxer)) return NULL; // sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; |