[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[479] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[479] mplayerxp
|
From: <nic...@us...> - 2012-11-29 05:19:17
|
Revision: 479
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=479&view=rev
Author: nickols_k
Date: 2012-11-29 05:19:09 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
allow select demuxer by name with using: -demuxer.type=
Modified Paths:
--------------
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_audio.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_dv.cpp
mplayerxp/libmpdemux/demux_film.cpp
mplayerxp/libmpdemux/demux_fli.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_nsv.cpp
mplayerxp/libmpdemux/demux_null.cpp
mplayerxp/libmpdemux/demux_nuv.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_pva.cpp
mplayerxp/libmpdemux/demux_rawaudio.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_realaud.cpp
mplayerxp/libmpdemux/demux_roq.cpp
mplayerxp/libmpdemux/demux_smjpeg.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_ty.cpp
mplayerxp/libmpdemux/demux_viv.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demux_y4m.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer.h
mplayerxp/mplayerxp.cpp
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -230,6 +230,7 @@
extern const demuxer_driver_t demux_aiff =
{
+ "aiff",
"AIFF - Audio Interchange File Format parser",
".aiff",
NULL,
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -729,6 +729,7 @@
extern const demuxer_driver_t demux_asf =
{
+ "asf",
"ASF - Advanced stream format v1 parser",
".asf",
NULL,
Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_audio.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -1798,6 +1798,7 @@
extern const demuxer_driver_t demux_audio =
{
+ "audio",
"WAV/MP3 parser",
".wav",
audio_opts,
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -1292,7 +1292,8 @@
stream_t* s;
demuxer_t *od;
s = new_ds_stream(demuxer->audio);
- od = new_demuxer(s,DEMUXER_TYPE_OGG,-1,-2,-2);
+ od = new_demuxer(s,-1,-2,-2);
+ od->file_format=DEMUXER_TYPE_OGG;
demux_ogg.probe(od);
if(!demux_ogg.open(od)) {
MSG_ERR("Can't open OGG demuxer\n");
@@ -1536,6 +1537,7 @@
extern const demuxer_driver_t demux_avi =
{
+ "avi",
"AVI - Audio Video Interleaved parser",
".avi",
avi_opts,
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -313,6 +313,7 @@
extern const demuxer_driver_t demux_bmp =
{
+ "bmp",
"BMP - Bitmap amd other pictures parser",
".bmp",
NULL,
Modified: mplayerxp/libmpdemux/demux_dv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dv.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_dv.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -240,6 +240,7 @@
}
extern const demuxer_driver_t demux_dv = {
+ "dv",
"DV video: IEC 61834 and SMPTE 314M",
".dv",
NULL, // no options
Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_film.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -449,6 +449,7 @@
extern const demuxer_driver_t demux_film =
{
+ "film",
"FILM (a.k.a. CPK) parser",
".cpk",
NULL,
Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_fli.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -202,6 +202,7 @@
extern const demuxer_driver_t demux_fli =
{
+ "fli",
"FLI parser",
".fli",
NULL,
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -493,6 +493,7 @@
extern const demuxer_driver_t demux_lavf =
{
+ "lavf",
"libavformat - supports many formats, requires libavformat",
".xxx",
lavfdopts_conf,
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -4058,6 +4058,7 @@
extern const demuxer_driver_t demux_mkv =
{
+ "mkv",
"Matroska MKV parser",
".mkv",
NULL,
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -2104,6 +2104,7 @@
extern const demuxer_driver_t demux_mov =
{
+ "mov",
"QuickTime MOV parser",
".mov",
NULL,
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -854,6 +854,7 @@
extern const demuxer_driver_t demux_mpgps =
{
+ "mpg",
"MPG/VOB PS (Packet stream) parser",
".mpg",
NULL,
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -880,6 +880,7 @@
extern const demuxer_driver_t demux_mpxpav64 =
{
+ "mpxpav64",
"MPXPAV64 - MPlayerXP's AudioVideo64 parser",
".mpxp",
NULL,
Modified: mplayerxp/libmpdemux/demux_nsv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -357,6 +357,7 @@
extern const demuxer_driver_t demux_nsv =
{
+ "nsv",
"Nullsoft Streaming Video demuxer",
".nsv",
NULL,
Modified: mplayerxp/libmpdemux/demux_null.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_null.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_null.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -43,6 +43,7 @@
extern const demuxer_driver_t demux_null =
{
+ "null",
"NULL parser",
"...",
null_conf,
Modified: mplayerxp/libmpdemux/demux_nuv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_nuv.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -336,6 +336,7 @@
extern const demuxer_driver_t demux_nuv =
{
+ "nuv",
"NuppelVideo 0.05 parser",
".nuv",
NULL,
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -1238,7 +1238,8 @@
// Create the ds_stream and the ogg demuxer
s = new_ds_stream(demuxer->audio);
- od = new_demuxer(s,DEMUXER_TYPE_OGG,0,-2,-2);
+ od = new_demuxer(s,0,-2,-2);
+ od->file_format=DEMUXER_TYPE_OGG;
/// Add the header packets in the ogg demuxer audio stream
// Initial header
@@ -1471,6 +1472,7 @@
extern const demuxer_driver_t demux_ogg =
{
+ "ogg",
"OGG/Vorbis parser",
".ogg",
NULL,
Modified: mplayerxp/libmpdemux/demux_pva.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_pva.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_pva.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -513,6 +513,7 @@
extern const demuxer_driver_t demux_pva =
{
+ "pva",
"PVA (for DVB boards) parser",
".pva",
NULL,
Modified: mplayerxp/libmpdemux/demux_rawaudio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -118,6 +118,7 @@
extern const demuxer_driver_t demux_rawaudio =
{
+ "rawaudio",
"RAW audio parser",
".rawaudio",
rawaudio_conf,
Modified: mplayerxp/libmpdemux/demux_rawvideo.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -152,6 +152,7 @@
extern const demuxer_driver_t demux_rawvideo =
{
+ "rawvideo",
"RAW video parser",
".rawvideo",
rawvideo_conf,
Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_real.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -1604,6 +1604,7 @@
extern const demuxer_driver_t demux_real =
{
+ "real",
"Real media parser",
".rm",
NULL,
Modified: mplayerxp/libmpdemux/demux_realaud.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_realaud.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_realaud.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -308,8 +308,9 @@
return MPXP_Unknown;
}
-extern const demuxer_driver_t demux_ra =
+extern const demuxer_driver_t demux_realaud =
{
+ "realaud",
"Real audio parser",
".ra",
NULL,
Modified: mplayerxp/libmpdemux/demux_roq.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_roq.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_roq.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -265,6 +265,7 @@
extern const demuxer_driver_t demux_roq =
{
+ "roq",
"RoQ parser",
".roq",
NULL,
Modified: mplayerxp/libmpdemux/demux_smjpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -179,6 +179,7 @@
extern const demuxer_driver_t demux_smjpeg =
{
+ "smjpeg",
"SMJPEG parser",
".smjpeg",
NULL,
Modified: mplayerxp/libmpdemux/demux_ts.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ts.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_ts.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -3293,6 +3293,7 @@
extern const demuxer_driver_t demux_mpgts =
{
+ "ts",
"MPEG2 Transport Streams parser",
".mts",
NULL,
Modified: mplayerxp/libmpdemux/demux_ty.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ty.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_ty.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -875,6 +875,7 @@
/* "Christopher R. Wingert" */
extern const demuxer_driver_t demux_ty =
{
+ "tivo",
"TiVo demuxer",
".tivo",
NULL,
Modified: mplayerxp/libmpdemux/demux_viv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_viv.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_viv.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -770,6 +770,7 @@
extern const demuxer_driver_t demux_vivo =
{
+ "vivo",
"VIVO parser",
".vivo",
vivo_conf,
Modified: mplayerxp/libmpdemux/demux_vqf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_vqf.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -232,6 +232,7 @@
extern const demuxer_driver_t demux_vqf =
{
+ "vqf",
"TwinVQ - Transform-domain Weighted Interleave Vector Quantization",
".vqf",
NULL,
Modified: mplayerxp/libmpdemux/demux_y4m.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demux_y4m.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -282,6 +282,7 @@
extern const demuxer_driver_t demux_y4m =
{
+ "y4m",
"YUV4MPEG2 parser",
".y4m",
NULL,
Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demuxer.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -38,7 +38,7 @@
extern const demuxer_driver_t demux_mov;
extern const demuxer_driver_t demux_mkv;
extern const demuxer_driver_t demux_vivo;
-extern const demuxer_driver_t demux_ra;
+extern const demuxer_driver_t demux_realaud;
extern const demuxer_driver_t demux_real;
extern const demuxer_driver_t demux_fli;
extern const demuxer_driver_t demux_film;
@@ -68,7 +68,7 @@
&demux_mov,
&demux_mkv,
&demux_vivo,
- &demux_ra,
+ &demux_realaud,
&demux_real,
&demux_fli,
&demux_film,
@@ -142,7 +142,7 @@
return ds;
}
-demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id){
+demuxer_t* new_demuxer(stream_t *stream,int a_id,int v_id,int s_id){
demuxer_t *d=new(zeromem) demuxer_t;
rnd_fill(d->antiviral_hole,reinterpret_cast<long>(&d->pin)-reinterpret_cast<long>(&d->antiviral_hole));
d->pin=DEMUX_PIN;
@@ -156,7 +156,6 @@
d->audio=new_demuxer_stream(d,a_id);
d->video=new_demuxer_stream(d,v_id);
d->sub=new_demuxer_stream(d,s_id);
- d->file_format=type;
d->info=new(zeromem) demuxer_info_t;
stream_reset(stream);
stream_seek(stream,stream->start_pos);
@@ -503,9 +502,9 @@
// ====================================================================
struct demux_conf {
- char* audio_stream;
- char* sub_stream;
- int demuxer_type, audio_demuxer_type, sub_demuxer_type;
+ const char* audio_stream;
+ const char* sub_stream;
+ const char* type;
};
static demux_conf demux_conf;
@@ -530,18 +529,45 @@
{ INFOT_COMMENTS, SCTRL_TXT_GET_STREAM_COMMENT },
{ INFOT_MIME, SCTRL_TXT_GET_STREAM_MIME }
};
-static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id)
+
+static const demuxer_driver_t* demux_find_driver(const char *name) {
+ unsigned i=0;
+ for(;ddrivers[i]!=&demux_null;i++)
+ if(strcmp(name,ddrivers[i]->short_name)==0) return ddrivers[i];
+ return NULL;
+}
+
+static demuxer_t* demux_open_stream(stream_t *stream,int audio_id,int video_id,int dvdsub_id)
{
unsigned i;
demuxer_t *demuxer=NULL,*new_demux=NULL;
demux_aid_vid_mismatch = 0;
i=0;
+ if(demux_conf.type) {
+ const demuxer_driver_t* drv;
+ drv=demux_find_driver(demux_conf.type);
+ if(!drv) {
+ MSG_ERR("Can't find demuxer driver: '%s'\n",demux_conf.type);
+ goto err_exit;
+ }
+ MSG_V("Forcing %s ... ",drv->name);
+ /* don't remove it from loop!!! (for initializing) */
+ demuxer = new_demuxer(stream,audio_id,video_id,dvdsub_id);
+ stream_reset(demuxer->stream);
+ stream_seek(demuxer->stream,demuxer->stream->start_pos);
+ if(drv->probe(demuxer)!=MPXP_Ok) {
+ MSG_ERR("Can't probe stream with driver: '%s'\n",demux_conf.type);
+ goto err_exit;
+ }
+ demuxer->driver = drv;
+ goto force_driver;
+ }
again:
for(;ddrivers[i]!=&demux_null;i++) {
MSG_V("Probing %s ... ",ddrivers[i]->name);
/* don't remove it from loop!!! (for initializing) */
- demuxer = new_demuxer(stream,DEMUXER_TYPE_UNKNOWN,audio_id,video_id,dvdsub_id);
+ demuxer = new_demuxer(stream,audio_id,video_id,dvdsub_id);
stream_reset(demuxer->stream);
stream_seek(demuxer->stream,demuxer->stream->start_pos);
if(ddrivers[i]->probe(demuxer)==MPXP_Ok) {
@@ -553,16 +579,18 @@
free_demuxer(demuxer); demuxer=NULL;
}
if(!demuxer || !demuxer->driver) {
+err_exit:
MSG_ERR(MSGTR_FormatNotRecognized);
if(demuxer) { free_demuxer(demuxer); demuxer=NULL; }
return NULL;
}
-
+force_driver:
if(!(new_demux=demuxer->driver->open(demuxer))) {
MSG_ERR("Can't open stream with '%s'\n", demuxer->driver->name);
demuxer->driver=NULL;
i++;
- goto again;
+ if(demux_conf.type) goto err_exit;
+ else goto again;
}
demuxer=new_demux;
MSG_OK("Using: %s\n",demuxer->driver->name);
@@ -579,7 +607,7 @@
return demuxer;
}
-demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id){
+demuxer_t* demux_open(stream_t *vs,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;
@@ -603,18 +631,18 @@
}
}
- vd = demux_open_stream(vs,demux_conf.demuxer_type ? demux_conf.demuxer_type : file_format,demux_conf.audio_stream ? -2 : audio_id,video_id, demux_conf.sub_stream ? -2 : dvdsub_id);
+ vd = demux_open_stream(vs,audio_id,video_id,dvdsub_id);
if(!vd)
return NULL;
if(as) {
- ad = demux_open_stream(as,demux_conf.audio_demuxer_type ? demux_conf.audio_demuxer_type : afmt,audio_id,-2,-2);
+ ad = demux_open_stream(as,audio_id,-2,-2);
if(!ad)
MSG_WARN("Failed to open audio demuxer: %s\n",demux_conf.audio_stream);
else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->wtag == 0x55) // MP3
m_config_set_flag(MPXPCtx->mconfig,"mp3.hr-seek",1); // Enable high res seeking
}
if(ss) {
- sd = demux_open_stream(ss,demux_conf.sub_demuxer_type ? demux_conf.sub_demuxer_type : sfmt,-2,-2,dvdsub_id);
+ sd = demux_open_stream(ss,-2,-2,dvdsub_id);
if(!sd)
MSG_WARN("Failed to open subtitles demuxer: %s\n",demux_conf.sub_stream);
}
@@ -732,9 +760,7 @@
static const config_t demux_opts[] = {
{ "audiofile", &demux_conf.audio_stream, CONF_TYPE_STRING, 0, 0, 0, "forces reading of audio-stream from other file" },
{ "subfile", &demux_conf.sub_stream, CONF_TYPE_STRING, 0, 0, 0, "forces reading of subtitles from other file" },
- { "type", &demux_conf.demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, "forces demuxer by given number" },
- { "audio", &demux_conf.audio_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, "forces using of audio-demuxer" },
- { "sub", &demux_conf.sub_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, "forces using of subtitle-demuxer" },
+ { "type", &demux_conf.type, CONF_TYPE_STRING, 0, 0, 0, "forces demuxer by given name" },
{ NULL, NULL, 0, 0, 0, 0, NULL}
};
Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/libmpdemux/demuxer.h 2012-11-29 05:19:09 UTC (rev 479)
@@ -153,8 +153,9 @@
/** Demuxer's driver interface */
typedef struct demuxer_driver_s
{
- const char * name; /**< Name of driver ("Matroska MKV parser") */
- const char * defext; /**< Default file extension for this movie type */
+ const char* short_name; /**< for forcing through comand line */
+ const char* name; /**< Name of driver ("Matroska MKV parser") */
+ const char* defext; /**< Default file extension for this movie type */
const config_t* options;/**< Optional: MPlayerXP's option related */
/** Probing stream.
* @param d _this demuxer
@@ -190,7 +191,7 @@
}demuxer_driver_t;
demux_stream_t* new_demuxer_stream(demuxer_t *demuxer,int id);
-demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id);
+demuxer_t* new_demuxer(stream_t *stream,int a_id,int v_id,int s_id);
void free_demuxer_stream(demux_stream_t *ds);
void free_demuxer(demuxer_t *demuxer);
@@ -271,6 +272,6 @@
extern int demuxer_switch_video(const demuxer_t *, int id);
extern int demuxer_switch_subtitle(const demuxer_t *, int id);
-demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid);
+demuxer_t* demux_open(stream_t *stream,int aid,int vid,int sid);
#endif
Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp 2012-11-28 16:54:29 UTC (rev 478)
+++ mplayerxp/mplayerxp.cpp 2012-11-29 05:19:09 UTC (rev 479)
@@ -1858,7 +1858,7 @@
MP_UNIT("demux_open");
- if(!input_state.after_dvdmenu) MPXPSys->assign_demuxer(demux_open(stream,file_format,mp_conf.audio_id,mp_conf.video_id,mp_conf.dvdsub_id));
+ if(!input_state.after_dvdmenu) MPXPSys->assign_demuxer(demux_open(stream,mp_conf.audio_id,mp_conf.video_id,mp_conf.dvdsub_id));
if(!MPXPSys->demuxer()) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR
input_state.after_dvdmenu=0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
