Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 4189:6871d97e4261
initial support for FILM file demuxing
author | melanson |
---|---|
date | Wed, 16 Jan 2002 03:25:07 +0000 |
parents | 763a0e7e0521 |
children | 7cfa69df9e0b |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Wed Jan 16 01:51:34 2002 +0000 +++ b/libmpdemux/demuxer.c Wed Jan 16 03:25:07 2002 +0000 @@ -150,6 +150,7 @@ // return value: // 0 = EOF or no stream found or invalid type // 1 = successfully read a packet +int demux_film_fill_buffer(demuxer_t *demux); 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); @@ -175,6 +176,7 @@ // Note: parameter 'ds' can be NULL! // printf("demux->type=%d\n",demux->type); switch(demux->type){ + case DEMUXER_TYPE_FILM: return demux_film_fill_buffer(demux); 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); @@ -364,6 +366,7 @@ int mov_check_file(demuxer_t* demuxer); int mov_read_header(demuxer_t* demuxer); int demux_open_fli(demuxer_t* demuxer); +int demux_open_film(demuxer_t* demuxer); extern int vivo_check_file(demuxer_t *demuxer); extern void demux_open_vivo(demuxer_t *demuxer); @@ -467,15 +470,28 @@ 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 + int id; + stream_seek(demuxer->stream, 4); + id=stream_read_word_le(demuxer->stream); + // check 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 FILM file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FILM){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id); + { + int signature=stream_read_fourcc(demuxer->stream); + // check for the FLI file magic number + if(signature==mmioFOURCC('F', 'I', 'L', 'M')){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFILMfile); + file_format=DEMUXER_TYPE_FILM; + } + } +} //=============== Try to open as MPEG-PS file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){ int pes=1; @@ -554,6 +570,10 @@ if (!demux_open_fli(demuxer)) return NULL; break; } + case DEMUXER_TYPE_FILM: { + if (!demux_open_film(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; @@ -807,4 +827,6 @@ if (info->encoder) mp_msg(MSGT_DEMUX, MSGL_INFO, " Encoder: %s\n", info->encoder); } + + return 0; }