[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[184] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[184] mplayerxp
|
From: <nic...@us...> - 2012-10-20 13:37:50
|
Revision: 184
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=184&view=rev
Author: nickols_k
Date: 2012-10-20 13:37:43 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
rename some functions
Modified Paths:
--------------
mplayerxp/dec_ahead.c
mplayerxp/dec_ahead.h
mplayerxp/libmpcodecs/ad.h
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_dshow.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_internal.h
mplayerxp/libmpcodecs/ad_libdv.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_null.c
mplayerxp/libmpcodecs/ad_pcm.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/ad_vorbis.c
mplayerxp/libmpcodecs/dec_audio.c
mplayerxp/libmpcodecs/dec_audio.h
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/dec_video.h
mplayerxp/libmpdemux/demux_aiff.c
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_rawaudio.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demux_vqf.c
mplayerxp/libmpdemux/test.c
mplayerxp/mplayer.c
Modified: mplayerxp/dec_ahead.c
===================================================================
--- mplayerxp/dec_ahead.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/dec_ahead.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -386,13 +386,13 @@
unsigned distance = dae_get_decoder_outrun(xp_core.video);
int our_quality;
our_quality = output_quality*distance/total;
- if(drop_param) set_video_quality(sh_video,0);
+ if(drop_param) mpcv_set_quality(sh_video,0);
else
- if(auto_quality) set_video_quality(sh_video,our_quality>0?our_quality:0);
+ if(auto_quality) mpcv_set_quality(sh_video,our_quality>0?our_quality:0);
}
- blit_frame=decode_video(sh_video,start,in_size,drop_param,v_pts);
+ blit_frame=mpcv_decode(sh_video,start,in_size,drop_param,v_pts);
if(output_quality) {
- if(drop_param) set_video_quality(sh_video,output_quality);
+ if(drop_param) mpcv_set_quality(sh_video,output_quality);
}
if(!blit_frame && drop_param) xp_drop_frame_cnt++;
#ifdef ENABLE_DEC_AHEAD_DEBUG
@@ -651,7 +651,7 @@
return 0;
}
-int run_xp_players(void)
+int run_xp_aplayers(void)
{
int retval;
if( xp_core.has_audio && enable_xp >= XP_VAPlay )
Modified: mplayerxp/dec_ahead.h
===================================================================
--- mplayerxp/dec_ahead.h 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/dec_ahead.h 2012-10-20 13:37:43 UTC (rev 184)
@@ -127,7 +127,7 @@
extern int init_dec_ahead(sh_video_t*stream, sh_audio_t *astream);
extern void uninit_dec_ahead( int force );
extern int run_dec_ahead( void );
-extern int run_xp_players( void );
+extern int run_xp_aplayers( void );
extern void dec_ahead_reset_sh_video(sh_video_t* shv);
extern void sig_dec_ahead_video( void );
Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad.h 2012-10-20 13:37:43 UTC (rev 184)
@@ -35,7 +35,7 @@
int (*init)(sh_audio_t *sh);
void (*uninit)(sh_audio_t *sh);
int (*control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
- unsigned (*decode_audio)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
+ unsigned (*mpca_decode)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
} ad_functions_t;
// NULL terminated array of all drivers
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -213,7 +213,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
sample_t level=1, bias=384;
int flags=mpxp_a52_flags|A52_ADJUST_LEVEL;
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -129,7 +129,7 @@
int init(sh_audio_t *sh_audio)
{
float pts;
- int ret=decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size,&pts);
+ int ret=mpca_decode(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size,&pts);
if(ret<0){
MSG_INFO("ACM decoding error: %d\n",ret);
return 0;
@@ -183,7 +183,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
ACMSTREAMHEADER ash;
HRESULT hr;
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_dca.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -214,7 +214,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
sample_t level=1, bias=384;
unsigned i,nblocks,flags=mpxp_dca_flags|DCA_ADJUST_LEVEL;
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -92,7 +92,7 @@
return CONTROL_UNKNOWN;
}
-static unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+static unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
dmo_priv_t* priv = sh_audio->context;
unsigned len=0;
Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_dshow.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -88,7 +88,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
dshow_priv_t* priv = sh_audio->context;
unsigned len=0;
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -92,7 +92,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
int j;
unsigned len;
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -275,7 +275,7 @@
return CONTROL_UNKNOWN;
}
-static unsigned decode_audio(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+static unsigned mpca_decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
faad_priv_t *priv=sh->context;
int j = 0;
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -105,7 +105,7 @@
}
// Decode at least 1 byte: (to get header filled)
- x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size,&pts);
+ x=mpca_decode(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size,&pts);
if(x>0) sh_audio->a_buffer_len=x;
sh_audio->channels=lavc_context->channels;
@@ -159,7 +159,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
unsigned char *start=NULL;
int y;
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -222,7 +222,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
unsigned len=0;
UNUSED(minlen);
Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_internal.h 2012-10-20 13:37:43 UTC (rev 184)
@@ -17,7 +17,7 @@
static int preinit(sh_audio_t *sh);
static void uninit(sh_audio_t *sh);
static int control(sh_audio_t *sh,int cmd,any_t* arg, ...);
-static unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
+static unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
#define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\
&info,\
@@ -26,6 +26,6 @@
init,\
uninit,\
control,\
- decode_audio\
+ mpca_decode\
};
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -86,7 +86,7 @@
return CONTROL_UNKNOWN;
}
-static unsigned decode_audio(sh_audio_t *sh, unsigned char *buf, unsigned minlen, unsigned maxlen,float *pts)
+static unsigned mpca_decode(sh_audio_t *sh, unsigned char *buf, unsigned minlen, unsigned maxlen,float *pts)
{
libdv_priv_t *priv = sh->context;
dv_decoder_t* decoder=priv->decoder; //global_rawdv_decoder;
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -354,7 +354,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
mp3_priv_t *priv=sh->context;
unsigned char *indata=NULL,*outdata=NULL;
Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_null.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -42,7 +42,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
UNUSED(sh_audio);
UNUSED(buf);
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -87,7 +87,7 @@
return CONTROL_UNKNOWN;
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
unsigned len = sh_audio->channels*sh_audio->samplesize;
len = (minlen + len - 1) / len * len;
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -279,7 +279,7 @@
#endif
}
-static unsigned decode_audio(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts){
+static unsigned mpca_decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts){
int error;
unsigned long FramesToGet=0; //how many frames the demuxer has to get
unsigned long InputBufferSize=0; //size of the input buffer
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_real.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -208,7 +208,7 @@
{42,87},{43,65},{45,59},{48,79},{49,93},{51,89},{55,95},{61,76},{67,83},
{77,80} };
-static unsigned decode_audio(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts){
+static unsigned mpca_decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts){
real_priv_t *rpriv = sh->context;
float null_pts;
int result;
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_twin.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -632,7 +632,7 @@
}
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
unsigned l,len=0;
float null_pts;
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -136,7 +136,7 @@
return CONTROL_UNKNOWN;
}
-static unsigned decode_audio(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
+static unsigned mpca_decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
unsigned len = 0;
int samples;
Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/dec_audio.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -34,7 +34,7 @@
extern unsigned force_srate;
extern char *audio_codec;
-int init_audio(sh_audio_t *sh_audio)
+int mpca_init(sh_audio_t *sh_audio)
{
unsigned i;
for (i=0; mpcodecs_ad_drivers[i] != NULL; i++)
@@ -99,7 +99,7 @@
if(!mpadec->init(sh_audio)){
MSG_WARN(MSGTR_CODEC_CANT_INITA);
- uninit_audio(sh_audio); /* free buffers */
+ mpca_uninit(sh_audio); /* free buffers */
return 0;
}
@@ -107,7 +107,7 @@
if(!sh_audio->channels || !sh_audio->samplerate){
MSG_WARN(MSGTR_UnknownAudio);
- uninit_audio(sh_audio); /* free buffers */
+ mpca_uninit(sh_audio); /* free buffers */
return 0;
}
@@ -136,7 +136,7 @@
return 1;
}
-void uninit_audio(sh_audio_t *sh_audio)
+void mpca_uninit(sh_audio_t *sh_audio)
{
if(sh_audio->afilter){
MSG_V("Uninit audio filters...\n");
@@ -157,7 +157,7 @@
}
/* Init audio filters */
-int preinit_audio_filters(sh_audio_t *sh_audio,
+int mpca_preinit_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int* out_samplerate, int* out_channels, int* out_format, int out_bps){
char strbuf[200];
@@ -204,7 +204,7 @@
}
/* Init audio filters */
-int init_audio_filters(sh_audio_t *sh_audio,
+int mpca_init_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int out_samplerate, int out_channels, int out_format, int out_bps,
int out_minsize, int out_maxsize){
@@ -253,7 +253,7 @@
}
/* Init audio filters */
-int reinit_audio_filters(sh_audio_t *sh_audio,
+int mpca_reinit_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int out_samplerate, int out_channels, int out_format, int out_bps,
int out_minsize, int out_maxsize)
@@ -264,13 +264,13 @@
free(sh_audio->afilter);
sh_audio->afilter=NULL;
}
- return init_audio_filters(sh_audio,in_samplerate,in_channels,
+ return mpca_init_filters(sh_audio,in_samplerate,in_channels,
in_format,in_bps,out_samplerate,
out_channels,out_format,out_bps,
out_minsize,out_maxsize);
}
-unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts)
+unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts)
{
unsigned len;
unsigned cp_size,cp_tile;
@@ -278,7 +278,7 @@
af_data_t* pafd; // filter output
if(!sh_audio->inited) return 0; // no codec
- MSG_DBG3("decode_audio(%p,%p,%i,%i,%i,%p)\n",sh_audio,buf,minlen,maxlen,buflen,pts);
+ MSG_DBG3("mpca_decode(%p,%p,%i,%i,%i,%p)\n",sh_audio,buf,minlen,maxlen,buflen,pts);
if(minlen>maxlen) MSG_WARN(MSGTR_CODEC_XP_INT_ERR,minlen,maxlen);
if(sh_audio->af_buffer_len)
@@ -299,7 +299,7 @@
}
if(sh_audio->af_bps>sh_audio->o_bps)
maxlen=min(maxlen,(long long int)buflen*sh_audio->o_bps/sh_audio->af_bps);
- len=mpadec->decode_audio(sh_audio,buf, minlen, maxlen,pts);
+ len=mpadec->mpca_decode(sh_audio,buf, minlen, maxlen,pts);
if(len>buflen) MSG_WARN(MSGTR_CODEC_BUF_OVERFLOW,sh_audio->codec->driver_name,len,buflen);
MSG_DBG2("decaudio: %i bytes %f pts min %i max %i buflen %i o_bps=%i f_bps=%i\n",len,*pts,minlen,maxlen,buflen,sh_audio->o_bps,sh_audio->af_bps);
if(len==0 || !sh_audio->afilter) return 0; // EOF?
@@ -338,7 +338,7 @@
}
/* Note: it is called once after seeking, to resync. */
-void resync_audio_stream(sh_audio_t *sh_audio)
+void mpca_resync_stream(sh_audio_t *sh_audio)
{
if(sh_audio) {
sh_audio->a_in_buffer_len=0; /* workaround */
@@ -348,7 +348,7 @@
/* Note: it is called to skip (jump over) small amount (1/10 sec or 1 frame)
of audio data - used to sync audio to video after seeking */
-void skip_audio_frame(sh_audio_t *sh_audio)
+void mpca_skip_frame(sh_audio_t *sh_audio)
{
int rc=CONTROL_TRUE;
if(sh_audio)
Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/dec_audio.h 2012-10-20 13:37:43 UTC (rev 184)
@@ -1,20 +1,20 @@
#ifndef DEC_AUDIO_H_INCLUDED
#define DEC_AUDIO_H_INCLUDED 1
// dec_audio.c:
-extern int init_audio(sh_audio_t *sh_audio);
-extern void uninit_audio(sh_audio_t *sh_audio);
-extern unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts);
-extern void resync_audio_stream(sh_audio_t *sh_audio);
-extern void skip_audio_frame(sh_audio_t *sh_audio);
+extern int mpca_init(sh_audio_t *sh_audio);
+extern void mpca_uninit(sh_audio_t *sh_audio);
+extern unsigned mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts);
+extern void mpca_resync_stream(sh_audio_t *sh_audio);
+extern void mpca_skip_frame(sh_audio_t *sh_audio);
-extern int init_audio_filters(sh_audio_t *sh_audio,
+extern int mpca_init_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int out_samplerate, int out_channels, int out_format, int out_bps,
int out_minsize, int out_maxsize);
-extern int preinit_audio_filters(sh_audio_t *sh_audio,
+extern int mpca_preinit_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int* out_samplerate, int* out_channels, int* out_format, int out_bps);
-extern int reinit_audio_filters(sh_audio_t *sh_audio,
+extern int mpca_reinit_filters(sh_audio_t *sh_audio,
int in_samplerate, int in_channels, int in_format, int in_bps,
int out_samplerate, int out_channels, int out_format, int out_bps,
int out_minsize, int out_maxsize);
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/dec_video.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -50,7 +50,7 @@
const vd_functions_t* mpvdec=NULL;
-int get_video_quality_max(sh_video_t *sh_video){
+int mpcv_get_quality_max(sh_video_t *sh_video){
if(mpvdec){
int ret=mpvdec->control(sh_video,VDCTRL_QUERY_MAX_PP_LEVEL,NULL);
if(ret>=0) return ret;
@@ -58,12 +58,12 @@
return 0;
}
-void set_video_quality(sh_video_t *sh_video,int quality){
+void mpcv_set_quality(sh_video_t *sh_video,int quality){
if(mpvdec)
mpvdec->control(sh_video,VDCTRL_SET_PP_LEVEL, (any_t*)(&quality));
}
-int set_video_colors(sh_video_t *sh_video,char *item,int value)
+int mpcv_set_colors(sh_video_t *sh_video,char *item,int value)
{
vf_instance_t* vf=sh_video->vfilter;
vf_equalizer_t eq;
@@ -76,7 +76,7 @@
return 1;
}
-void uninit_video(sh_video_t *sh_video){
+void mpcv_uninit(sh_video_t *sh_video){
if(!sh_video->inited) return;
MSG_V("uninit video: %s\n",sh_video->codec->driver_name);
if(sh_video->vfilter && sh_video->vfilter_inited==1) vf_uninit_filter_chain(sh_video->vfilter);
@@ -90,29 +90,29 @@
extern int enable_gomp;
extern char *video_codec;
-int init_video(sh_video_t *sh_video,const char* codecname,const char * vfm,int status){
+int mpcv_init(sh_video_t *sh_video,const char* codecname,const char * vfm,int status){
unsigned o_bps,bpp;
sh_video->codec=NULL;
- MSG_DBG3("init_video(%p, %s, %s, %i)\n",sh_video,codecname,vfm,status);
+ MSG_DBG3("mpcv_init(%p, %s, %s, %i)\n",sh_video,codecname,vfm,status);
while((sh_video->codec=find_codec(sh_video->format,
sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,
sh_video->codec,0) )){
// ok we found one codec
int i;
if(sh_video->codec->flags&CODECS_FLAG_SELECTED) {
- MSG_DBG3("init_video: %s already tried and failed\n",sh_video->codec->codec_name);
+ MSG_DBG3("mpcv_init: %s already tried and failed\n",sh_video->codec->codec_name);
continue;
}
if(codecname && strcmp(sh_video->codec->codec_name,codecname)) {
- MSG_DBG3("init_video: %s != %s [-vc]\n",sh_video->codec->codec_name,codecname);
+ MSG_DBG3("mpcv_init: %s != %s [-vc]\n",sh_video->codec->codec_name,codecname);
continue;
}
if(vfm && strcmp(sh_video->codec->driver_name,vfm)!=0) {
- MSG_DBG3("init_video: vfm doesn't match %s != %s\n",vfm,sh_video->codec->driver_name);
+ MSG_DBG3("mpcv_init: vfm doesn't match %s != %s\n",vfm,sh_video->codec->driver_name);
continue; // vfm doesn't match
}
if(sh_video->codec->status<status) {
- MSG_DBG3("init_video: %s too unstable\n",sh_video->codec->codec_name);
+ MSG_DBG3("mpcv_init: %s too unstable\n",sh_video->codec->codec_name);
continue;
}
sh_video->codec->flags|=CODECS_FLAG_SELECTED; // tagging it
@@ -121,7 +121,7 @@
if(strcmp(mpcodecs_vd_drivers[i]->info->driver_name,sh_video->codec->driver_name)==0) break;
mpvdec=mpcodecs_vd_drivers[i];
if(!mpvdec) continue;
- else MSG_DBG3("init_video: mpcodecs_vd_drivers[%s]->mpvdec==0\n",mpcodecs_vd_drivers[i]->info->driver_name);
+ else MSG_DBG3("mpcv_init: mpcodecs_vd_drivers[%s]->mpvdec==0\n",mpcodecs_vd_drivers[i]->info->driver_name);
// it's available, let's try to init!
if(!mpvdec->init(sh_video)){
MSG_ERR(MSGTR_CODEC_CANT_INITV);
@@ -235,7 +235,7 @@
}
static void update_subtitle(sh_video_t *sh_video,float v_pts,unsigned idx);
-int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, float pts){
+int mpcv_decode(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame, float pts){
vf_instance_t* vf;
mp_image_t *mpi=NULL;
unsigned int t;
@@ -282,7 +282,7 @@
return 1;
}
-void resync_video_stream(sh_video_t *sh_video)
+void mpcv_resync_stream(sh_video_t *sh_video)
{
if(sh_video)
if(sh_video->inited && mpvdec) mpvdec->control(sh_video,VDCTRL_RESYNC_STREAM,NULL);
Modified: mplayerxp/libmpcodecs/dec_video.h
===================================================================
--- mplayerxp/libmpcodecs/dec_video.h 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpcodecs/dec_video.h 2012-10-20 13:37:43 UTC (rev 184)
@@ -2,16 +2,16 @@
#define DEC_VIDEO_H_INCLUDED 1
// dec_video.c:
-extern int init_video(sh_video_t *sh_video, const char *codec_name,const char *family,int status);
-extern void uninit_video(sh_video_t *sh_video);
+extern int mpcv_init(sh_video_t *sh_video, const char *codec_name,const char *family,int status);
+extern void mpcv_uninit(sh_video_t *sh_video);
-extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame,float pts);
+extern int mpcv_decode(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame,float pts);
-extern int get_video_quality_max(sh_video_t *sh_video);
-extern void set_video_quality(sh_video_t *sh_video,int quality);
+extern int mpcv_get_quality_max(sh_video_t *sh_video);
+extern void mpcv_set_quality(sh_video_t *sh_video,int quality);
-extern int set_video_colors(sh_video_t *sh_video,char *item,int value);
-extern void resync_video_stream(sh_video_t *sh_video);
+extern int mpcv_set_colors(sh_video_t *sh_video,char *item,int value);
+extern void mpcv_resync_stream(sh_video_t *sh_video);
extern int divx_quality;
Modified: mplayerxp/libmpdemux/demux_aiff.c
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_aiff.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -206,7 +206,7 @@
pos=base+(seeka->flags&DEMUX_SEEK_PERCENTS?(demuxer->movi_end - demuxer->movi_start):sh_audio->i_bps)*seeka->secs;
pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
stream_seek(s,pos);
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
static void aiff_close(demuxer_t* demuxer)
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_asf.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -702,7 +702,7 @@
if(sh_audio && !d_audio->eof){
ds_free_packs_until_pts(d_audio,d_video->pts);
ds_fill_buffer(d_audio);
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
}
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_audio.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -1690,7 +1690,7 @@
if(len > 0)
high_res_mp3_seek(demuxer,len);
sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
return;
}
@@ -1727,7 +1727,7 @@
if(len > 0)
high_res_ac3_seek(demuxer,len);
sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
return;
}
case RAW_DCA: {
@@ -1740,7 +1740,7 @@
if(len > 0)
high_res_ddca_seek(demuxer,len);
sh_audio->timer = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
return;
}
case RAW_VOC:
@@ -1755,7 +1755,7 @@
stream_seek(s,pos);
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -1518,7 +1518,7 @@
demux_read_data(d_audio,NULL,skip_audio_bytes);
//d_audio->pts=0; // PTS is outdated because of the raw data skipping
}
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
// sh_audio->timer=-skip_audio_secs;
Modified: mplayerxp/libmpdemux/demux_mpg.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_mpg.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -570,7 +570,7 @@
ds_fill_buffer(d_video);
if(sh_audio){
ds_fill_buffer(d_audio);
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
while(1){
@@ -579,7 +579,7 @@
float a_pts=d_audio->pts;
a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
if(d_video->pts>a_pts){
- skip_audio_frame(sh_audio); // sync audio
+ mpca_skip_frame(sh_audio); // sync audio
continue;
}
}
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -850,7 +850,7 @@
{
if(verbose) MSG_V("MPXPAV64_SEEK: newpos after sync %016llX\n",stream_tell(demuxer->stream));
mpxpav64_reset_prevs(demuxer);
- resync_audio_stream(demuxer->audio->sh);
+ mpca_resync_stream(demuxer->audio->sh);
}
else
{
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -1417,7 +1417,7 @@
clear_sub = -1;
demux_ogg_add_packet(ds,os,ds->id,&op);
if(sh_audio)
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
return;
}
}
Modified: mplayerxp/libmpdemux/demux_rawaudio.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_rawaudio.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -101,7 +101,7 @@
pos=base+(seeka->flags&DEMUX_SEEK_PERCENTS?demuxer->movi_end-demuxer->movi_start:sh_audio->i_bps)*seeka->secs;
pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
stream_seek(s,pos);
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
static void rawaudio_close(demuxer_t* demuxer) {}
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -1589,7 +1589,7 @@
real_demux(demuxer,NULL);
if (sh_audio)
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
return;
}
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_ts.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -3021,7 +3021,7 @@
return 0;
}
-extern void skip_audio_frame(sh_audio_t *sh_audio);
+extern void mpca_skip_frame(sh_audio_t *sh_audio);
static void reset_fifos(ts_priv_t* priv, int a, int v, int s)
{
@@ -3139,7 +3139,7 @@
a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
if(d_video->pts > a_pts)
{
- skip_audio_frame(sh_audio); // sync audio
+ mpca_skip_frame(sh_audio); // sync audio
continue;
}
}
Modified: mplayerxp/libmpdemux/demux_ty.c
===================================================================
--- mplayerxp/libmpdemux/demux_ty.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_ty.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -51,7 +51,7 @@
(((uint8_t*)(x))[1] << 8) | \
((uint8_t*)(x))[2])
-extern void skip_audio_frame( sh_audio_t *sh_audio );
+extern void mpca_skip_frame( sh_audio_t *sh_audio );
int sub_justify;
// 2/c0: audio data
@@ -809,7 +809,7 @@
(float)sh_audio->i_bps;
if( d_video->pts > a_pts )
{
- skip_audio_frame( sh_audio ); // sync audio
+ mpca_skip_frame( sh_audio ); // sync audio
continue;
}
}
Modified: mplayerxp/libmpdemux/demux_vqf.c
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/demux_vqf.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -212,7 +212,7 @@
pos=base+(seeka->flags&DEMUX_SEEK_PERCENTS?demuxer->movi_end-demuxer->movi_start:sh_audio->i_bps)*seeka->secs;
pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
stream_seek(s,pos);
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
static void vqf_close(demuxer_t* demuxer) {}
Modified: mplayerxp/libmpdemux/test.c
===================================================================
--- mplayerxp/libmpdemux/test.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/libmpdemux/test.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -14,9 +14,9 @@
// audio stream skip/resync functions requires only for seeking.
// (they should be implemented in the audio codec layer)
-void skip_audio_frame(sh_audio_t *sh_audio){
+void mpca_skip_frame(sh_audio_t *sh_audio){
}
-void resync_audio_stream(sh_audio_t *sh_audio){
+void mpca_resync_stream(sh_audio_t *sh_audio){
}
int verbose=5; // must be global!
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2012-10-20 13:09:53 UTC (rev 183)
+++ mplayerxp/mplayer.c 2012-10-20 13:37:43 UTC (rev 184)
@@ -532,7 +532,7 @@
for( l = 0, l2 = len, ret = 0; l < len && l2 >= audio_buffer.sh_audio->audio_out_minsize; ) {
float pts;
- ret = decode_audio( audio_buffer.sh_audio, &audio_buffer.buffer[audio_buffer.head], audio_buffer.min_len, l2,blen,&pts);
+ ret = mpca_decode( audio_buffer.sh_audio, &audio_buffer.buffer[audio_buffer.head], audio_buffer.min_len, l2,blen,&pts);
if( ret <= 0 )
break;
@@ -664,7 +664,7 @@
if(mask&INITED_VCODEC){
inited_flags&=~INITED_VCODEC;
pinfo[xp_id].current_module="uninit_vcodec";
- uninit_video(sh_video);
+ mpcv_uninit(sh_video);
sh_video=NULL;
}
@@ -677,7 +677,7 @@
if(mask&INITED_ACODEC){
inited_flags&=~INITED_ACODEC;
pinfo[xp_id].current_module="uninit_acodec";
- uninit_audio(sh_audio);
+ mpca_uninit(sh_audio);
sh_audio=NULL;
}
@@ -1043,7 +1043,7 @@
//if(playsize>outburst) playsize=outburst;
// Update buffer if needed
- pinfo[_xp_id].current_module="decode_audio"; // Enter AUDIO decoder module
+ pinfo[_xp_id].current_module="mpca_decode"; // Enter AUDIO decoder module
t=GetTimer();
while(sh_audio->a_buffer_len<playsize && !audio_eof){
if(enable_xp>=XP_VideoAudio) {
@@ -1051,7 +1051,7 @@
playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len,&pts);
} else
{
- ret=decode_audio(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len],
+ ret=mpca_decode(sh_audio,&sh_audio->a_buffer[sh_audio->a_buffer_len],
playsize-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len,sh_audio->a_buffer_size-sh_audio->a_buffer_len,&pts);
}
if(ret>0) sh_audio->a_buffer_len+=ret;
@@ -1487,14 +1487,14 @@
if(sh_video){
pinfo[_xp_id].current_module="seek_video_reset";
- resync_video_stream(sh_video);
+ mpcv_resync_stream(sh_video);
vo_reset();
sh_video->chapter_change=-1;
}
if(sh_audio){
pinfo[_xp_id].current_module="seek_audio_reset";
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
ao_reset(); // stop audio, throwing away buffered data
}
@@ -1545,7 +1545,7 @@
void mpxp_resync_audio_stream(void)
{
- resync_audio_stream(sh_audio);
+ mpca_resync_stream(sh_audio);
}
static void __FASTCALL__ mpxp_stream_event_handler(struct stream_s *s,const stream_packet_t *sp)
@@ -1958,15 +1958,15 @@
if(video_codec) {
/* forced codec by name: */
MSG_INFO("Forced video codec: %s\n",video_codec);
- init_video(sh_video,video_codec,NULL,-1);
+ mpcv_init(sh_video,video_codec,NULL,-1);
} else {
int status;
/* try in stability order: UNTESTED, WORKING, BUGGY, BROKEN */
if(video_family) MSG_INFO(MSGTR_TryForceVideoFmt,video_family);
for(status=CODECS_STATUS__MAX;status>=CODECS_STATUS__MIN;--status){
if(video_family) /* try first the preferred codec family:*/
- if(init_video(sh_video,NULL,video_family,status)) break;
- if(init_video(sh_video,NULL,NULL,status)) break;
+ if(mpcv_init(sh_video,NULL,video_family,status)) break;
+ if(mpcv_init(sh_video,NULL,NULL,status)) break;
}
}
if(!sh_video->inited) {
@@ -2013,7 +2013,7 @@
ao_data.channels=audio_output_channels?audio_output_channels:sh_audio->channels;
ao_data.format=sh_audio->sample_format;
#if 1
- if(!preinit_audio_filters(sh_audio,
+ if(!mpca_preinit_filters(sh_audio,
// input:
(int)(sh_audio->samplerate),
sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
@@ -2035,7 +2035,7 @@
} else {
inited_flags|=INITED_AO;
pinfo[xp_id].current_module="af_init";
- if(!init_audio_filters(sh_audio,
+ if(!mpca_init_filters(sh_audio,
(int)(sh_audio->samplerate),
sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
ao_data.samplerate, ao_data.channels, ao_data.format,
@@ -2261,7 +2261,7 @@
else v_cont+=v;
if(v_cont > 100) v_cont=100;
if(v_cont < -100) v_cont = -100;
- if(set_video_colors(sh_video,VO_EC_CONTRAST,v_cont)){
+ if(mpcv_set_colors(sh_video,VO_EC_CONTRAST,v_cont)){
#ifdef USE_OSD
if(osd_level){
osd->visible=sh_video->fps; // 1 sec
@@ -2279,7 +2279,7 @@
else v_bright+=v;
if(v_bright > 100) v_bright = 100;
if(v_bright < -100) v_bright = -100;
- if(set_video_colors(sh_video,VO_EC_BRIGHTNESS,v_bright)){
+ if(mpcv_set_colors(sh_video,VO_EC_BRIGHTNESS,v_bright)){
#ifdef USE_OSD
if(osd_level){
osd->visible=sh_video->fps; // 1 sec
@@ -2297,7 +2297,7 @@
else v_hue+=v;
if(v_hue > 100) v_hue = 100;
if(v_hue < -100) v_hue = -100;
- if(set_video_colors(sh_video,VO_EC_HUE,v_hue)){
+ if(mpcv_set_colors(sh_video,VO_EC_HUE,v_hue)){
#ifdef USE_OSD
if(osd_level){
osd->visible=sh_video->fps; // 1 sec
@@ -2315,7 +2315,7 @@
else v_saturation+=v;
if(v_saturation > 100) v_saturation = 100;
if(v_saturation < -100) v_saturation = -100;
- if(set_video_colors(sh_video,VO_EC_SATURATION,v_saturation)){
+ if(mpcv_set_colors(sh_video,VO_EC_SATURATION,v_saturation)){
#ifdef USE_OSD
if(osd_level){
osd->visible=sh_video->fps; // 1 sec
@@ -2600,7 +2600,7 @@
if(sh_audio){
MSG_V("Initializing audio codec...\n");
- if(!init_audio(sh_audio)){
+ if(!mpca_init(sh_audio)){
MSG_ERR(MSGTR_CouldntInitAudioCodec);
sh_audio=d_audio->sh=NULL;
} else {
@@ -2633,11 +2633,11 @@
if(auto_quality>0){
/* Auto quality option enabled*/
- output_quality=get_video_quality_max(sh_video);
+ output_quality=mpcv_get_quality_max(sh_video);
if(auto_quality>output_quality) auto_quality=output_quality;
else output_quality=auto_quality;
MSG_V("AutoQ: setting quality to %d\n",output_quality);
- set_video_quality(sh_video,output_quality);
+ mpcv_set_quality(sh_video,output_quality);
}
vf_showlist(sh_video->vfilter);
@@ -2732,7 +2732,7 @@
usleep(0);
}while(dae_get_decoder_outrun(xp_core.video) < xp_num_frames/2 && !xp_eof);
}
- if(run_xp_players()!=0) exit_player("Can't run xp players!\n");
+ if(run_xp_aplayers()!=0) exit_player("Can't run xp players!\n");
MSG_OK("Using the next %i threads:\n",xp_threads);
for(i=0;i<xp_threads;i++) MSG_OK("[%i] %s (id=%u, pth_id=%lu)\n",i,pinfo[i].thread_name,pinfo[i].pid,pinfo[i].pth_id);
//==================== START PLAYING =======================
@@ -2788,7 +2788,7 @@
--output_quality;
else if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
output_quality=0;
- set_video_quality(sh_video,output_quality);
+ mpcv_set_quality(sh_video,output_quality);
}
read_input:
#ifdef USE_OSD
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
