March 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34829 - trunk/libmpcodecs/ad_libmad.c
by reimar 24 Mar '12

24 Mar '12

Author: reimar Date: Sat Mar 24 20:22:16 2012 New Revision: 34829 Log: libmad: set i_bps only if it is not already set. Since that value is only based on the very first MP3 frame, it is very likely to be much less accurate than any existing value from a demuxer. Patch by Benoît Thébaudeau. Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau(a)advansee.com> Modified: trunk/libmpcodecs/ad_libmad.c Modified: trunk/libmpcodecs/ad_libmad.c ============================================================================== --- trunk/libmpcodecs/ad_libmad.c Sat Mar 24 20:19:48 2012 (r34828) +++ trunk/libmpcodecs/ad_libmad.c Sat Mar 24 20:22:16 2012 (r34829) @@ -100,7 +100,8 @@ static int init(sh_audio_t *sh){ sh->channels=(this->frame.header.mode == MAD_MODE_SINGLE_CHANNEL) ? 1 : 2; sh->samplerate=this->frame.header.samplerate; - sh->i_bps=this->frame.header.bitrate/8; + if (sh->i_bps < 1) + sh->i_bps=this->frame.header.bitrate/8; sh->samplesize=2; return 1;

1 0

r34828 - trunk/libmpcodecs/ad_libmad.c
by reimar 24 Mar '12

24 Mar '12

Author: reimar Date: Sat Mar 24 20:19:48 2012 New Revision: 34828 Log: Replace malloc+memset by calloc. Modified: trunk/libmpcodecs/ad_libmad.c Modified: trunk/libmpcodecs/ad_libmad.c ============================================================================== --- trunk/libmpcodecs/ad_libmad.c Sat Mar 24 20:19:03 2012 (r34827) +++ trunk/libmpcodecs/ad_libmad.c Sat Mar 24 20:19:48 2012 (r34828) @@ -52,8 +52,7 @@ typedef struct mad_decoder_s { static int preinit(sh_audio_t *sh){ - mad_decoder_t *this = malloc(sizeof(mad_decoder_t)); - memset(this,0,sizeof(mad_decoder_t)); + mad_decoder_t *this = calloc(1, sizeof(mad_decoder_t)); sh->context = this; mad_synth_init (&this->synth);

1 0

r34827 - trunk/libmpcodecs/ad_libmad.c
by reimar 24 Mar '12

24 Mar '12

Author: reimar Date: Sat Mar 24 20:19:03 2012 New Revision: 34827 Log: Remove unnecessary casts. Modified: trunk/libmpcodecs/ad_libmad.c Modified: trunk/libmpcodecs/ad_libmad.c ============================================================================== --- trunk/libmpcodecs/ad_libmad.c Sat Mar 24 20:10:07 2012 (r34826) +++ trunk/libmpcodecs/ad_libmad.c Sat Mar 24 20:19:03 2012 (r34827) @@ -67,7 +67,7 @@ static int preinit(sh_audio_t *sh){ } static int read_frame(sh_audio_t *sh){ - mad_decoder_t *this = (mad_decoder_t *) sh->context; + mad_decoder_t *this = sh->context; int len; while((len=demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len], @@ -94,7 +94,7 @@ return 0; } static int init(sh_audio_t *sh){ - mad_decoder_t *this = (mad_decoder_t *) sh->context; + mad_decoder_t *this = sh->context; this->have_frame=read_frame(sh); if(!this->have_frame) return 0; // failed to sync... @@ -108,7 +108,7 @@ static int init(sh_audio_t *sh){ } static void uninit(sh_audio_t *sh){ - mad_decoder_t *this = (mad_decoder_t *) sh->context; + mad_decoder_t *this = sh->context; mad_synth_finish (&this->synth); mad_frame_finish (&this->frame); mad_stream_finish(&this->stream); @@ -131,7 +131,7 @@ static inline signed int scale(mad_fixed } static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen){ - mad_decoder_t *this = (mad_decoder_t *) sh->context; + mad_decoder_t *this = sh->context; int len=0; while(len<minlen && len+4608<=maxlen){ @@ -170,7 +170,7 @@ static int decode_audio(sh_audio_t *sh,u } static int control(sh_audio_t *sh,int cmd,void* arg, ...){ - mad_decoder_t *this = (mad_decoder_t *) sh->context; + mad_decoder_t *this = sh->context; // various optional functions you MAY implement: switch(cmd){ case ADCTRL_RESYNC_STREAM:

1 0

r34826 - trunk/libvo/vo_bl.c
by reimar 24 Mar '12

24 Mar '12

Author: reimar Date: Sat Mar 24 20:10:07 2012 New Revision: 34826 Log: Remove some pointless variable indirection and merge declaration and initialization. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Mar 24 20:07:26 2012 (r34825) +++ trunk/libvo/vo_bl.c Sat Mar 24 20:10:07 2012 (r34826) @@ -328,12 +328,10 @@ static void check_events(void) { } static int draw_slice(uint8_t *srcimg[], int stride[], - int wf, int hf, int xf, int yf) { - int i, w, h, x, y; - uint8_t *dst; + int w, int h, int x, int y) { + int i; + uint8_t *dst = image + y * bl->width + x; uint8_t *src=srcimg[0]; - w = wf; h = hf; x = xf; y = yf; - dst = image + y * bl->width + x; // copy Y: for (i = 0; i < h; i++) { fast_memcpy(dst,src,w);

1 0

r34825 - trunk/libvo/vo_bl.c
by reimar 24 Mar '12

24 Mar '12

Author: reimar Date: Sat Mar 24 20:07:26 2012 New Revision: 34825 Log: Fix -vo bl with slices. Patch by Stefan Schuermans {stefan blinkenarea org} Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Mar 24 17:28:55 2012 (r34824) +++ trunk/libvo/vo_bl.c Sat Mar 24 20:07:26 2012 (r34825) @@ -333,7 +333,7 @@ static int draw_slice(uint8_t *srcimg[], uint8_t *dst; uint8_t *src=srcimg[0]; w = wf; h = hf; x = xf; y = yf; - dst=image; /* + zr->off_y + zr->image_width*(y/zr->vdec)+x;*/ + dst = image + y * bl->width + x; // copy Y: for (i = 0; i < h; i++) { fast_memcpy(dst,src,w);

1 0

r34823 - trunk/etc/codecs.conf
by cehoyos 22 Mar '12

22 Mar '12

Author: cehoyos Date: Thu Mar 22 22:04:32 2012 New Revision: 34823 Log: Support FFmpeg WMA lossless decoder. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Mar 22 08:05:20 2012 (r34822) +++ trunk/etc/codecs.conf Thu Mar 22 22:04:32 2012 (r34823) @@ -4843,6 +4843,13 @@ audiocodec ffwmapro driver ffmpeg dll "wmapro" +audiocodec ffwmall + info "WMA lossless audio (FFmpeg)" + status untested + format 0x163 + driver ffmpeg + dll wmalossless + audiocodec ffwmavoice info "WMA Voice audio (FFmpeg)" status untested

1 0

r34822 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by cehoyos 22 Mar '12

22 Mar '12

Author: cehoyos Date: Thu Mar 22 08:05:20 2012 New Revision: 34822 Log: Support FFmpeg EA ADPCM R1, R2, R3 audio decoders. Patch by Paul B Mahol, onemda gmail Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed Mar 21 06:22:45 2012 (r34821) +++ trunk/etc/codecs.conf Thu Mar 22 08:05:20 2012 (r34822) @@ -4561,6 +4561,27 @@ audiocodec ffadpcmea driver ffmpeg dll adpcm_ea +audiocodec ffadpcmear1 + info "FFmpeg EA ADPCM R1 audio" + status working + fourcc EAR1 ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_r1 + +audiocodec ffadpcmear2 + info "FFmpeg EA ADPCM R2 audio" + status working + fourcc EAR2 ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_r2 + +audiocodec ffadpcmear3 + info "FFmpeg EA ADPCM R3 audio" + status working + fourcc EAR3 ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_r3 + audiocodec ffadpcmeamaxis info "FFmpeg EA MAXIS XA ADPCM audio" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Wed Mar 21 06:22:45 2012 (r34821) +++ trunk/libmpdemux/mp_taglists.c Thu Mar 22 08:05:20 2012 (r34822) @@ -30,6 +30,9 @@ static const struct AVCodecTag mp_wav_ta { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, + { CODEC_ID_ADPCM_EA_R1, MKTAG('E', 'A', 'R', '1')}, + { CODEC_ID_ADPCM_EA_R2, MKTAG('E', 'A', 'R', '2')}, + { CODEC_ID_ADPCM_EA_R3, MKTAG('E', 'A', 'R', '3')}, { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')}, { CODEC_ID_ADPCM_IMA_EA_EACS, MKTAG('E', 'A', 'C', 'S')}, { CODEC_ID_ADPCM_IMA_ISS, MKTAG('A', 'I', 'S', 'S')},

1 0

r34820 - trunk/etc/codecs.conf
by cehoyos 20 Mar '12

20 Mar '12

Author: cehoyos Date: Tue Mar 20 19:03:21 2012 New Revision: 34820 Log: Support FFmpeg Real Audio Lossless decoder with -demuxer lavf. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Mar 17 16:27:24 2012 (r34819) +++ trunk/etc/codecs.conf Tue Mar 20 19:03:21 2012 (r34820) @@ -4187,6 +4187,13 @@ audiocodec ffra288 driver ffmpeg dll "real_288" +audiocodec ffralf + info "FFmpeg Real Audio Lossless" + status untested + fourcc LSD: + driver ffmpeg + dll ralf + audiocodec ffcook info "FFmpeg COOK audio" status working

1 0

r34818 - trunk/cfg-common.h
by diego 15 Mar '12

15 Mar '12

Author: diego Date: Thu Mar 15 16:20:06 2012 New Revision: 34818 Log: cfg-common: Only #include libpostproc headers when available. Modified: trunk/cfg-common.h Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Thu Mar 15 16:20:02 2012 (r34817) +++ trunk/cfg-common.h Thu Mar 15 16:20:06 2012 (r34818) @@ -32,7 +32,6 @@ #include "libmpdemux/demux_viv.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/mf.h" -#include "libpostproc/postprocess.h" #include "sub/sub.h" #include "sub/unrar_exec.h" #include "osdep/priority.h" @@ -50,7 +49,9 @@ #include "m_option.h" #include "mp_msg.h" #include "mpcommon.h" - +#ifdef CONFIG_POSTPROC +#include "libpostproc/postprocess.h" +#endif #ifdef CONFIG_RADIO

1 0

r34817 - trunk/configure
by diego 15 Mar '12

15 Mar '12

Author: diego Date: Thu Mar 15 16:20:02 2012 New Revision: 34817 Log: configure: Fix libpostproc detection. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Mar 15 16:19:51 2012 (r34816) +++ trunk/configure Thu Mar 15 16:20:02 2012 (r34817) @@ -6761,7 +6761,7 @@ echores "$ffmpeg" echocheck "libpostproc" if test "$postproc" = auto ; then postproc=no - if test "$ffmpeg_a" = yes ; then + if test "$ffmpeg_a" = yes && test -d ffmpeg/libpostproc ; then postproc=yes elif $_pkg_config --exists libpostproc ; then inc_postproc=$($_pkg_config --cflags libpostproc)

1 0