mplayer.hg: libmpdemux/demuxer.c comparison

comparison libmpdemux/demuxer.c @ 10263:0df8816f4665

TiVo demuxer and sub-cc/osd decoder patch by usenet@wingert.org (http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz) changes by me: - spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data decoding, ie sub-cc and osd) - removed some cosmetics changes - some compile fixes (gcc3 specific variable decl etc)

author	arpi
date	Mon, 09 Jun 2003 00:24:49 +0000
parents	75c4595b0ffd
children	cd8909001845

comparison

equal deleted inserted replaced

-:e6f5487b2042
+:0df8816f4665
 extern void demux_close_xmms(demuxer_t* demuxer);
 extern void demux_close_gif(demuxer_t* demuxer);
 extern void demux_close_ts(demuxer_t* demuxer);
 extern void demux_close_mkv(demuxer_t* demuxer);
 extern void demux_close_ra(demuxer_t* demuxer);
+extern void demux_close_ty(demuxer_t* demuxer);
 #ifdef USE_TV
 #include "tv.h"
 extern int tv_param_on;
 demux_close_bmp(demuxer); break;
 case DEMUXER_TYPE_FLI:
 demux_close_fli(demuxer); break;
 case DEMUXER_TYPE_NUV:
 demux_close_nuv(demuxer); break;
+case DEMUXER_TYPE_MPEG_TY:
+demux_close_ty(demuxer); break;
 #if defined(USE_TV) && defined(HAVE_TV_V4L)
 case DEMUXER_TYPE_TV:
 	demux_close_tv(demuxer); break;
 #endif
 #ifdef HAVE_LIBDV095
 int demux_film_fill_buffer(demuxer_t *demux);
 int demux_bmp_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);
+int demux_ty_fill_buffer(demuxer_t *demux);
 int demux_avi_fill_buffer(demuxer_t *demux);
 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds);
 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds);
 int demux_asf_fill_buffer(demuxer_t *demux);
 int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds);
 case DEMUXER_TYPE_MF: return demux_mf_fill_buffer(demux);
 case DEMUXER_TYPE_ROQ: return demux_roq_fill_buffer(demux);
 case DEMUXER_TYPE_FILM: return demux_film_fill_buffer(demux);
 case DEMUXER_TYPE_BMP: return demux_bmp_fill_buffer(demux);
 case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux);
+case DEMUXER_TYPE_MPEG_TY: return demux_ty_fill_buffer( demux );
 case DEMUXER_TYPE_MPEG4_ES:
 case DEMUXER_TYPE_H264_ES:
 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);
 		file_format=DEMUXER_TYPE_MPEG_TS;
 	} else {
 		free_demuxer(demuxer);
 		demuxer=NULL;
 	}
+}
+//=============== Try to open as MPEG-TY file: =================
+if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TY)
+{
+demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_TY,audio_id,video_id,dvdsub_id);
+if(ds_fill_buffer(demuxer->video)){
+mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"TiVo (DeMuxer By WyngNut)");
+file_format=DEMUXER_TYPE_MPEG_TY;
+} else {
+free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== Try to open as MPEG-PS file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
 int pes=1;
 int tmp;
 sh_audio=NULL;   // ES streams has no audio channel
 d_video->sh=new_sh_video(demuxer,0); // create dummy video stream header, id=0
 sh_video=d_video->sh;sh_video->ds=d_video;
 break;
 }
-case DEMUXER_TYPE_MPEG_PS: {
+case DEMUXER_TYPE_MPEG_TY: {
 sh_video=d_video->sh;sh_video->ds=d_video;
-//  if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
 if(audio_id!=-2) {
 if(!ds_fill_buffer(d_audio)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
 sh_audio=NULL;
 }
 }
 }
 break;
 }
+case DEMUXER_TYPE_MPEG_PS: {
+sh_video=d_video->sh;sh_video->ds=d_video;
+//  if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
+if(audio_id!=-2) {
+if(!ds_fill_buffer(d_audio)){
+mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
+sh_audio=NULL;
+} else {
+sh_audio=d_audio->sh;sh_audio->ds=d_audio;
+switch(d_audio->id & 0xE0){  // 1110 0000 b  (high 3 bit: type  low 5: id)
+case 0x00: sh_audio->format=0x50;break; // mpeg
+case 0xA0: sh_audio->format=0x10001;break;  // dvd pcm
+case 0x80: sh_audio->format=0x2000;break; // ac3
+default: sh_audio=NULL; // unknown type
+}
+}
+}
+break;
+}
 #ifdef USE_TV
 case DEMUXER_TYPE_TV: {
 if (!demux_open_tv(demuxer)) return(NULL);
 break;
 }
 }
 int demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags);
+int demux_seek_ty(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_film(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags);
 case DEMUXER_TYPE_AVI:
 demux_seek_avi(demuxer,rel_seek_secs,flags);  break;
 case DEMUXER_TYPE_ASF:
 demux_seek_asf(demuxer,rel_seek_secs,flags);  break;
+case DEMUXER_TYPE_MPEG_TY:
+demux_seek_ty(demuxer,rel_seek_secs,flags);  break;
 case DEMUXER_TYPE_H264_ES:
 case DEMUXER_TYPE_MPEG4_ES:
 case DEMUXER_TYPE_MPEG_ES:
 case DEMUXER_TYPE_MPEG_PS:
 }
 return NULL;
 }
+extern int demux_ty(demuxer_t *demuxer, int cmd, void *arg);
 extern int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg);
 extern int demux_asf_control(demuxer_t *demuxer, int cmd, void *arg);
 extern int demux_avi_control(demuxer_t *demuxer, int cmd, void *arg);
 extern int demux_xmms_control(demuxer_t *demuxer, int cmd, void *arg);
 extern int demux_mkv_control(demuxer_t *demuxer, int cmd, void *arg);
 int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
 switch(demuxer->type) {
+	case DEMUXER_TYPE_MPEG_TY:
+	    return demux_ty_control(demuxer,cmd,arg);
 	case DEMUXER_TYPE_MPEG4_ES:
 	case DEMUXER_TYPE_MPEG_ES:
 	case DEMUXER_TYPE_MPEG_PS:
 	    return demux_mpg_control(demuxer,cmd,arg);
 	case DEMUXER_TYPE_ASF:

Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 10263:0df8816f4665