mplayer.hg: libmpdemux/demuxer.c comparison

comparison libmpdemux/demuxer.c @ 4765:d0c2c8af46b4

Demuxers demuxer support for using external audiofile (or muxed subtitles). Options registration for libmpdemux. Demuxer info query.

author	albeu
date	Wed, 20 Feb 2002 16:59:25 +0000
parents	21eca91fece7
children	64bf084309cf

comparison

equal deleted inserted replaced

-:9579496a91db
+:d0c2c8af46b4
 #include <sys/stat.h>
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
+#include "../cfgparser.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"
 extern int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh);
 extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh);
 #endif
 int demux_y4m_fill_buffer(demuxer_t *demux);
 int demux_audio_fill_buffer(demux_stream_t *ds);
+extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
 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){
 #ifdef USE_TV
 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler);
 #endif
 case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux);
 case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds);
+case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds);
 }
 return 0;
 }
 // return value:
 extern int nuv_check_file(demuxer_t *demuxer);
 extern void demux_open_nuv(demuxer_t *demuxer);
 extern int demux_audio_open(demuxer_t* demuxer);
-demuxer_t* demux_open(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){
+static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){
 //int file_format=(*file_format_ptr);
 demuxer_t *demuxer=NULL;
 stream_read_dword_le(demuxer->stream); //filesize
 id=stream_read_dword_le(demuxer->stream); // "AVI "
 if(id==formtypeAVI){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAVIfile);
 file_format=DEMUXER_TYPE_AVI;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 }
 }
 //=============== Try to open as Y4M file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
 if(y4m_check_file(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n");
 file_format=DEMUXER_TYPE_Y4M;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== Try to open as ASF file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id);
 if(asf_check_header(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile);
 file_format=DEMUXER_TYPE_ASF;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== Try to open as NUV file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id);
 if(nuv_check_file(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected NuppelVideo file format!\n");
 file_format=DEMUXER_TYPE_NUV;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== Try to open as MOV file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
 if(mov_check_file(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile);
 file_format=DEMUXER_TYPE_MOV;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== Try to open as VIVO file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id);
 if(vivo_check_file(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n");
 file_format=DEMUXER_TYPE_VIVO;
+} else {
+free_demuxer(demuxer);
+demuxer = NULL;
 }
 }
 //=============== Try to open as REAL file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id);
 if(real_check_file(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedREALfile);
 file_format=DEMUXER_TYPE_REAL;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== 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);
 {
 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;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 }
 //=============== 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;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 }
 //=============== Try to open as RoQ file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id);
 if(roq_check_file(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedROQfile);
 file_format=DEMUXER_TYPE_ROQ;
-} else
+} 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;
 if(demuxer->synced==2)
 mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
 else
 mp_msg(MSGT_DEMUXER,MSGL_V,"Not MPEG System Stream format... (maybe Transport Stream?)\n");
 free_demuxer(demuxer);
+demuxer = NULL;
 }
 }
 break;
 }
 }
 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_ES,audio_id,video_id,dvdsub_id);
 if(!ds_fill_buffer(demuxer->video)){
 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_InvalidMPEGES);
 file_format=DEMUXER_TYPE_UNKNOWN;
 free_demuxer(demuxer);
+demuxer = NULL;
 } else {
 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile);
 }
 }
 //=============== Try to open as multi file: =================
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){
 demuxer=new_demuxer(stream,DEMUXER_TYPE_AUDIO,audio_id,video_id,dvdsub_id);
 if(demux_audio_open(demuxer)){
 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected audio file\n");
 file_format=DEMUXER_TYPE_AUDIO;
-} else
+} else {
 free_demuxer(demuxer);
+demuxer = NULL;
+}
 }
 //=============== Unknown, exiting... ===========================
-if(file_format==DEMUXER_TYPE_UNKNOWN){
+if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){
 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
 return NULL;
 //  GUI_MSG( mplUnknowFileType )
 }
 //====== File format recognized, set up these for compatibility: =========
 } // switch(file_format)
 pts_from_bps=0; // !!!
 return demuxer;
 }
+static char* audio_stream = NULL;
+static char* sub_stream = NULL;
+static int demuxer_type = 0, audio_demuxer_type = 0, sub_demuxer_type = 0;
+extern m_config_t* mconfig;
+demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id){
+stream_t *as = NULL,*ss = NULL;
+demuxer_t *vd,*ad = NULL,*sd = NULL;
+int afmt = 0,sfmt = 0;
+if(audio_stream) {
+as = open_stream(audio_stream,0,&afmt);
+if(!as) {
+mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't open audio stream: %s\n",audio_stream);
+return NULL;
+}
+}
+if(sub_stream) {
+ss = open_stream(sub_stream,0,&sfmt);
+if(!ss) {
+mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't open subtitles stream: %s\n",sub_stream);
+return NULL;
+}
+}
+vd = demux_open_stream(vs,demuxer_type ? demuxer_type : file_format,audio_stream ? -2 : audio_id,video_id, sub_stream ? -2 : dvdsub_id);
+if(!vd)
+return NULL;
+if(as) {
+ad = demux_open_stream(as,audio_demuxer_type ? audio_demuxer_type : afmt,audio_id,-2,-2);
+if(!ad)
+mp_msg(MSGT_DEMUXER,MSGL_WARN,"Failed to open audio demuxer: %s\n",audio_stream);
+else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->format == 0x55) // MP3
+m_config_set_flag(mconfig,"hr-mp3-seek",1); // Enable high res seeking
+}
+if(ss) {
+sd = demux_open_stream(ss,sub_demuxer_type ? sub_demuxer_type : sfmt,-2,-2,dvdsub_id);
+if(!sd)
+mp_msg(MSGT_DEMUXER,MSGL_WARN,"Failed to open subtitles demuxer: %s\n",sub_stream);
+}
+if(ad && sd)
+return new_demuxers_demuxer(vd,ad,sd);
+else if(ad)
+return new_demuxers_demuxer(vd,ad,vd);
+else if(sd)
+return new_demuxers_demuxer(vd,vd,sd);
+else
+return vd;
+}
 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_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_mf(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags);
 void demux_seek_mov(demuxer_t *demuxer,float pts,int flags);
 extern void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
+extern void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
 demux_stream_t *d_audio=demuxer->audio;
 demux_stream_t *d_video=demuxer->video;
 sh_audio_t *sh_audio=d_audio->sh;
 demux_seek_fli(demuxer,rel_seek_secs,flags);  break;
 case DEMUXER_TYPE_NUV:
 demux_seek_nuv(demuxer,rel_seek_secs,flags);  break;
 case DEMUXER_TYPE_AUDIO:
 demux_audio_seek(demuxer,rel_seek_secs,flags);  break;
+case DEMUXER_TYPE_DEMUXERS:
+demux_demuxers_seek(demuxer,rel_seek_secs,flags);  break;
 } // switch(demuxer->file_format)
 return 1;
 for(n = 0; info[2*n] != NULL ; n++)
 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]);
 return 0;
 }
+char* demux_info_get(demuxer_t *demuxer, char *opt) {
+int i;
+char **info = demuxer->info;
+for(i = 0; info && info[2*i] != NULL; i++) {
+if(!strcasecmp(opt,info[2*i]))
+return info[2*i+1];
+}
+return NULL;
+}
+/******************* Options stuff **********************/
+static config_t demuxer_opts[] = {
+{ "audiofile", &audio_stream, CONF_TYPE_STRING, 0, 0, 0, NULL },
+{ "subfile", &sub_stream, CONF_TYPE_STRING, 0, 0, 0, NULL },
+{ "demuxer", &demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL },
+{ "audio-demuxer", &audio_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL },
+{ "sub-demuxer", &sub_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL },
+{ NULL, NULL, 0, 0, 0, 0, NULL}
+};
+void demuxer_register_options(m_config_t* cfg) {
+m_config_register_options(cfg,demuxer_opts);
+}

Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 4765:d0c2c8af46b4