From 0c3d44619b77cbcc3de75f0725c909f138716ef9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 21:36:00 +0000 Subject: libmpcodecs: Remove pointless leftover '#if 1' preprocessor instructions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30608 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_faad.c | 2 -- libmpcodecs/ad_qtaudio.c | 5 ----- libmpcodecs/dec_teletext.c | 2 -- libmpcodecs/vd_vfw.c | 4 ---- libmpcodecs/ve_vfw.c | 2 -- libmpcodecs/vf_expand.c | 2 -- 6 files changed, 17 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 7c283641e4..4f62765257 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -96,7 +96,6 @@ static int init(sh_audio_t *sh) mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n"); } if(!sh->codecdata_len) { -#if 1 faacDecConfigurationPtr faac_conf; /* Set the default object type and samplerate */ /* This is useful for RAW AAC files */ @@ -125,7 +124,6 @@ static int init(sh_audio_t *sh) //faac_conf->defObjectType = LTP; // => MAIN, LC, SSR, LTP available. faacDecSetConfiguration(faac_hdec, faac_conf); -#endif sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size); pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len); diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index 25775afe11..188238233c 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -118,7 +118,6 @@ static int loader_init(void) mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" ); return 1; } -#if 1 InitializeQTML = (LPFUNC1)GetProcAddress(qtml_dll,"InitializeQTML"); if ( InitializeQTML == NULL ) { @@ -173,7 +172,6 @@ static int loader_init(void) mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterBeginConversion\n"); return 1; } -#endif mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n"); return 0; } @@ -207,7 +205,6 @@ static int preinit(sh_audio_t *sh){ } #endif -#if 1 OutputFormatInfo.flags = InputFormatInfo.flags = 0; OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0; OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL; @@ -257,8 +254,6 @@ static int preinit(sh_audio_t *sh){ sh->i_bps=sh->wf->nAvgBytesPerSec; //InputBufferSize*WantedBufferSize/OutputBufferSize; -#endif - if(sh->format==0x3343414D){ // MACE 3:1 sh->ds->ss_div = 2*3; // 1 samples/packet diff --git a/libmpcodecs/dec_teletext.c b/libmpcodecs/dec_teletext.c index 5be9812086..c2f125439d 100644 --- a/libmpcodecs/dec_teletext.c +++ b/libmpcodecs/dec_teletext.c @@ -952,7 +952,6 @@ static void render2text(tt_page* pt,FILE* f,int colored){ color=-1;bkg=-1; fprintf(f,"|\n"); } -#if 1 //for debug fprintf(f,"+====================raw=================+\n"); for(i=0;io_bih->biCompression = 0; // sanity check: -#if 1 #ifdef BUILD_VFWEX ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih); #else @@ -242,7 +239,6 @@ static int init(sh_video_t *sh){ // return 0; } else mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressQuery OK\n"); -#endif #ifdef BUILD_VFWEX ret = ICDecompressBeginEx(priv->handle, sh->bih, priv->o_bih); diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 44e27025fd..ed8c7cebe0 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -96,7 +96,6 @@ static BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, char *compdatafile, BI } mp_msg(MSGT_WIN32,MSGL_INFO,"HIC: %x\n", encoder_hic); -#if 1 { ICINFO icinfo; @@ -118,7 +117,6 @@ if (icinfo.dwFlags & VIDCF_QUALITYTIME) mp_msg(MSGT_WIN32,MSGL_INFO," temp-quality"); mp_msg(MSGT_WIN32,MSGL_INFO,"\n"); } -#endif if(compdatafile){ if (!strncmp(compdatafile, "dialog", 6)){ diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index f8d21fb762..c595a0d2f5 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -285,13 +285,11 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->type, mpi->flags, FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x), FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y)); -#if 1 if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) && !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){ mp_msg(MSGT_VFILTER, MSGL_INFO, MSGTR_MPCODECS_FullDRNotPossible); return; } -#endif // set up mpi as a cropped-down image of dmpi: if(mpi->flags&MP_IMGFLAG_PLANAR){ mpi->planes[0]=vf->dmpi->planes[0]+ -- cgit v1.2.3 From 84da7d44ef5b626f198dba84d15483745aabc7c7 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 17 Feb 2010 23:46:57 +0000 Subject: Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since at least vo_xv and vo_sdl can not handle it and the scale filter seems to work fine either way. The FFmpeg vp3/Theora decoder produces such slices. Fixes bug #1646. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30630 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 29394317fe..a54254b80b 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -480,6 +480,7 @@ static void draw_slice(struct AVCodecContext *s, int y, int type, int height){ sh_video_t *sh = s->opaque; uint8_t *source[MP_MAX_PLANES]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]}; + int strides[MP_MAX_PLANES] = {src->linesize[0], src->linesize[1], src->linesize[2]}; #if 0 int start=0, i; int width= s->width; @@ -502,8 +503,19 @@ static void draw_slice(struct AVCodecContext *s, } }else #endif + if (height < 0) + { + int i; + height = -height; + y -= height; + for (i = 0; i < MP_MAX_PLANES; i++) + { + strides[i] = -strides[i]; + source[i] -= strides[i]; + } + } if (y < sh->disp_h) { - mpcodecs_draw_slice (sh, source, src->linesize, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y); + mpcodecs_draw_slice (sh, source, strides, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y); } } -- cgit v1.2.3 From 00554417742997c413ea611910065d0527b690ee Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 18 Feb 2010 00:18:50 +0000 Subject: Add header for AVI print functions; avoids many forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_acm.c | 4 +--- libmpcodecs/ad_twin.c | 2 +- libmpcodecs/vd_vfw.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index 21d31bd02c..b179515754 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -23,7 +23,7 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" - +#include "libmpdemux/aviprint.h" #include "loader/wineacm.h" #include "ad_internal.h" @@ -56,8 +56,6 @@ static int init(sh_audio_t *sh_audio) return 1; } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - static int preinit(sh_audio_t *sh_audio) { HRESULT ret; diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c index f387821a5b..823ace89dd 100644 --- a/libmpcodecs/ad_twin.c +++ b/libmpcodecs/ad_twin.c @@ -23,6 +23,7 @@ #include "ad_internal.h" #include "vqf.h" +#include "libmpdemux/aviprint.h" #include "loader/ldt_keeper.h" #include "loader/wine/windef.h" #include "libaf/af_format.h" @@ -106,7 +107,6 @@ static int load_dll( char *libname ) TvqGetNumFixedBitsPerFrame; } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); static int init_vqf_audio_codec(sh_audio_t *sh_audio){ WAVEFORMATEX *in_fmt=sh_audio->wf; vqf_priv_t*priv=sh_audio->context; diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 20b0fed6f1..c87f5ef5d9 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -24,7 +24,7 @@ #include "help_mp.h" #include "vd_internal.h" - +#include "libmpdemux/aviprint.h" #include "loader/wine/driver.h" #include "loader/wine/vfw.h" @@ -150,8 +150,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; } -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); - // init driver static int init(sh_video_t *sh){ HRESULT ret; -- cgit v1.2.3