diff options
author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-13 13:39:19 +0000 |
---|---|---|
committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-13 13:39:19 +0000 |
commit | 9ba19353edfabe783e4079c3b45ac7d645626ede (patch) | |
tree | 8bc70521fc05a3077305190631d8c3587e53baf7 /libmpdemux/demuxer.c | |
parent | e0484e940f0b49a654d9d03cb5e82312357feea7 (diff) | |
download | mpv-9ba19353edfabe783e4079c3b45ac7d645626ede.tar.bz2 mpv-9ba19353edfabe783e4079c3b45ac7d645626ede.tar.xz |
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r-- | libmpdemux/demuxer.c | 56 |
1 files changed, 54 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index cf009d95c3..27ddfa5d94 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -157,6 +157,9 @@ extern void demux_close_ra(demuxer_t* demuxer); extern void demux_close_ty(demuxer_t* demuxer); extern void demux_close_lavf(demuxer_t* demuxer); extern void demux_close_vqf(demuxer_t* demuxer); +#ifdef USE_WIN32DLL +extern void demux_close_avs(demuxer_t* demuxer); +#endif #ifdef USE_TV @@ -248,6 +251,10 @@ void free_demuxer(demuxer_t *demuxer){ case DEMUXER_TYPE_LAVF: demux_close_lavf(demuxer); break; #endif +#ifdef USE_WIN32DLL + case DEMUXER_TYPE_AVS: + demux_close_avs(demuxer); break; +#endif } // free streams: for(i = 0; i < MAX_A_STREAMS; i++) @@ -339,6 +346,9 @@ extern int demux_smjpeg_fill_buffer(demuxer_t* demux); extern int demux_lmlm4_fill_buffer(demuxer_t* demux); extern int demux_mkv_fill_buffer(demuxer_t *d); extern int demux_lavf_fill_buffer(demuxer_t *d); +#ifdef USE_WIN32DLL +extern int demux_avs_fill_buffer(demuxer_t *d); +#endif int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ // Note: parameter 'ds' can be NULL! @@ -398,6 +408,9 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ #ifdef USE_LIBAVFORMAT case DEMUXER_TYPE_LAVF: return demux_lavf_fill_buffer(demux); #endif +#ifdef USE_WIN32DLL + case DEMUXER_TYPE_AVS: return demux_avs_fill_buffer(demux); +#endif } return 0; } @@ -609,6 +622,10 @@ int demux_open_rawdv(demuxer_t* demuxer); extern int rawdv_check_file(demuxer_t *demuxer); #endif +#ifdef USE_WIN32DLL +int avs_check_file(demuxer_t *demuxer, const char *filename); +#endif + extern int vivo_check_file(demuxer_t *demuxer); extern void demux_open_vivo(demuxer_t *demuxer); extern int y4m_check_file(demuxer_t *demuxer); @@ -646,6 +663,9 @@ extern int demux_mkv_open(demuxer_t *demuxer); #endif extern int lavf_check_file(demuxer_t *demuxer); extern int demux_open_lavf(demuxer_t* demuxer); +#ifdef USE_WIN32DLL +extern int demux_open_avs(demuxer_t* demuxer); +#endif extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); #ifdef STREAMING_LIVE_DOT_COM @@ -836,7 +856,7 @@ if(file_format==DEMUXER_TYPE_UNKNOWN && filename && extension_parsing==1){ file_format=demuxer_type_by_filename(filename); if(file_format!=DEMUXER_TYPE_UNKNOWN){ // we like recursion :) - demuxer=demux_open_stream(stream,file_format,audio_id,video_id,dvdsub_id,NULL); + demuxer=demux_open_stream(stream,file_format,audio_id,video_id,dvdsub_id,filename); if(demuxer) return demuxer; // done! file_format=DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... mp_msg(MSGT_DEMUXER,MSGL_V,"demuxer: continue fuzzy content-based format guessing...\n"); @@ -934,6 +954,19 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){ } } #endif +#ifdef USE_WIN32DLL +//=============== Try to open as Avisynth file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVS){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_AVS,audio_id,video_id,dvdsub_id); + if (avs_check_file(demuxer, filename)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVS"); + file_format=DEMUXER_TYPE_AVS; + } else { + free_demuxer(demuxer); + demuxer = NULL; + } +} +#endif //=============== Try to open as PVA file: ================= if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){ demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id); @@ -1386,6 +1419,12 @@ switch(file_format){ break; } #endif +#ifdef USE_WIN32DLL + case DEMUXER_TYPE_AVS: { + if (!demux_open_avs(demuxer)) return NULL; + break; + } +#endif } // switch(file_format) pts_from_bps=0; // !!! if ((sh_video=demuxer->video->sh) && sh_video->bih) @@ -1487,6 +1526,9 @@ int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags); int demux_seek_pva(demuxer_t *demuxer,float rel_seek_secs,int flags); int demux_seek_ts(demuxer_t *demuxer,float rel_seek_secs,int flags); int demux_seek_lavf(demuxer_t *demuxer,float rel_seek_secs,int flags); +#ifdef USE_WIN32DLL +int demux_seek_avs(demuxer_t *demuxer,float rel_seek_secs,int flags); +#endif #ifdef HAVE_LIBDV095 int demux_seek_rawdv(demuxer_t *demuxer, float pts, int flags); @@ -1604,6 +1646,10 @@ switch(demuxer->file_format){ #endif case DEMUXER_TYPE_VQF: demux_seek_vqf(demuxer,rel_seek_secs,flags); break; + #ifdef USE_WIN32DLL + case DEMUXER_TYPE_AVS: + demux_seek_avs(demuxer,rel_seek_secs,flags); break; + #endif } // switch(demuxer->file_format) @@ -1671,6 +1717,9 @@ extern int demux_ogg_control(demuxer_t *demuxer, int cmd, void *arg); extern int demux_real_control(demuxer_t *demuxer, int cmd, void *arg); extern int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg); extern int demux_mov_control(demuxer_t *demuxer, int cmd, void *arg); +#ifdef USE_WIN32DLL +extern int demux_avs_control(demuxer_t *demuxer, int cmd, void *arg); +#endif int demux_control(demuxer_t *demuxer, int cmd, void *arg) { switch(demuxer->type) { @@ -1709,7 +1758,10 @@ int demux_control(demuxer_t *demuxer, int cmd, void *arg) { #endif case DEMUXER_TYPE_MOV: return demux_mov_control(demuxer, cmd, arg); - +#ifdef USE_WIN32DLL + case DEMUXER_TYPE_AVS: + return demux_avs_control(demuxer, cmd, arg); +#endif default: return DEMUXER_CTRL_NOTIMPL; } |