diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 30 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 3 | ||||
-rw-r--r-- | libmpdemux/video.c | 3 |
4 files changed, 36 insertions, 2 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index af754dc351..a52176b801 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -3,7 +3,7 @@ LIBNAME = libmpdemux.a include ../config.mak -SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c +SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c cue_read.c extension.c demux_gif.c ifeq ($(XMMS_PLUGINS),yes) SRCS += demux_xmms.c endif diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index bb17a7458a..051a6a83da 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -133,6 +133,7 @@ extern void demux_close_rawdv(demuxer_t* demuxer); extern void demux_close_pva(demuxer_t* demuxer); extern void demux_close_smjpeg(demuxer_t* demuxer); extern void demux_close_xmms(demuxer_t* demuxer); +extern void demux_close_gif(demuxer_t* demuxer); #ifdef USE_TV #include "tv.h" @@ -199,6 +200,10 @@ void free_demuxer(demuxer_t *demuxer){ case DEMUXER_TYPE_XMMS: demux_close_xmms(demuxer); break; #endif +#ifdef HAVE_GIF + case DEMUXER_TYPE_GIF: + demux_close_gif(demuxer); break; +#endif } // free streams: @@ -276,6 +281,7 @@ int demux_y4m_fill_buffer(demuxer_t *demux); int demux_audio_fill_buffer(demux_stream_t *ds); int demux_pva_fill_buffer(demuxer_t *demux); int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds); +int demux_gif_fill_buffer(demuxer_t *demux); extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds); extern int demux_ogg_fill_buffer(demuxer_t *d); @@ -325,6 +331,9 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_RTP: return demux_rtp_fill_buffer(demux, ds); #endif case DEMUXER_TYPE_SMJPEG: return demux_smjpeg_fill_buffer(demux); +#ifdef HAVE_GIF + case DEMUXER_TYPE_GIF: return demux_gif_fill_buffer(demux); +#endif } return 0; } @@ -549,6 +558,8 @@ extern int smjpeg_check_file(demuxer_t *demuxer); extern int demux_open_smjpeg(demuxer_t* demuxer); extern int bmp_check_file(demuxer_t *demuxer); extern int demux_xmms_open(demuxer_t* demuxer); +extern int gif_check_file(demuxer_t *demuxer); +extern int demux_open_gif(demuxer_t* demuxer); extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); @@ -758,6 +769,19 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){ demuxer = NULL; } } +#ifdef HAVE_GIF +//=============== Try to open as GIF file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_GIF){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_GIF,audio_id,video_id,dvdsub_id); + if(gif_check_file(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"GIF"); + file_format=DEMUXER_TYPE_GIF; + } else { + free_demuxer(demuxer); + demuxer = NULL; + } +} +#endif //=============== Try to open as BMP file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_BMP){ demuxer=new_demuxer(stream,DEMUXER_TYPE_BMP,audio_id,video_id,dvdsub_id); @@ -958,6 +982,12 @@ switch(file_format){ if (!demux_open_film(demuxer)) return NULL; break; } +#ifdef HAVE_GIF + case DEMUXER_TYPE_GIF: { + if (!demux_open_gif(demuxer)) return NULL; + break; + } +#endif case DEMUXER_TYPE_BMP: { if (!demux_open_bmp(demuxer)) return NULL; break; diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 608b073908..0b211f30d5 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -36,11 +36,12 @@ #define DEMUXER_TYPE_XMMS 25 #define DEMUXER_TYPE_RAWVIDEO 26 #define DEMUXER_TYPE_MPEG4_ES 27 +#define DEMUXER_TYPE_GIF 28 // This should always match the higest demuxer type number. // Unless you want to disallow users to force the demuxer to some types #define DEMUXER_TYPE_MIN 0 -#define DEMUXER_TYPE_MAX 27 +#define DEMUXER_TYPE_MAX 28 #define DEMUXER_TYPE_DEMUXERS (1<<16) // A virtual demuxer type for the network code diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 9888509669..dd59c0e45d 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -412,6 +412,9 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** // frame_time = 1/25.0; } } + case DEMUXER_TYPE_GIF: + frame_time=d_video->pts-pts1; + break; } if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |