[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[204] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[204] mplayerxp
|
From: <nic...@us...> - 2012-10-25 14:45:17
|
Revision: 204
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=204&view=rev
Author: nickols_k
Date: 2012-10-25 14:45:04 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
combine variables into structures
Modified Paths:
--------------
mplayerxp/cfg-mplayer.h
mplayerxp/cpudetect.h
mplayerxp/dec_ahead.c
mplayerxp/fifo.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/vd.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpdemux/asf_mmst_streaming.c
mplayerxp/libmpdemux/asf_streaming.c
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/cdda.c
mplayerxp/libmpdemux/cddb.c
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/demuxer_r.c
mplayerxp/libmpdemux/librtsp/rtsp.c
mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
mplayerxp/libmpdemux/librtsp/rtsp_session.c
mplayerxp/libmpdemux/network.c
mplayerxp/libmpdemux/realrtsp/asmrp.c
mplayerxp/libmpdemux/realrtsp/real.c
mplayerxp/libmpdemux/realrtsp/rmff.c
mplayerxp/libmpdemux/realrtsp/sdpplin.c
mplayerxp/libmpdemux/realrtsp/xbuffer.c
mplayerxp/libmpdemux/s_cdd.c
mplayerxp/libmpdemux/s_dvdnav.c
mplayerxp/libmpdemux/s_dvdread.c
mplayerxp/libmpdemux/s_ffmpeg.c
mplayerxp/libmpdemux/s_file.c
mplayerxp/libmpdemux/s_tv.c
mplayerxp/libmpdemux/s_vcdnav.c
mplayerxp/libmpdemux/url.c
mplayerxp/libmpsub/vobsub.c
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/mp_image.c
mplayerxp/mp_msg.c
mplayerxp/mp_msg.h
mplayerxp/mplayer.c
mplayerxp/mplayer.h
mplayerxp/osdep/vbelib.c
mplayerxp/postproc/vf_scale.c
mplayerxp/sig_hand.c
Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/cfg-mplayer.h 2012-10-25 14:45:04 UTC (rev 204)
@@ -46,8 +46,6 @@
extern int nortc;
#endif
-extern int enable_xp;
-extern int enable_gomp;
extern int enable_xp_audio;
#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
@@ -106,15 +104,15 @@
*/
static const config_t xpcore_config[]={
- {"xp", &enable_xp, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL, "starts MPlayerXP in multi-thread and multi-buffer XP mode"},
- {"dump", &stream_dump, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies dump type and name for the dump of stream"},
- {"gomp", &enable_gomp, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables usage of OpenMP extensions"},
- {"nogomp", &enable_gomp, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables usage of OpenMP extensions"},
+ {"xp", &mp_conf.xp, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL, "starts MPlayerXP in multi-thread and multi-buffer XP mode"},
+ {"dump", &mp_conf.stream_dump, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies dump type and name for the dump of stream"},
+ {"gomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables usage of OpenMP extensions"},
+ {"nogomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables usage of OpenMP extensions"},
{"da_buffs", &vo_conf.da_buffs, CONF_TYPE_INT, CONF_RANGE, 4, 1024, NULL, "specifies number of buffers for decoding-ahead in XP mode"},
- {"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL,"specifies amount of memory for precaching a file/URL"},
- {"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL,"disables precaching a file/URL"},
- {"autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL, "dynamically changes the level of postprocessing depending on spare CPU time available"},
- {"benchmark", &benchmark, CONF_TYPE_FLAG, 0, 0, 1, NULL, "performs benchmarking to estimate performance of MPlayerXP"},
+ {"cache", &mp_conf.s_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL,"specifies amount of memory for precaching a file/URL"},
+ {"nocache", &mp_conf.s_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL,"disables precaching a file/URL"},
+ {"autoq", &mp_conf.autoq, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL, "dynamically changes the level of postprocessing depending on spare CPU time available"},
+ {"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, NULL, "performs benchmarking to estimate performance of MPlayerXP"},
{NULL, NULL, 0, 0, 0, 0, NULL,NULL},
};
@@ -226,7 +224,7 @@
{"on", &has_dvdsub, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables subtitle-steam playback"},
{"off", &has_dvdsub, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables subtitle-stream playback"},
{"vob", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies the VobSub files that are to be used for subtitle"},
- {"vobid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "specifies the VobSub subtitle id"},
+ {"vobid", &mp_conf.vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "specifies the VobSub subtitle id"},
#ifdef USE_SUB
{"file", &sub_name, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies the subtitle file"},
#ifdef USE_ICONV
@@ -242,9 +240,9 @@
#endif
{"cc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enable DVD Closed Caption (CC) subtitles"},
{"nocc", &subcc_enabled, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disable DVD Closed Caption (CC) subtitles"},
- {"id", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "selects subtitle channel"},
- {"lang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies language of DVD-subtitle stream as two-letter country code(s)"},
- {"ifo", &spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies .ifo file for DVD subtitles"},
+ {"id", &mp_conf.dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "selects subtitle channel"},
+ {"lang", &mp_conf.dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies language of DVD-subtitle stream as two-letter country code(s)"},
+ {"ifo", &mp_conf.spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies .ifo file for DVD subtitles"},
{NULL, NULL, 0, 0, 0, 0, NULL,NULL},
};
@@ -266,8 +264,8 @@
{"mixer", &oss_mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL, "select audio-mixer device"},
{"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 2, 8, NULL, "select number of audio output channels to be used"},
{"rate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL, "specifies Hz for audio playback"},
- {"lang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies language of DVD-audio stream as two-letter country code(s)"},
- {"id", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL, "selects audio channel"},
+ {"lang", &mp_conf.audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies language of DVD-audio stream as two-letter country code(s)"},
+ {"id", &mp_conf.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL, "selects audio channel"},
#ifdef USE_FAKE_MONO
{"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL, "selects type of MP2/MP3 stereo output"},
#endif
@@ -299,7 +297,7 @@
{"bm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of bus-mastering (if it available for given OS/videocard)"},
{"bm2", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 2, NULL, "enables using of bus-mastering to store all decoded-ahead frames in video-memory"},
{"nobm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of bus-mastering"},
- {"id", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL, "selects video channel"},
+ {"id", &mp_conf.video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL, "selects video channel"},
{"pp", &npp_options, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies options of post-processing"},
{"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL, "specifies the quality of the software scaler"},
#ifdef HAVE_PNG
@@ -340,7 +338,7 @@
{"vfm", &video_family, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified video-decoders family"},
{"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified audio-decoder"},
{"vc", &video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified video-decoder"},
-/*UD*/ {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL, "verbose output"},
+/*UD*/ {"verbose", &mp_conf.verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL, "verbose output"},
{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL, "verbose output (more -v means more verbosity)"},
{"slave", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL, "turns MPlayerXP into slave mode as a backend for other programs"},
{"use-stdin", &use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL, "forces reading of keyboard codes from STDIN instead of terminal's console"},
Modified: mplayerxp/cpudetect.h
===================================================================
--- mplayerxp/cpudetect.h 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/cpudetect.h 2012-10-25 14:45:04 UTC (rev 204)
@@ -1,6 +1,8 @@
#ifndef CPUDETECT_H
#define CPUDETECT_H
+#include "mplayer.h"
+
#ifdef ARCH_X86_64
# define REGa rax
# define REGb rbx
Modified: mplayerxp/dec_ahead.c
===================================================================
--- mplayerxp/dec_ahead.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/dec_ahead.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -112,7 +112,6 @@
extern volatile int xp_drop_frame;
extern volatile unsigned xp_drop_frame_cnt;
extern int output_quality;
-extern int auto_quality;
int ao_da_buffs;
@@ -195,7 +194,7 @@
ada_active_frame - abs frame num. which is being displayed
abs_dec_ahead_locked_frame - abs frame num. which is being decoded
*/
- max_frame_delay = max_video_time_usage+max_vout_time_usage;
+ max_frame_delay = time_usage.max_video+time_usage.max_vout;
/*
TODO:
@@ -212,7 +211,7 @@
if(max_frame_delay*3 > drop_barrier) {
if(drop_barrier < (float)(xp_num_frames-2)/vo_data->fps) drop_barrier += 1/vo_data->fps;
else
- if(verbose) show_warn_cant_sync(max_frame_delay);
+ if(mp_conf.verbose) show_warn_cant_sync(max_frame_delay);
}
if(delta > drop_barrier) rc=0;
else if(delta < max_frame_delay*3) rc=1;
@@ -286,7 +285,7 @@
pinfo[_xp_id].pid = getpid(); /* Only for testing */
dec_ahead_pth_id =
pinfo[_xp_id].pth_id = pthread_self();
- pinfo[_xp_id].thread_name = (xp_core.has_audio && enable_xp < XP_VAFull) ? "video+audio decoding+filtering ahead" : "video decoding+vf ahead";
+ pinfo[_xp_id].thread_name = (xp_core.has_audio && mp_conf.xp < XP_VAFull) ? "video+audio decoding+filtering ahead" : "video decoding+vf ahead";
drop_barrier=(float)(xp_num_frames/2)*(1/vo_data->fps);
if(av_sync_pts == -1 && !use_pts_fix2)
xp_is_bad_pts = d_video->demuxer->file_format == DEMUXER_TYPE_MPEG_ES ||
@@ -310,7 +309,7 @@
#if 0
/* prevent reent access to non-reent demuxer */
//if(sh_video->num_frames>200) *((char*)0x100) = 1; // Testing crash
- if(xp_core.has_audio && enable_xp<XP_VAFull) {
+ if(xp_core.has_audio && mp_conf.xp<XP_VAFull) {
pinfo[_xp_id].current_module = "decode audio";
while(2==xp_thread_decode_audio()) ;
pinfo[_xp_id].current_module = "dec_ahead 2";
@@ -381,7 +380,7 @@
our_quality = output_quality*distance/total;
if(drop_param) mpcv_set_quality(sh_video,0);
else
- if(auto_quality) mpcv_set_quality(sh_video,our_quality>0?our_quality:0);
+ if(mp_conf.autoq) mpcv_set_quality(sh_video,our_quality>0?our_quality:0);
}
blit_frame=mpcv_decode(sh_video,start,in_size,drop_param,v_pts);
if(output_quality) {
@@ -418,7 +417,7 @@
,dae_curr_vplayed(),dae_curr_vdecoded());
if(pthread_end_of_work) goto pt_exit;
if(xp_core.in_lseek!=NoSeek) break;
- if(xp_core.has_audio && enable_xp<XP_VAFull) {
+ if(xp_core.has_audio && mp_conf.xp<XP_VAFull) {
pinfo[_xp_id].current_module = "decode audio";
xp_thread_decode_audio();
pinfo[_xp_id].current_module = "dec_ahead 5";
@@ -428,7 +427,7 @@
/*------------------------ frame decoded. --------------------*/
} /* while(!xp_eof)*/
-if(xp_core.has_audio && enable_xp<XP_VAFull) {
+if(xp_core.has_audio && mp_conf.xp<XP_VAFull) {
while(!xp_audio_eof && !xp_core.in_lseek && !pthread_end_of_work) {
pinfo[_xp_id].current_module = "decode audio";
if(!xp_thread_decode_audio()) usleep(1);
@@ -581,10 +580,10 @@
xp_core.video=malloc(sizeof(dec_ahead_engine_t));
dae_init(xp_core.video,xp_num_frames);
}
- else {/* if (enable_xp >= XP_VAFull) enable_xp = XP_VAPlay;*/ }
+ else {/* if (mp_conf.xp >= XP_VAFull) mp_conf.xp = XP_VAPlay;*/ }
if(sha) sh_audio = sha; /* currently is unused */
- if(enable_xp>=XP_VideoAudio && sha) {
+ if(mp_conf.xp>=XP_VideoAudio && sha) {
int asize;
unsigned o_bps;
unsigned min_reserv;
@@ -597,7 +596,7 @@
min_reserv = (float)min_reserv * (float)o_bps / (float)sha->o_bps;
init_audio_buffer(asize+min_reserv,min_reserv+MIN_BUFFER_RESERV,asize/(sha->audio_out_minsize<10000?sha->audio_out_minsize:4000)+100,sha);
xp_core.has_audio=1;
- if( enable_xp >= XP_VAPlay )
+ if( mp_conf.xp >= XP_VAPlay )
pthread_attr_init(&audio_attr);
}
@@ -610,15 +609,15 @@
retval = pthread_attr_setdetachstate(&our_attr,PTHREAD_CREATE_DETACHED);
if(retval)
{
- if(verbose) printf("running thread: attr_setdetachstate fault!!!\n");
+ if(mp_conf.verbose) printf("running thread: attr_setdetachstate fault!!!\n");
return retval;
}
pthread_attr_setscope(&our_attr,PTHREAD_SCOPE_SYSTEM);
- if( xp_core.has_audio && enable_xp >= XP_VAPlay ) {
+ if( xp_core.has_audio && mp_conf.xp >= XP_VAPlay ) {
retval = pthread_attr_setdetachstate(&audio_attr,PTHREAD_CREATE_DETACHED);
if(retval) {
- if(verbose) printf("running audio thread: attr_setdetachstate fault!!!\n");
+ if(mp_conf.verbose) printf("running audio thread: attr_setdetachstate fault!!!\n");
return retval;
}
pthread_attr_setscope(&audio_attr,PTHREAD_SCOPE_SYSTEM);
@@ -628,7 +627,7 @@
/* requires root privelegies */
pthread_attr_setschedpolicy(&our_attr,SCHED_FIFO);
#endif
- if( (xp_core.has_audio && enable_xp >= XP_VAFull) || !xp_core.has_video )
+ if( (xp_core.has_audio && mp_conf.xp >= XP_VAFull) || !xp_core.has_video )
{
retval = pthread_create(&pthread_id,&audio_attr,a_dec_ahead_routine,NULL);
if( retval ) return retval;
@@ -645,7 +644,7 @@
int run_xp_aplayers(void)
{
int retval;
- if( xp_core.has_audio && enable_xp >= XP_VAPlay )
+ if( xp_core.has_audio && mp_conf.xp >= XP_VAPlay )
{
retval = pthread_create(&pthread_id,&audio_attr,audio_play_routine,NULL);
if( retval ) return retval;
@@ -692,7 +691,7 @@
Else we'll get picture destortion on the screen */
initial_audio_pts=HUGE;
- if(enable_xp && !pthread_is_living && !a_pthread_is_living) {
+ if(mp_conf.xp && !pthread_is_living && !a_pthread_is_living) {
xp_core.in_lseek = NoSeek; /* Threads not started, do nothing */
return;
}
Modified: mplayerxp/fifo.c
===================================================================
--- mplayerxp/fifo.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/fifo.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -1,3 +1,4 @@
+#include "mplayer.h"
#include "fifo.h"
#ifndef min
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -55,7 +55,7 @@
in_fmt->wFormatTag=sh_audio->format;
}
- if(verbose)
+ if(mp_conf.verbose)
{
MSG_V("Output fmt:\n");
print_wave_header(&priv->o_wf,sizeof(WAVEFORMATEX));
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -286,7 +286,7 @@
}
if((err=mpg123_open_feed(priv->mh))!=0) goto err_exit;
param = MPG123_FORCE_STEREO|MPG123_FORCE_FLOAT;
- if(!verbose) param|=MPG123_QUIET;
+ if(!mp_conf.verbose) param|=MPG123_QUIET;
mpg123_param(priv->mh,MPG123_FLAGS,param,0);
// Decode first frame (to get header filled)
err=MPG123_NEED_MORE;
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -169,7 +169,7 @@
unsigned long OutputBufferSize=0; //size of the output buffer
unsigned long WantedBufferSize=0; //the size you want your buffers to be
- if(stream_cache_size)
+ if(mp_conf.s_cache_size)
{
MSG_FATAL("Disabling sound:\nwin32 quicktime DLLs must be initialized in single-threaded mode! Try -nocache\n");
return 0;
@@ -240,17 +240,6 @@
#endif
- if(sh->format==0x3343414D){
- // MACE 3:1
- sh->ds->ss_div = 2*3; // 1 samples/packet
- sh->ds->ss_mul = sh->channels*2*1; // 1 bytes/packet
- } else
- if(sh->format==0x3643414D){
- // MACE 6:1
- sh->ds->ss_div = 2*6; // 1 samples/packet
- sh->ds->ss_mul = sh->channels*2*1; // 1 bytes/packet
- }
-
return 1; // return values: 1=OK 0=ERROR
}
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/ad_twin.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -274,7 +274,7 @@
sh_audio->samplesize=4;
sh_audio->sample_format=AFMT_FLOAT32;
- if(verbose)
+ if(mp_conf.verbose)
{
MSG_V("Input format:\n");
print_wave_header(in_fmt,sizeof(WAVEFORMATEX));
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/dec_video.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -89,7 +89,6 @@
#define MPDEC_THREAD_COND (VF_FLAGS_THREADS|VF_FLAGS_SLICES)
static unsigned smp_num_cpus=1;
static unsigned use_vf_threads=0;
-extern int enable_gomp;
extern char *video_codec;
int mpcv_init(sh_video_t *sh_video,const char* codecname,const char * vfm,int status){
@@ -168,7 +167,7 @@
sh_video->inited=1;
sh_video->vf_flags=vf_query_flags(sh_video->vfilter);
#ifdef _OPENMP
- if(enable_gomp) {
+ if(mp_conf.gomp) {
smp_num_cpus=omp_get_num_procs();
use_vf_threads=0;
if(((sh_video->vf_flags&MPDEC_THREAD_COND)==MPDEC_THREAD_COND) && (smp_num_cpus>1)) use_vf_threads=1;
@@ -261,11 +260,11 @@
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- video_time_usage+=tt;
- if(benchmark || frame_dropping) {
- if(tt > max_video_time_usage) max_video_time_usage=tt;
- if(tt < min_video_time_usage) min_video_time_usage=tt;
- cur_video_time_usage=tt;
+ time_usage.video+=tt;
+ if(mp_conf.benchmark || frame_dropping) {
+ if(tt > time_usage.max_video) time_usage.max_video=tt;
+ if(tt < time_usage.min_video) time_usage.min_video=tt;
+ time_usage.cur_video=tt;
}
if(drop_frame) return 0;
@@ -274,12 +273,12 @@
t2=GetTimer()-t2;
tt=t2*0.000001f;
- vout_time_usage+=tt;
- if(benchmark || frame_dropping)
+ time_usage.vout+=tt;
+ if(mp_conf.benchmark || frame_dropping)
{
- if(tt > max_vout_time_usage) max_vout_time_usage = tt;
- if(tt < min_vout_time_usage) min_vout_time_usage = tt;
- cur_vout_time_usage=tt;
+ if(tt > time_usage.max_vout) time_usage.max_vout = tt;
+ if(tt < time_usage.min_vout) time_usage.min_vout = tt;
+ time_usage.cur_vout=tt;
}
return 1;
Modified: mplayerxp/libmpcodecs/vd.c
===================================================================
--- mplayerxp/libmpcodecs/vd.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/vd.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -131,7 +131,7 @@
if(out_fmt==0xFFFFFFFF) continue;
flags=vf_query_format(vf,out_fmt,w,h);
MSG_DBG2("vo_debug[step i=%d]: query(%s %ix%i) returned 0x%X for:\n",i,vo_format_name(out_fmt),w,h,flags);
- if(verbose>1) if(verbose) vf_showlist(vf);
+ if(mp_conf.verbose>1) if(mp_conf.verbose) vf_showlist(vf);
if((flags&VFCAP_CSP_SUPPORTED_BY_HW) || ((flags&VFCAP_CSP_SUPPORTED) && j<0)){
// check (query) if codec really support this outfmt...
sh->outfmtidx=j; // pass index to the control() function this way
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -5,7 +5,8 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "mp_config.h"
-#include "../dec_ahead.h"
+#include "mplayer.h"
+#include "dec_ahead.h"
#ifdef HAVE_GOMP
#include <omp.h>
#endif
@@ -74,7 +75,6 @@
#include "libavcodec/avcodec.h"
#include "libvo/video_out.h"
-extern int enable_gomp;
extern char *npp_options;
static int vcodec_inited=0;
@@ -361,7 +361,7 @@
#ifdef _OPENMP
/* Note: Slices have effect on UNI-processor machines only */
- if(enable_ffslices && omp_get_num_procs()>1 && enable_gomp) enable_ffslices=0;
+ if(enable_ffslices && omp_get_num_procs()>1 && mp_conf.gomp) enable_ffslices=0;
#endif
if(vdff_ctx->lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND && enable_ffslices) vdff_ctx->cap_slices=1;
/* enable DR1 method */
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -123,7 +123,7 @@
Component prev=NULL;
CodecInfo cinfo; // for ImageCodecGetCodecInfo()
ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
- if(stream_cache_size)
+ if(mp_conf.s_cache_size)
{
MSG_FATAL("Disabling video:\nwin32 quicktime DLLs must be initialized in single-threaded mode! Try -nocache\n");
return 0;
Modified: mplayerxp/libmpcodecs/vd_vfw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -150,7 +150,7 @@
if(sh_video->codec->outflags[sh_video->outfmtidx] & CODECS_FLAG_YUVHACK)
priv->o_bih->biCompression = 0;
- if(verbose)
+ if(mp_conf.verbose)
{
MSG_V("Starting decompression, format:\n");
print_video_header(sh_video->bih,sizeof(BITMAPINFOHEADER));
Modified: mplayerxp/libmpdemux/asf_mmst_streaming.c
===================================================================
--- mplayerxp/libmpdemux/asf_mmst_streaming.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/asf_mmst_streaming.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -14,7 +14,8 @@
#include <errno.h>
#include <inttypes.h>
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#include "tcp.h"
#include "url.h"
@@ -44,9 +45,6 @@
#endif
#include "demux_msg.h"
-extern int audio_id;
-extern int video_id;
-
#define BUF_SIZE 102400
#define HDR_BUF_SIZE 8192
#define MAX_STREAMS 20
@@ -615,11 +613,11 @@
memset (data, 0, 40);
- if (audio_id > 0) {
+ if (mp_conf.audio_id > 0) {
data[2] = 0xFF;
data[3] = 0xFF;
- data[4] = audio_id;
- send_command(s, 0x33, num_stream_ids, 0xFFFF | audio_id << 16, 8, data);
+ data[4] = mp_conf.audio_id;
+ send_command(s, 0x33, num_stream_ids, 0xFFFF | mp_conf.audio_id << 16, 8, data);
} else {
for (i=1; i<num_stream_ids; i++) {
data [ (i-1) * 6 + 2 ] = 0xFF;
Modified: mplayerxp/libmpdemux/asf_streaming.c
===================================================================
--- mplayerxp/libmpdemux/asf_streaming.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/asf_streaming.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -408,26 +408,26 @@
return -1;
}
- if (audio_id > 0)
+ if (mp_conf.audio_id > 0)
// a audio stream was forced
- asf_ctrl->audio_id = audio_id;
+ asf_ctrl->audio_id = mp_conf.audio_id;
else if (a_idx >= 0)
asf_ctrl->audio_id = asf_ctrl->audio_streams[a_idx];
else if (asf_ctrl->n_audio) {
MSG_WARN( "bandwidth too small, "
"deselected audio stream\n");
- audio_id = -2;
+ mp_conf.audio_id = -2;
}
- if (video_id > 0)
+ if (mp_conf.video_id > 0)
// a video stream was forced
- asf_ctrl->video_id = video_id;
+ asf_ctrl->video_id = mp_conf.video_id;
else if (v_idx >= 0)
asf_ctrl->video_id = asf_ctrl->video_streams[v_idx];
else if (asf_ctrl->n_video) {
MSG_WARN( "bandwidth too small, "
"deselected video stream\n");
- video_id = -2;
+ mp_conf.video_id = -2;
}
return 1;
@@ -801,7 +801,7 @@
}
http_response_append( http_hdr, buffer, i );
} while( !http_is_header_entire( http_hdr ) );
- if( verbose>0 ) {
+ if( mp_conf.verbose>0 ) {
http_hdr->buffer[http_hdr->buffer_size]='\0';
MSG_DBG2("Response [%s]\n", http_hdr->buffer );
}
Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/cache2.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -155,7 +155,7 @@
c->packets[cidx].filepos = c->stream->driver->tell(c->stream);
c->stream->driver->read(c->stream,&c->packets[cidx].sp);
MSG_DBG2("CACHE2: read_packet at %lli (wanted %u got %u type %i)",c->packets[cidx].filepos,c->sector_size,c->packets[cidx].sp.len,c->packets[cidx].sp.type);
- if(verbose>1)
+ if(mp_conf.verbose>1)
if(c->packets[cidx].sp.len>8)
{
int i;
@@ -225,7 +225,7 @@
memcpy(&c->packets[i].cp_mutex,&tmpl,sizeof(tmpl));
pmem += sector;
}
- if(verbose>1)
+ if(mp_conf.verbose>1)
for(i=0;i<num;i++)
{
MSG_DBG2("sizeof(c)=%u c=%i c->sp.buf=%p\n",sizeof(cache_packet_t),i,c->packets[i].sp.buf);
@@ -267,15 +267,15 @@
pinfo[xp_id].thread_name = "cache2";
while(1)
{
- if(benchmark) t=GetTimer();
+ if(mp_conf.benchmark) t=GetTimer();
cfill=c2_cache_fill(c);
- if(benchmark)
+ if(mp_conf.benchmark)
{
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- c2_time_usage+=tt;
- if(tt > max_c2_time_usage) max_c2_time_usage=tt;
- if(tt < min_c2_time_usage) min_c2_time_usage=tt;
+ time_usage.c2+=tt;
+ if(tt > time_usage.max_c2) time_usage.max_c2=tt;
+ if(tt < time_usage.min_c2) time_usage.min_c2=tt;
}
if(!cfill)
usleep(FILL_USLEEP_TIME); // idle
@@ -310,7 +310,7 @@
retval = pthread_attr_setdetachstate(&c->cache2_attr,PTHREAD_CREATE_DETACHED);
if(retval)
{
- if(verbose) printf("running thread: attr_setdetachstate fault!!!\n");
+ if(mp_conf.verbose) printf("running thread: attr_setdetachstate fault!!!\n");
return retval;
}
pthread_attr_setscope(&c->cache2_attr,PTHREAD_SCOPE_SYSTEM);
@@ -543,7 +543,7 @@
c->read_filepos+=x;
}
CACHE2_PACKET_UNLOCK(cur);
- if(verbose>2)
+ if(mp_conf.verbose>2)
{
int i;
MSG_DBG2( "c2_stream_read got %u bytes ",total);
Modified: mplayerxp/libmpdemux/cdda.c
===================================================================
--- mplayerxp/libmpdemux/cdda.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/cdda.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -1,4 +1,5 @@
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#ifdef HAVE_LIBCDIO
@@ -81,7 +82,7 @@
priv = (cdda_priv*)malloc(sizeof(cdda_priv));
memset(priv, 0, sizeof(cdda_priv));
- priv->cd = cdio_cddap_identify(dev,verbose?1:0,NULL);
+ priv->cd = cdio_cddap_identify(dev,mp_conf.verbose?1:0,NULL);
if(!priv->cd) {
MSG_ERR("Can't open cdda device: %s\n",dev);
@@ -89,7 +90,7 @@
return 0;
}
- cdio_cddap_verbose_set(priv->cd, verbose?CDDA_MESSAGE_PRINTIT:CDDA_MESSAGE_FORGETIT, verbose?CDDA_MESSAGE_PRINTIT:CDDA_MESSAGE_FORGETIT);
+ cdio_cddap_verbose_set(priv->cd, mp_conf.verbose?CDDA_MESSAGE_PRINTIT:CDDA_MESSAGE_FORGETIT, mp_conf.verbose?CDDA_MESSAGE_PRINTIT:CDDA_MESSAGE_FORGETIT);
if(cdio_cddap_open(priv->cd) != 0) {
MSG_ERR("Can't open disc\n");
Modified: mplayerxp/libmpdemux/cddb.c
===================================================================
--- mplayerxp/libmpdemux/cddb.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/cddb.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -12,7 +12,8 @@
*
*/
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#if defined(HAVE_LIBCDIO) && defined(HAVE_STREAMING)
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_asf.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -185,7 +185,7 @@
sh_audio->wf=calloc((apriv->streamh.type_size<sizeof(WAVEFORMATEX))?sizeof(WAVEFORMATEX):apriv->streamh.type_size,1);
memcpy(sh_audio->wf,buffer,apriv->streamh.type_size);
le2me_WAVEFORMATEX(sh_audio->wf);
- if(verbose>=1) print_wave_header(sh_audio->wf,apriv->streamh.type_size);
+ if(mp_conf.verbose>=1) print_wave_header(sh_audio->wf,apriv->streamh.type_size);
if(ASF_LOAD_GUID_PREFIX(apriv->streamh.concealment)==ASF_GUID_PREFIX_audio_conceal_interleave){
stream_read(demuxer->stream,(char*) buffer,apriv->streamh.stream_size);
apriv->asf_scrambling_h=buffer[0];
@@ -205,7 +205,7 @@
sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1);
memcpy(sh_video->bih,&buffer[4+4+1+2],len);
le2me_BITMAPINFOHEADER(sh_video->bih);
- if(verbose>=1) print_video_header(sh_video->bih,len);
+ if(mp_conf.verbose>=1) print_video_header(sh_video->bih,len);
break;
}
}
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_audio.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -1354,7 +1354,7 @@
MSG_V("demux_audio: audio data 0x%llX - 0x%llX \n",demuxer->movi_start,demuxer->movi_end);
if(stream_tell(s) != demuxer->movi_start)
stream_seek(s,demuxer->movi_start);
- if(verbose && sh_audio->wf) print_wave_header(sh_audio->wf,sizeof(WAVEFORMATEX));
+ if(mp_conf.verbose && sh_audio->wf) print_wave_header(sh_audio->wf,sizeof(WAVEFORMATEX));
if(demuxer->movi_length==UINT_MAX && sh_audio->i_bps)
demuxer->movi_length=(unsigned)(((float)demuxer->movi_end-(float)demuxer->movi_start)/(float)sh_audio->i_bps);
return demuxer;
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -241,7 +241,7 @@
le2me_MainAVIHeader(&avih); // swap to machine endian
chunksize-=MIN(size2,sizeof(avih));
demuxer->movi_length=avih.dwTotalFrames;
- if(verbose) print_avih(&avih); else print_avih_flags(&avih);
+ if(mp_conf.verbose) print_avih(&avih); else print_avih_flags(&avih);
break;
case ckidSTREAMHEADER: { // read 'strh'
AVIStreamHeader h;
@@ -264,7 +264,7 @@
// demuxer->audio->sh=sh_audio;
}
last_fccType=h.fccType;
- if(verbose>=1) print_strh(&h);
+ if(mp_conf.verbose>=1) print_strh(&h);
break; }
case mmioFOURCC('i', 'n', 'd', 'x'): {
uint32_t i;
@@ -316,7 +316,7 @@
// fixup MS-RLE header (seems to be broken for <256 color files)
if(sh_video->bih->biCompression<=1 && sh_video->bih->biSize==40)
sh_video->bih->biSize=chunksize;
- if(verbose>=1) print_video_header(sh_video->bih,chunksize);
+ if(mp_conf.verbose>=1) print_video_header(sh_video->bih,chunksize);
if(chunksize>0x28 && strncmp((char *)&sh_video->bih->biCompression,"MPGI",4) == 0)
sh_video->aspect=get_avi_aspect(*(((char *)sh_video->bih)+0x28));
chunksize=0;
@@ -373,7 +373,7 @@
sh_audio->wf=realloc(sh_audio->wf, sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize);
}
chunksize=0;
- if(verbose>=1) print_wave_header(sh_audio->wf,wf_size);
+ if(mp_conf.verbose>=1) print_wave_header(sh_audio->wf,wf_size);
++priv->audio_streams;
// if(demuxer->audio->id==-1) demuxer->audio->id=stream_id;
}
@@ -396,7 +396,7 @@
if (sh_video) {
sh_video->aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio);
}
- if(verbose>=1) print_vprp(vprp);
+ if(mp_conf.verbose>=1) print_vprp(vprp);
free(vprp);
break;
}
@@ -429,7 +429,7 @@
entry->dwFlags&=0xffff;
}
chunksize-=priv->idx_size<<4;
- if(verbose>=2) print_index(priv->idx,priv->idx_size);
+ if(mp_conf.verbose>=2) print_index(priv->idx,priv->idx_size);
}
break;
/* added May 2002 */
@@ -600,7 +600,7 @@
}
}
- if (verbose>=2) print_index(priv->idx, priv->idx_size);
+ if (mp_conf.verbose>=2) print_index(priv->idx, priv->idx_size);
demuxer->movi_end=demuxer->stream->end_pos;
@@ -729,7 +729,7 @@
}
priv->idx_size=priv->idx_pos;
MSG_INFO("Indexed are generated for %ul chunks\n",priv->idx_size);
- if(verbose>=2) print_index(priv->idx,priv->idx_size);
+ if(mp_conf.verbose>=2) print_index(priv->idx,priv->idx_size);
#if 0
/* Write generated index to a file */
Modified: mplayerxp/libmpdemux/demux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_lavf.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -330,7 +330,7 @@
default:
break;
}
- if(verbose>=1) print_wave_header(sh_audio->wf);
+ if(mp_conf.verbose>=1) print_wave_header(sh_audio->wf);
if(demuxer->audio->id != i && demuxer->audio->id != -1)
st->discard= AVDISCARD_ALL;
else{
@@ -376,7 +376,7 @@
sh_video->ds= demuxer->video;
if(codec->extradata_size)
memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size);
- if(verbose>=1) print_video_header(sh_video->bih);
+ if(mp_conf.verbose>=1) print_video_header(sh_video->bih);
/* short biPlanes;
int biXPelsPerMeter;
int biYPelsPerMeter;
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_mkv.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -6,7 +6,8 @@
* Licence: GPL
*/
#define USE_QTX_CODECS 1
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#include <stdlib.h>
#include <stdio.h>
@@ -574,11 +575,6 @@
#define RAPROPERTIES4_SIZE 56
#define RAPROPERTIES5_SIZE 70
-/* for e.g. "-slang ger" */
-extern char *dvdsub_lang;
-extern char *audio_lang;
-extern int dvdsub_id;
-
/**
* \brief ensures there is space for at least one additional element
* \param array array to grow
@@ -2885,8 +2881,8 @@
if (demuxer->audio->id == -1) /* automatically select an audio track */
{
/* check if the user specified an audio language */
- if (audio_lang != NULL)
- track = demux_mkv_find_track_by_language(mkv_d, audio_lang,
+ if (mp_conf.audio_lang != NULL)
+ track = demux_mkv_find_track_by_language(mkv_d, mp_conf.audio_lang,
MATROSKA_TRACK_AUDIO);
if (track == NULL)
/* no audio language specified, or language not found */
@@ -2948,14 +2944,14 @@
if (demuxer->sub->id >= 0)
track = demux_mkv_find_track_by_num (mkv_d, demuxer->sub->id,
MATROSKA_TRACK_SUBTITLE);
- else if (dvdsub_lang != NULL)
- track = demux_mkv_find_track_by_language (mkv_d, dvdsub_lang,
+ else if (mp_conf.dvdsub_lang != NULL)
+ track = demux_mkv_find_track_by_language (mkv_d, mp_conf.dvdsub_lang,
MATROSKA_TRACK_SUBTITLE);
if (track)
{
MSG_V("[mkv] Will display subtitle track %u.\n", track->tnum);
- dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE);
+ mp_conf.dvdsub_id = demux_mkv_reverse_id(mkv_d, track->tnum, MATROSKA_TRACK_SUBTITLE);
#if 0
mkv_d->sh_sub->id = track->tnum;
mkv_d->sh_sub->sh = demuxer->s_streams[track->tnum];
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -219,7 +219,7 @@
sh->bih=malloc(fsize<sizeof(BITMAPINFOHEADER)?sizeof(BITMAPINFOHEADER):fsize);
stream_read(s,(char *)sh->bih,fsize);
le2me_BITMAPINFOHEADER(sh->bih);
- if(verbose>=1) print_video_header(sh->bih,fsize);
+ if(mp_conf.verbose>=1) print_video_header(sh->bih,fsize);
have_bih=1;
if(demuxer->video->id==-1) demuxer->video->id=id; /* TODO: select best */
demuxer->video->sh=sh;
@@ -245,7 +245,7 @@
le2me_VideoPropHeader(&vprp);
le2me_VIDEO_FIELD_DESC(&vprp.FieldInfo[0]);
le2me_VIDEO_FIELD_DESC(&vprp.FieldInfo[1]);
- if(verbose) print_vprp(&vprp);
+ if(mp_conf.verbose) print_vprp(&vprp);
if(fsize>sizeof(VideoPropHeader)) stream_skip(s,fsize-sizeof(VideoPropHeader));
sh->aspect=GET_AVI_ASPECT(vprp.dwFrameAspectRatio);
}
@@ -295,7 +295,7 @@
sh->wf=malloc(fsize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):fsize);
stream_read(s,(char *)sh->wf,fsize);
le2me_WAVEFORMATEX(sh->wf);
- if(verbose>=1) print_wave_header(sh->wf,fsize);
+ if(mp_conf.verbose>=1) print_wave_header(sh->wf,fsize);
have_wf=1;
if(demuxer->audio->id==-1) demuxer->audio->id=id; /* TODO: select best */
demuxer->audio->sh=sh;
@@ -338,7 +338,7 @@
/* Read stream properties */
stream_read(s,(char *)&priv->sprop[id],sizeof(mpxpav64StreamProperties_t));
le2me_mpxpav64StreamProperties(&priv->sprop[id]);
- if(verbose)
+ if(mp_conf.verbose)
{
char mime[priv->sprop[id].mimetype_len+1];
stream_read(s,mime,priv->sprop[id].mimetype_len);
@@ -498,7 +498,7 @@
MSG_ERR("Too many (%i) streams. Max available=%i\n",priv->nstreams,MAX_AV_STREAMS);
goto open_failed;
}
- if(verbose) print_FileProp(&priv->fprop);
+ if(mp_conf.verbose) print_FileProp(&priv->fprop);
stream_skip(s,fsize-sizeof(mpxpav64FileProperties_t));
if((priv->fprop.flags&(~MPXPAV64_FP_FCNT_UTF32))!=0ULL)
{
@@ -578,7 +578,7 @@
off_t pos=0LL;
demux_packet_t* dp;
dp=new_demux_packet(len);
- if(verbose>1) pos=stream_tell(s);
+ if(mp_conf.verbose>1) pos=stream_tell(s);
len=stream_read(s,dp->buffer,len);
resize_demux_packet(dp,len);
dp->pts=pts;
@@ -848,7 +848,7 @@
{
if(mpxpav64_sync(demuxer))
{
- if(verbose) MSG_V("MPXPAV64_SEEK: newpos after sync %016llX\n",stream_tell(demuxer->stream));
+ if(mp_conf.verbose) MSG_V("MPXPAV64_SEEK: newpos after sync %016llX\n",stream_tell(demuxer->stream));
mpxpav64_reset_prevs(demuxer);
mpca_resync_stream(demuxer->audio->sh);
}
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -474,7 +474,7 @@
ogg_d->text_langs[index] = strdup(val);
}
// check for -slang if subs are uninitialized yet
- if (os->text && d->sub->id == -1 && demux_ogg_check_lang(val, dvdsub_lang))
+ if (os->text && d->sub->id == -1 && demux_ogg_check_lang(val, mp_conf.dvdsub_lang))
{
d->sub->id = id;
#if 0
@@ -858,7 +858,7 @@
inf.width, inf.height,
sh_v->fps,
inf.aspect_numerator, inf.aspect_denominator);
- if(verbose>0) print_video_header(sh_v->bih,sizeof(BITMAPINFOHEADER));
+ if(mp_conf.verbose>0) print_video_header(sh_v->bih,sizeof(BITMAPINFOHEADER));
}
}
#endif
@@ -895,7 +895,7 @@
ogg_d->subs[ogg_d->num_sub].id = n_video;
n_video++;
MSG_V("Ogg stream %d is video (old hdr)\n",ogg_d->num_sub);
- if(verbose>0) print_video_header(sh_v->bih,sizeof(BITMAPINFOHEADER));
+ if(mp_conf.verbose>0) print_video_header(sh_v->bih,sizeof(BITMAPINFOHEADER));
// Old audio header
} else if(get_uint32(pack.packet+96) == 0x05589F81) {
unsigned int extra_size;
@@ -917,7 +917,7 @@
ogg_d->subs[ogg_d->num_sub].id = n_audio;
n_audio++;
MSG_V("Ogg stream %d is audio (old hdr)\n",ogg_d->num_sub);
- if(verbose>0) print_wave_header(sh_a->wf,sizeof(WAVEFORMATEX)+extra_size);
+ if(mp_conf.verbose>0) print_wave_header(sh_a->wf,sizeof(WAVEFORMATEX)+extra_size);
} else
MSG_WARN("Ogg stream %d contains an old header but the header type is unknown\n",ogg_d->num_sub);
@@ -946,7 +946,7 @@
ogg_d->subs[ogg_d->num_sub].id = n_video;
n_video++;
MSG_V("Ogg stream %d is video (new hdr)\n",ogg_d->num_sub);
- if(verbose>0) print_video_header(sh_v->bih,sizeof(BITMAPINFOHEADER));
+ if(mp_conf.verbose>0) print_video_header(sh_v->bih,sizeof(BITMAPINFOHEADER));
/// New audio header
} else if(strncmp(st->streamtype,"audio",5) == 0) {
char buffer[5];
@@ -970,7 +970,7 @@
ogg_d->subs[ogg_d->num_sub].id = n_audio;
n_audio++;
MSG_V("Ogg stream %d is audio (new hdr)\n",ogg_d->num_sub);
- if(verbose>0) print_wave_header(sh_a->wf,sizeof(WAVEFORMATEX)+extra_size);
+ if(mp_conf.verbose>0) print_wave_header(sh_a->wf,sizeof(WAVEFORMATEX)+extra_size);
/// Check for text (subtitles) header
} else if (strncmp(st->streamtype, "text", 4) == 0) {
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -120,7 +120,7 @@
real_index_table_t *index;
int i, entries;
- if (verbose<=1)
+ if (mp_conf.verbose<=1)
return;
if (stream_id > MAX_STREAMS)
@@ -358,7 +358,7 @@
if(pict_type<=1){
// I frame, sync timestamps:
priv->kf_base=timestamp-kf;
- if(verbose>1) MSG_DBG2("\nTS: base=%08X\n",priv->kf_base);
+ if(mp_conf.verbose>1) MSG_DBG2("\nTS: base=%08X\n",priv->kf_base);
kf=timestamp;
} else {
// P/B frame, merge timestamps:
@@ -1152,7 +1152,7 @@
sh->wf->wFormatTag = sh->format;
- if (verbose > 0)
+ if (mp_conf.verbose > 0)
print_wave_header(sh->wf,sizeof(WAVEFORMATEX));
/* Select audio stream with highest bitrate if multirate file*/
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demux_ts.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -970,17 +970,17 @@
params.prog = ts_prog;
params.probe = _ts_probe;
- if(dvdsub_lang != NULL)
+ if(mp_conf.dvdsub_lang != NULL)
{
- strncpy(params.slang, dvdsub_lang, 3);
+ strncpy(params.slang, mp_conf.dvdsub_lang, 3);
params.slang[3] = 0;
}
else
memset(params.slang, 0, 4);
- if(audio_lang != NULL)
+ if(mp_conf.audio_lang != NULL)
{
- strncpy(params.alang, audio_lang, 3);
+ strncpy(params.alang, mp_conf.audio_lang, 3);
params.alang[3] = 0;
}
else
@@ -2786,10 +2786,10 @@
int asgn = 0;
uint8_t *lang;
- if(dvdsub_lang)
+ if(mp_conf.dvdsub_lang)
{
if ((lang = pid_lang_from_pmt(priv, pid)))
- asgn = (strncmp(lang, dvdsub_lang, 3) == 0);
+ asgn = (strncmp(lang, mp_conf.dvdsub_lang, 3) == 0);
}
else //no language specified with -slang
asgn = 1;
Modified: mplayerxp/libmpdemux/demuxer.c
===================================================================
--- mplayerxp/libmpdemux/demuxer.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demuxer.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -309,7 +309,7 @@
int ds_fill_buffer(demux_stream_t *ds){
demuxer_t *demux=ds->demuxer;
if(ds->buffer) free(ds->buffer);
- if(verbose>2){
+ if(mp_conf.verbose>2){
if(ds==demux->audio)
MSG_DBG3("ds_fill_buffer(d_audio) called\n");
else
Modified: mplayerxp/libmpdemux/demuxer_r.c
===================================================================
--- mplayerxp/libmpdemux/demuxer_r.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/demuxer_r.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -62,18 +62,18 @@
unsigned int t2=0;
double tt;
LOCK_DEMUXER();
- if(benchmark) t=GetTimer();
+ if(mp_conf.benchmark) t=GetTimer();
retval = demux_getc(ds);
*pts=get_ds_stream_pts(ds,1);
if(initial_audio_pts == HUGE) initial_audio_pts=*pts;
- if(benchmark)
+ if(mp_conf.benchmark)
{
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- demux_time_usage+=tt;
- audio_decode_time_usage_correction=tt;
- if(tt > max_demux_time_usage) max_demux_time_usage=tt;
- if(tt < min_demux_time_usage) min_demux_time_usage=tt;
+ time_usage.demux+=tt;
+ time_usage.audio_decode_correction=tt;
+ if(tt > time_usage.max_demux) time_usage.max_demux=tt;
+ if(tt < time_usage.min_demux) time_usage.min_demux=tt;
}
UNLOCK_DEMUXER();
return retval;
@@ -86,15 +86,15 @@
unsigned int t2=0;
double tt;
LOCK_DEMUXER();
- if(benchmark) t=GetTimer();
+ if(mp_conf.benchmark) t=GetTimer();
retval = video_read_frame(sh_video,frame_time_ptr,v_pts,start,force_fps);
- if(benchmark)
+ if(mp_conf.benchmark)
{
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- demux_time_usage+=tt;
- if(tt > max_demux_time_usage) max_demux_time_usage=tt;
- if(tt < min_demux_time_usage) min_demux_time_usage=tt;
+ time_usage.demux+=tt;
+ if(tt > time_usage.max_demux) time_usage.max_demux=tt;
+ if(tt < time_usage.min_demux) time_usage.min_demux=tt;
}
UNLOCK_DEMUXER();
return retval;
@@ -107,18 +107,18 @@
unsigned int t2=0;
double tt;
LOCK_DEMUXER();
- if(benchmark) t=GetTimer();
+ if(mp_conf.benchmark) t=GetTimer();
retval = demux_read_data(ds,mem,len);
*pts=get_ds_stream_pts(ds,retval);
if(initial_audio_pts == HUGE) initial_audio_pts=*pts;
- if(benchmark)
+ if(mp_conf.benchmark)
{
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- demux_time_usage+=tt;
- audio_decode_time_usage_correction=tt;
- if(tt > max_demux_time_usage) max_demux_time_usage=tt;
- if(tt < min_demux_time_usage) min_demux_time_usage=tt;
+ time_usage.demux+=tt;
+ time_usage.audio_decode_correction=tt;
+ if(tt > time_usage.max_demux) time_usage.max_demux=tt;
+ if(tt < time_usage.min_demux) time_usage.min_demux=tt;
}
UNLOCK_DEMUXER();
return retval;
@@ -131,18 +131,18 @@
unsigned int t2=0;
double tt;
LOCK_DEMUXER();
- if(benchmark) t=GetTimer();
+ if(mp_conf.benchmark) t=GetTimer();
retval = ds_get_packet(ds,start);
*pts=get_ds_stream_pts(ds,retval);
if(initial_audio_pts == HUGE) initial_audio_pts=*pts;
- if(benchmark)
+ if(mp_conf.benchmark)
{
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- demux_time_usage+=tt;
- audio_decode_time_usage_correction=tt;
- if(tt > max_demux_time_usage) max_demux_time_usage=tt;
- if(tt < min_demux_time_usage) min_demux_time_usage=tt;
+ time_usage.demux+=tt;
+ time_usage.audio_decode_correction=tt;
+ if(tt > time_usage.max_demux) time_usage.max_demux=tt;
+ if(tt < time_usage.min_demux) time_usage.min_demux=tt;
}
UNLOCK_DEMUXER();
return retval;
@@ -164,15 +164,15 @@
unsigned int t2=0;
double tt;
LOCK_DEMUXER();
- if(benchmark) t=GetTimer();
+ if(mp_conf.benchmark) t=GetTimer();
retval = demux_seek(demuxer,seeka);
- if(benchmark)
+ if(mp_conf.benchmark)
{
t2=GetTimer();t=t2-t;
tt = t*0.000001f;
- demux_time_usage+=tt;
- if(tt > max_demux_time_usage) max_demux_time_usage=tt;
- if(tt < min_demux_time_usage) min_demux_time_usage=tt;
+ time_usage.demux+=tt;
+ if(tt > time_usage.max_demux) time_usage.max_demux=tt;
+ if(tt < time_usage.min_demux) time_usage.min_demux=tt;
}
UNLOCK_DEMUXER();
return retval;
Modified: mplayerxp/libmpdemux/librtsp/rtsp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/librtsp/rtsp.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <assert.h>
#include "mp_config.h"
+#include "mplayer.h"
#ifndef HAVE_WINSOCK2
#define closesocket close
#include <sys/socket.h>
Modified: mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -27,6 +27,7 @@
#include <inttypes.h>
#include "mp_config.h"
+#include "mplayer.h"
#ifndef HAVE_WINSOCK2
#include <netdb.h>
Modified: mplayerxp/libmpdemux/librtsp/rtsp_session.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_session.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/librtsp/rtsp_session.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -30,6 +30,7 @@
#include <sys/types.h>
#include "mp_config.h"
+#include "mplayer.h"
#ifndef HAVE_WINSOCK2
#include <sys/socket.h>
#include <netinet/in.h>
Modified: mplayerxp/libmpdemux/network.c
===================================================================
--- mplayerxp/libmpdemux/network.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/network.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -442,7 +442,7 @@
}
*fd_out=fd;
- if( verbose ) {
+ if( mp_conf.verbose ) {
http_debug_hdr( http_hdr );
}
@@ -696,13 +696,13 @@
void fixup_network_stream_cache(stream_t *stream) {
if(stream->streaming_ctrl->buffering) {
- if(stream_cache_size<0) {
+ if(mp_conf.s_cache_size<0) {
// cache option not set, will use our computed value.
// buffer in KBytes, *5 because the prefill is 20% of the buffer.
- stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
- if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer
+ mp_conf.s_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
+ if( mp_conf.s_cache_size<64 ) mp_conf.s_cache_size = 64; // 16KBytes min buffer
}
- MSG_INFO("[network] cache size set to: %i\n", stream_cache_size);
+ MSG_INFO("[network] cache size set to: %i\n", mp_conf.s_cache_size);
}
}
@@ -976,13 +976,13 @@
streaming_ctrl_free( stream->streaming_ctrl );
stream->streaming_ctrl = NULL;
} else if( stream->streaming_ctrl->buffering ) {
- if(stream_cache_size<0) {
+ if(mp_conf.s_cache_size<0) {
// cache option not set, will use our computed value.
// buffer in KBytes, *5 because the prefill is 20% of the buffer.
- stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
- if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer
+ mp_conf.s_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
+ if( mp_conf.s_cache_size<64 ) mp_conf.s_cache_size = 64; // 16KBytes min buffer
}
- MSG_INFO("Cache size set to %d KBytes\n", stream_cache_size);
+ MSG_INFO("Cache size set to %d KBytes\n", mp_conf.s_cache_size);
}
return ret;
Modified: mplayerxp/libmpdemux/realrtsp/asmrp.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/asmrp.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/realrtsp/asmrp.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -42,6 +42,7 @@
#include <string.h>
#include "asmrp.h"
#include "../demux_msg.h"
+#include "mplayer.h"
/*
#define LOG
Modified: mplayerxp/libmpdemux/realrtsp/real.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/real.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/realrtsp/real.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -30,8 +30,9 @@
#include <stdio.h>
#include <string.h>
-#include "../../mp_config.h"
-#include "../../bswap.h"
+#include "mp_config.h"
+#include "mplayer.h"
+#include "bswap.h"
//#include "libavutil/common.h"
#include "real.h"
#include "asmrp.h"
Modified: mplayerxp/libmpdemux/realrtsp/rmff.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/rmff.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/realrtsp/rmff.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -28,7 +28,8 @@
#include "rmff.h"
#include "xbuffer.h"
-#include "../../bswap.h"
+#include "bswap.h"
+#include "mplayer.h"
#include "md5.h"
#include "../demux_msg.h"
Modified: mplayerxp/libmpdemux/realrtsp/sdpplin.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/sdpplin.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/realrtsp/sdpplin.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -27,6 +27,7 @@
*/
#include "mp_config.h"
+#include "mplayer.h"
#include "../librtsp/rtsp.h"
#include "sdpplin.h"
#include "xbuffer.h"
Modified: mplayerxp/libmpdemux/realrtsp/xbuffer.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/xbuffer.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/realrtsp/xbuffer.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -13,6 +13,8 @@
*
*/
+#include "mplayer.h"
+
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
Modified: mplayerxp/libmpdemux/s_cdd.c
===================================================================
--- mplayerxp/libmpdemux/s_cdd.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_cdd.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -1,7 +1,9 @@
/*
s_cdd - cdda & cddb streams interface
*/
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: mplayerxp/libmpdemux/s_dvdnav.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdnav.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_dvdnav.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -100,7 +100,7 @@
}
/* turn on/off dvdnav caching */
- dvdnav_set_readahead_flag(dvdnav_priv->dvdnav,stream_cache_size?0:1);
+ dvdnav_set_readahead_flag(dvdnav_priv->dvdnav,mp_conf.s_cache_size?0:1);
/* report the title?! */
if (dvdnav_get_title_string(dvdnav_priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) {
@@ -220,7 +220,7 @@
dvd_ok:
if(dvd_device) free(dvd_device);
((dvdnav_priv_t *)stream->priv)->started=1;
- if(stream_cache_size)
+ if(mp_conf.s_cache_size)
{
tevent = malloc(sizeof(dvdnav_event_t));
if(tevent)
@@ -511,11 +511,11 @@
stream_change->physical_letterbox,
stream_change->physical_pan_scan,
stream_change->logical);
- if (vo_data->spudec && dvdsub_id!=stream_change->physical_wide) {
+ if (vo_data->spudec && mp_conf.dvdsub_id!=stream_change->physical_wide) {
MSG_DBG2("d_dvdsub->id change: was %d is now %d\n",
d_dvdsub->id,stream_change->physical_wide);
// FIXME: need a better way to change SPU id
- d_dvdsub->id=dvdsub_id=stream_change->physical_wide;
+ d_dvdsub->id=mp_conf.dvdsub_id=stream_change->physical_wide;
if (vo_data->spudec) spudec_reset(vo_data->spudec);
}
break;
@@ -529,11 +529,11 @@
stream_change->logical);
aid_temp=stream_change->physical;
if (aid_temp>=0) aid_temp+=128; // FIXME: is this sane?
- if (d_audio && audio_id!=aid_temp) {
+ if (d_audio && mp_conf.audio_id!=aid_temp) {
MSG_DBG2("d_audio->id change: was %d is now %d\n",
d_audio->id,aid_temp);
// FIXME: need a bettery way to change audio stream id
- d_audio->id=dvdsub_id=aid_temp;
+ d_audio->id=mp_conf.dvdsub_id=aid_temp;
mpxp_resync_audio_stream();
}
break;
Modified: mplayerxp/libmpdemux/s_dvdread.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdread.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_dvdread.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -2,7 +2,8 @@
s_dvdread - DVDREAD stream interface
*/
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#ifdef USE_DVDREAD
#include <stdlib.h>
#include <string.h>
Modified: mplayerxp/libmpdemux/s_ffmpeg.c
===================================================================
--- mplayerxp/libmpdemux/s_ffmpeg.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_ffmpeg.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -1,4 +1,5 @@
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#include <dlfcn.h>
#include "libavformat/avformat.h"
Modified: mplayerxp/libmpdemux/s_file.c
===================================================================
--- mplayerxp/libmpdemux/s_file.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_file.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -36,7 +36,7 @@
/* decreasing number of packet from 256 to 10 speedups cache2 from 3.27% to 1.26%
with full speed 1.04% for -nocache */
/* Note: Please locate sector_size changinf after all read/write operations of open() function */
- stream->sector_size=stream_cache_size?stream_cache_size*1024/10:STREAM_BUFFER_SIZE;
+ stream->sector_size=mp_conf.s_cache_size?mp_conf.s_cache_size*1024/10:STREAM_BUFFER_SIZE;
((file_priv_t*)stream->priv)->spos = 0;
return 1;
}
Modified: mplayerxp/libmpdemux/s_tv.c
===================================================================
--- mplayerxp/libmpdemux/s_tv.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_tv.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -11,7 +11,8 @@
to add support for audio, and bktr *BSD support.
*/
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "mplayer.h"
#ifdef USE_TV
#include <stdlib.h>
#include <string.h>
Modified: mplayerxp/libmpdemux/s_vcdnav.c
===================================================================
--- mplayerxp/libmpdemux/s_vcdnav.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/s_vcdnav.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -74,8 +74,8 @@
if(param) vcd_track=atoi(param);
priv=stream->priv=calloc(1,sizeof(vcd_priv_t));
// vcdinfo_init(priv->fd);
- if(verbose>1) vcd_loglevel_default=VCD_LOG_DEBUG;
- else if(verbose) vcd_loglevel_default=VCD_LOG_INFO;
+ if(mp_conf.verbose>1) vcd_loglevel_default=VCD_LOG_DEBUG;
+ else if(mp_conf.verbose) vcd_loglevel_default=VCD_LOG_INFO;
open_rc=vcdinfo_open(&priv->fd,&device,DRIVER_UNKNOWN,NULL);
if(!priv->fd)
{
Modified: mplayerxp/libmpdemux/url.c
===================================================================
--- mplayerxp/libmpdemux/url.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpdemux/url.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -14,6 +14,7 @@
#include "url.h"
#include "help_mp.h"
#include "demux_msg.h"
+#include "mplayer.h"
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
Modified: mplayerxp/libmpsub/vobsub.c
===================================================================
--- mplayerxp/libmpsub/vobsub.c 2012-10-25 09:12:05 UTC (rev 203)
+++ mplayerxp/libmpsub/vobsub.c 2012-10-25 14:45:04 UTC (rev 204)
@@ -453,7 +453,7 @@
memcpy(vob->spu_streams[index].id, id, idlen);
}
vob->spu_streams_current = index;
- if (verbose)
+ if (mp_conf.verbose)
MSG_ERR( "[vobsub] subtitle (vobsubid): %d language %s\n",
index, vob->spu_streams[index].id);
return 0;
@@ -726,8 +726,8 @@
static int __FASTCALL__ vobsub_set_lang(vobsub_t *vob, const ch...
[truncated message content] |
