October 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep/keycodes.h
by reimar 13 Feb '14

13 Feb '14

Author: reimar Date: Thu Mar 14 20:59:35 2013 New Revision: 35961 Log: Add support for binding any key in UTF-8 range. X11 part is a bit hackish since we need to use setlocale to get desired behaviour for XLookupString. Modified: trunk/Changelog trunk/input/input.c trunk/libvo/x11_common.c trunk/osdep/getch2.c trunk/osdep/keycodes.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/Changelog Thu Mar 14 20:59:35 2013 (r35961) @@ -13,6 +13,7 @@ MPlayer better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. + * Support binding keys corresponding to non-ASCII characters. 1.1: "We gave up on 1.0" Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/input/input.c Thu Mar 14 20:59:35 2013 (r35961) @@ -38,6 +38,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" +#include "libavutil/common.h" #include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" @@ -1474,6 +1475,7 @@ mp_input_get_key_name(int key) { int mp_input_get_key_from_name(const char *name) { + uint32_t utf8 = 0; int i,ret = 0,len = strlen(name); if(len == 1) { // Direct key code ret = (unsigned char)name[0]; @@ -1486,6 +1488,10 @@ mp_input_get_key_from_name(const char *n return key_names[i].key; } + GET_UTF8(utf8, (uint8_t)*name++, return -1;) + if (*name == 0 && utf8 < KEY_BASE) + return utf8; + return -1; } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/libvo/x11_common.c Thu Mar 14 20:59:35 2013 (r35961) @@ -21,6 +21,7 @@ #include <math.h> #include <inttypes.h> #include <limits.h> +#include <locale.h> #include "config.h" #include "mp_msg.h" @@ -427,6 +428,9 @@ int vo_init(void) return 1; // already called } + // Required so that XLookupString returns UTF-8 + if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n"); XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(mDisplayName); @@ -810,11 +814,22 @@ static int check_resize(void) return rc; } +static int to_utf8(const uint8_t *in) +{ + uint32_t v = 0; + GET_UTF8(v, *in++, goto err;) + if (*in || v >= KEY_BASE) + goto err; + return v; +err: + return 0; +} + int vo_x11_check_events(Display * mydisplay) { int ret = 0; XEvent Event; - char buf[100]; + uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; @@ -852,7 +867,7 @@ int vo_x11_check_events(Display * mydisp case KeyPress: case KeyRelease: { - int key; + int key, utf8; #ifdef CONFIG_GUI if ( use_gui ) { break; } @@ -863,6 +878,8 @@ int vo_x11_check_events(Display * mydisp key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + utf8 = to_utf8(buf); + if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { ctrl_state = Event.type == KeyPress; mplayer_put_key(KEY_CTRL | @@ -880,7 +897,8 @@ int vo_x11_check_events(Display * mydisp (ctrl_state ? MP_KEY_DOWN : 0)); } if (!vo_x11_putkey_ext(keySym)) { - vo_x11_putkey(key); + if (utf8) mplayer_put_key(utf8); + else vo_x11_putkey(key); } ret |= VO_EVENT_KEYPRESS; } Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/getch2.c Thu Mar 14 20:59:35 2013 (r35961) @@ -60,6 +60,7 @@ #include "mp_fifo.h" #include "keycodes.h" #include "getch2.h" +#include "libavutil/common.h" #ifdef HAVE_TERMIOS static struct termios tio_orig; @@ -201,6 +202,14 @@ void getch2(void) len = 2; } code = KEY_ENTER; + } else if (code >= 0xc0) { + uint32_t utf8 = 0; + i = 0; + GET_UTF8(utf8, (i < getch2_len ? getch2_buf[i++] : 0), goto not_utf8;) + if (utf8 < KEY_BASE) { + code = utf8; + len = i; + } } } else if (getch2_len > 1) { @@ -262,6 +271,7 @@ void getch2(void) } } } + not_utf8: found: getch2_len -= len; for (i = 0; i < getch2_len; i++) Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/keycodes.h Thu Mar 14 20:59:35 2013 (r35961) @@ -23,7 +23,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -#define KEY_BASE 0x100 +#define KEY_BASE 0x1000000 enum { KEY_TAB = 9, @@ -76,7 +76,7 @@ enum { KEY_VOLUME_DOWN, KEY_MUTE, /* Special internal/virtual keys */ - KEY_CLOSE_WIN = 0x1000, + KEY_CLOSE_WIN = KEY_BASE + 0x1000, }; /* Control keys short name */

3 10

r36500 - trunk/libvo/vo_corevideo.h
by reimar 30 Oct '13

30 Oct '13

Author: reimar Date: Wed Oct 30 19:51:33 2013 New Revision: 36500 Log: vo_corevideo: Add include to fix compilation on OSX 10.9 Patch by Johan Andersson [j i19 se] Modified: trunk/libvo/vo_corevideo.h Modified: trunk/libvo/vo_corevideo.h ============================================================================== --- trunk/libvo/vo_corevideo.h Wed Oct 30 19:45:48 2013 (r36499) +++ trunk/libvo/vo_corevideo.h Wed Oct 30 19:51:33 2013 (r36500) @@ -26,6 +26,7 @@ #import <Cocoa/Cocoa.h> #import <QuartzCore/QuartzCore.h> #import <Carbon/Carbon.h> +#import <OpenGL/gl.h> #import "osx_objc_common.h" // MPlayer OS X VO Protocol

1 0

r36499 - trunk/libaf/af_volume.c
by reimar 30 Oct '13

30 Oct '13

Author: reimar Date: Wed Oct 30 19:45:48 2013 New Revision: 36499 Log: af_volume: add NEON optimization for common float case. gcc is too stupid to use vmin/vmax, which leads to float code interleaved with status register reads, which has simply horrible performance. Modified: trunk/libaf/af_volume.c Modified: trunk/libaf/af_volume.c ============================================================================== --- trunk/libaf/af_volume.c Tue Oct 29 20:24:16 2013 (r36498) +++ trunk/libaf/af_volume.c Wed Oct 30 19:45:48 2013 (r36499) @@ -125,6 +125,27 @@ static av_always_inline void s16_inner_l static av_always_inline void float_inner_loop(float *data, int len, int offset, int step, float level, int softclip) { int i; +#if HAVE_NEON + if (offset == 0 && step == 1 && !softclip && len >= 8) + { + __asm__( + "vmov.32 d2[0], %2\n\t" + "vdup.32 q8, %3\n\t" + "vneg.f32 q9, q8\n\t" +"0:\n\t" + "vld1.32 {q0}, [%0]\n\t" + "vmul.f32 q0, q0, d2[0]\n\t" + "cmp %0, %1\n\t" + "vmin.f32 q0, q0, q8\n\t" + "vmax.f32 q0, q0, q9\n\t" + "vst1.32 {q0}, [%0]!\n\t" + "blo 0b\n\t" + : "+&r"(data) + : "r"(data + len - 7), "r"(level), "r"(0x3f800000) + : "cc", "q0", "d2", "q8", "q9", "memory"); + len &= 3; + } +#endif for (i = offset; i < len; i += step) { register float x = data[i];

1 0

r36498 - trunk/libaf/af_volume.c
by reimar 29 Oct '13

29 Oct '13

Author: reimar Date: Tue Oct 29 20:24:16 2013 New Revision: 36498 Log: af_volume: optimize for common case where all channels have same volume. Modified: trunk/libaf/af_volume.c Modified: trunk/libaf/af_volume.c ============================================================================== --- trunk/libaf/af_volume.c Tue Oct 29 20:24:13 2013 (r36497) +++ trunk/libaf/af_volume.c Tue Oct 29 20:24:16 2013 (r36498) @@ -111,6 +111,36 @@ static void uninit(struct af_instance_s* free(af->setup); } +static av_always_inline void s16_inner_loop(int16_t *data, int len, int offset, int step, float level) +{ + int i; + register int vol = (int)(255.0 * level); + for (i = offset; i < len; i += step) + { + register int x = (data[i] * vol) >> 8; + data[i] = av_clip_int16(x); + } +} + +static av_always_inline void float_inner_loop(float *data, int len, int offset, int step, float level, int softclip) +{ + int i; + for (i = offset; i < len; i += step) + { + register float x = data[i]; + // Set volume + x *= level; + /* Soft clipping, the sound of a dream, thanks to Jon Wattes + post to Musicdsp.org */ + if (softclip) + x = af_softclip(x); + // Hard clipping + else + x = av_clipf(x,-1.0,1.0); + data[i] = x; + } +} + // Filter data through filter static af_data_t* play(struct af_instance_s* af, af_data_t* data) { @@ -119,18 +149,20 @@ static af_data_t* play(struct af_instanc int ch = 0; // Channel counter register int nch = c->nch; // Number of channels register int i = 0; + int same_vol = 1; + for (ch = 1; ch < nch; ch++) + { + same_vol &= s->level[ch] == s->level[ch - 1]; + } // Basic operation volume control only (used on slow machines) if(af->data->format == (AF_FORMAT_S16_NE)){ int16_t* a = (int16_t*)c->audio; // Audio data int len = c->len/2; // Number of samples - for(ch = 0; ch < nch ; ch++){ - register int vol = (int)(255.0 * s->level[ch]); - for(i=ch;i<len;i+=nch){ - register int x = (a[i] * vol) >> 8; - a[i]=av_clip_int16(x); - } - } + if (same_vol) + s16_inner_loop(a, len, 0, 1, s->level[0]); + else for (ch = 0; ch < nch; ch++) + s16_inner_loop(a, len, ch, nch, s->level[ch]); } // Machine is fast and data is floating point else if(af->data->format == (AF_FORMAT_FLOAT_NE)){ @@ -139,22 +171,12 @@ static af_data_t* play(struct af_instanc for (i = 0; !s->fast && i < len; i++) // Check maximum power value s->max = FFMAX(s->max, a[i] * a[i]); - for(ch = 0; ch < nch ; ch++){ - // Volume control (fader) - for(i=ch;i<len;i+=nch){ - register float x = a[i]; - // Set volume - x *= s->level[ch]; - /* Soft clipping, the sound of a dream, thanks to Jon Wattes - post to Musicdsp.org */ - if(s->soft) - x=af_softclip(x); - // Hard clipping - else - x=av_clipf(x,-1.0,1.0); - a[i] = x; - } - } + if (same_vol && s->soft) + float_inner_loop(a, len, 0, 1, s->level[0], 1); + else if (same_vol) + float_inner_loop(a, len, 0, 1, s->level[0], 0); + else for (ch = 0; ch < nch; ch++) + float_inner_loop(a, len, ch, nch, s->level[ch], s->soft); } return c; }

1 0

r36497 - trunk/libaf/af_volume.c
by reimar 29 Oct '13

29 Oct '13

Author: reimar Date: Tue Oct 29 20:24:13 2013 New Revision: 36497 Log: af_volume: Avoid pointlessly calculating the maximum volume. Only calculate it when it will be used, and do not calculate it per-channel. Modified: trunk/libaf/af_volume.c Modified: trunk/libaf/af_volume.c ============================================================================== --- trunk/libaf/af_volume.c Sun Oct 27 19:06:52 2013 (r36496) +++ trunk/libaf/af_volume.c Tue Oct 29 20:24:13 2013 (r36497) @@ -43,7 +43,7 @@ // Data for specific instances of this filter typedef struct af_volume_s { - float max[AF_NCH]; // Max Power level [dB] + float max; // Max Power level [dB] float level[AF_NCH]; // Gain level for each channel int soft; // Enable/disable soft clipping int fast; // Use fix-point volume control @@ -93,18 +93,14 @@ static int control(struct af_instance_s* return af_from_dB(AF_NCH,(float*)arg,s->level,20.0,-200.0,60.0); case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET: return af_to_dB(AF_NCH,s->level,(float*)arg,20.0); - case AF_CONTROL_PRE_DESTROY:{ - float m = 0.0; - int i; + case AF_CONTROL_PRE_DESTROY: if(!s->fast){ - for(i=0;i<AF_NCH;i++) - m=FFMAX(m,s->max[i]); + float m = s->max; af_to_dB(1, &m, &m, 10.0); mp_msg(MSGT_AFILTER, MSGL_INFO, "[volume] The maximum volume was %0.2fdB \n", m); } return AF_OK; } - } return AF_UNKNOWN; } @@ -140,14 +136,13 @@ static af_data_t* play(struct af_instanc else if(af->data->format == (AF_FORMAT_FLOAT_NE)){ float* a = (float*)c->audio; // Audio data int len = c->len/4; // Number of samples + for (i = 0; !s->fast && i < len; i++) + // Check maximum power value + s->max = FFMAX(s->max, a[i] * a[i]); for(ch = 0; ch < nch ; ch++){ // Volume control (fader) for(i=ch;i<len;i+=nch){ register float x = a[i]; - register float pow = x*x; - // Check maximum power value - if(pow > s->max[ch]) - s->max[ch] = pow; // Set volume x *= s->level[ch]; /* Soft clipping, the sound of a dream, thanks to Jon Wattes

1 0

r36495 - trunk/configure
by reimar 26 Oct '13

26 Oct '13

Author: reimar Date: Sat Oct 26 23:39:20 2013 New Revision: 36495 Log: Fall back to uname -p if uname -m does not give anything useful. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Oct 26 23:30:17 2013 (r36494) +++ trunk/configure Sat Oct 26 23:39:20 2013 (r36495) @@ -1685,7 +1685,8 @@ if test -z "$_target" ; then # host's CPU/instruction set - case "$(uname -m 2>&1)" in + set_host_arch() { + case "$1" in x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ia64) host_arch=ia64 ;; macppc|ppc*|Power*) host_arch=ppc ;; @@ -1701,6 +1702,11 @@ if test -z "$_target" ; then xtensa*) host_arch=xtensa ;; *) host_arch=UNKNOWN ;; esac + } + set_host_arch "$(uname -m 2>&1)" + if test "$host_arch" = UNKNOWN ; then + set_host_arch "$(uname -p 2>&1)" + fi else # if test -z "$_target" for component in 3 2; do system_name=$(echo $_target | cut -d '-' -f $component)

1 0

r36494 - trunk/configure
by reimar 26 Oct '13

26 Oct '13

Author: reimar Date: Sat Oct 26 23:30:17 2013 New Revision: 36494 Log: Fix configure for cases when libm is not available. This seems to be the case for e.g. Haiku. Admittedly supporting such different-for-no-good-reason setups is a bit questionable, but it's not much effort in this case. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Oct 26 12:23:03 2013 (r36493) +++ trunk/configure Sat Oct 26 23:30:17 2013 (r36494) @@ -58,9 +58,9 @@ compile_check() { echo >> "$TMPLOG" cat "$source" >> "$TMPLOG" echo >> "$TMPLOG" - echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@ -lm" >> "$TMPLOG" + echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@ $libm" >> "$TMPLOG" rm -f "$TMPEXE" - $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" -lm >> "$TMPLOG" 2>&1 + $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" $libm >> "$TMPLOG" 2>&1 TMPRES="$?" echo >> "$TMPLOG" echo >> "$TMPLOG" @@ -1798,6 +1798,8 @@ echocheck "working compiler" cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." echo "yes" +cflag_check "-lm" && libm="-lm" + if test -z "$_target" ; then cat > $TMPC << EOF int main(void) { @@ -8048,7 +8050,7 @@ else fi echores "$_dvdnav" -extra_ldflags="$extra_ldflags -lm" +extra_ldflags="$extra_ldflags $libm" # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). # Read dvdnav comment above. @@ -8508,7 +8510,7 @@ ASFLAGS = \$(CFLAGS) AS_DEPFLAGS= $DEPFLAGS HOSTCC = \$(HOST_CC) HOSTCFLAGS = $HOSTCFLAGS -HOSTLIBS = -lm +HOSTLIBS = $libm AS_O = -o \$@ CC_O = -o \$@ CXX_O = -o \$@

1 0

r36493 - in trunk/libaf: af_volume.c control.h
by reimar 26 Oct '13

26 Oct '13

Author: reimar Date: Sat Oct 26 12:23:03 2013 New Revision: 36493 Log: Remove unused per-channel enable. It makes it hard to vectorize or otherwise optimize the code. Modified: trunk/libaf/af_volume.c trunk/libaf/control.h Modified: trunk/libaf/af_volume.c ============================================================================== --- trunk/libaf/af_volume.c Sat Oct 26 12:16:09 2013 (r36492) +++ trunk/libaf/af_volume.c Sat Oct 26 12:23:03 2013 (r36493) @@ -43,7 +43,6 @@ // Data for specific instances of this filter typedef struct af_volume_s { - int enable[AF_NCH]; // Enable/disable / channel float max[AF_NCH]; // Max Power level [dB] float level[AF_NCH]; // Gain level for each channel int soft; // Enable/disable soft clipping @@ -84,12 +83,6 @@ static int control(struct af_instance_s* s->fast = ((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT) ? 0 : 1; return AF_OK; - case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_SET: - memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int)); - return AF_OK; - case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_GET: - memcpy((int*)arg,s->enable,AF_NCH*sizeof(int)); - return AF_OK; case AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_SET: s->soft = *(int*)arg; return AF_OK; @@ -136,13 +129,11 @@ static af_data_t* play(struct af_instanc int16_t* a = (int16_t*)c->audio; // Audio data int len = c->len/2; // Number of samples for(ch = 0; ch < nch ; ch++){ - if(s->enable[ch]){ register int vol = (int)(255.0 * s->level[ch]); for(i=ch;i<len;i+=nch){ register int x = (a[i] * vol) >> 8; a[i]=av_clip_int16(x); } - } } } // Machine is fast and data is floating point @@ -151,7 +142,6 @@ static af_data_t* play(struct af_instanc int len = c->len/4; // Number of samples for(ch = 0; ch < nch ; ch++){ // Volume control (fader) - if(s->enable[ch]){ for(i=ch;i<len;i+=nch){ register float x = a[i]; register float pow = x*x; @@ -169,7 +159,6 @@ static af_data_t* play(struct af_instanc x=av_clipf(x,-1.0,1.0); a[i] = x; } - } } } return c; @@ -188,7 +177,6 @@ static int af_open(af_instance_t* af){ return AF_ERROR; // Enable volume control and set initial volume to 0dB. for(i=0;i<AF_NCH;i++){ - ((af_volume_t*)af->setup)->enable[i] = 1; ((af_volume_t*)af->setup)->level[i] = 1.0; } return AF_OK; Modified: trunk/libaf/control.h ============================================================================== --- trunk/libaf/control.h Sat Oct 26 12:16:09 2013 (r36492) +++ trunk/libaf/control.h Sat Oct 26 12:23:03 2013 (r36493) @@ -156,9 +156,6 @@ typedef struct af_control_ext_s{ // Volume -// Turn volume control on and off, arg is int* -#define AF_CONTROL_VOLUME_ON_OFF 0x00000B00 | AF_CONTROL_FILTER_SPECIFIC - // Turn soft clipping of the volume on and off, arg is binary #define AF_CONTROL_VOLUME_SOFTCLIP 0x00000C00 | AF_CONTROL_FILTER_SPECIFIC

1 0

r36492 - in trunk/libaf: af_volume.c control.h
by reimar 26 Oct '13

26 Oct '13

Author: reimar Date: Sat Oct 26 12:16:09 2013 New Revision: 36492 Log: Remove unused code that costs a good bit of performance. Modified: trunk/libaf/af_volume.c trunk/libaf/control.h Modified: trunk/libaf/af_volume.c ============================================================================== --- trunk/libaf/af_volume.c Sat Oct 26 11:36:23 2013 (r36491) +++ trunk/libaf/af_volume.c Sat Oct 26 12:16:09 2013 (r36492) @@ -25,13 +25,7 @@ AF_CONTROL_VOLUME_LEVEL. The filter has support for soft-clipping, it is enabled by - AF_CONTROL_VOLUME_SOFTCLIPP. It has also a probing feature which - can be used to measure the power in the audio stream, both an - instantaneous value and the maximum value can be probed. The - probing is enable by AF_CONTROL_VOLUME_PROBE_ON_OFF and is done on a - per channel basis. The result from the probing is obtained using - AF_CONTROL_VOLUME_PROBE_GET and AF_CONTROL_VOLUME_PROBE_GET_MAX. The - probed values are calculated in dB. + AF_CONTROL_VOLUME_SOFTCLIPP. */ #include <stdio.h> @@ -50,10 +44,8 @@ typedef struct af_volume_s { int enable[AF_NCH]; // Enable/disable / channel - float pow[AF_NCH]; // Estimated power level [dB] float max[AF_NCH]; // Max Power level [dB] float level[AF_NCH]; // Gain level for each channel - float time; // Forgetting factor for power estimate int soft; // Enable/disable soft clipping int fast; // Use fix-point volume control }af_volume_t; @@ -76,11 +68,6 @@ static int control(struct af_instance_s* af->data->bps = 2; } else{ - // Cutoff set to 10Hz for forgetting factor - float x = 2.0*M_PI*15.0/(float)af->data->rate; - float t = 2.0-cos(x); - s->time = 1.0 - (t - sqrt(t*t - 1)); - mp_msg(MSGT_AFILTER, MSGL_DBG2, "[volume] Forgetting factor = %0.5f\n",s->time); af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; } @@ -113,10 +100,6 @@ static int control(struct af_instance_s* return af_from_dB(AF_NCH,(float*)arg,s->level,20.0,-200.0,60.0); case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET: return af_to_dB(AF_NCH,s->level,(float*)arg,20.0); - case AF_CONTROL_VOLUME_PROBE | AF_CONTROL_GET: - return af_to_dB(AF_NCH,s->pow,(float*)arg,10.0); - case AF_CONTROL_VOLUME_PROBE_MAX | AF_CONTROL_GET: - return af_to_dB(AF_NCH,s->max,(float*)arg,10.0); case AF_CONTROL_PRE_DESTROY:{ float m = 0.0; int i; @@ -169,7 +152,6 @@ static af_data_t* play(struct af_instanc for(ch = 0; ch < nch ; ch++){ // Volume control (fader) if(s->enable[ch]){ - float t = 1.0 - s->time; for(i=ch;i<len;i+=nch){ register float x = a[i]; register float pow = x*x; @@ -178,12 +160,6 @@ static af_data_t* play(struct af_instanc s->max[ch] = pow; // Set volume x *= s->level[ch]; - // Peak meter - pow = x*x; - if(pow > s->pow[ch]) - s->pow[ch] = pow; - else - s->pow[ch] = t*s->pow[ch] + pow*s->time; // LP filter /* Soft clipping, the sound of a dream, thanks to Jon Wattes post to Musicdsp.org */ if(s->soft) Modified: trunk/libaf/control.h ============================================================================== --- trunk/libaf/control.h Sat Oct 26 11:36:23 2013 (r36491) +++ trunk/libaf/control.h Sat Oct 26 12:16:09 2013 (r36492) @@ -165,12 +165,6 @@ typedef struct af_control_ext_s{ // Set volume level, arg is a float* with the volume for all the channels #define AF_CONTROL_VOLUME_LEVEL 0x00000D00 | AF_CONTROL_FILTER_SPECIFIC -// Probed power level for all channels, arg is a float* -#define AF_CONTROL_VOLUME_PROBE 0x00000E00 | AF_CONTROL_FILTER_SPECIFIC - -// Maximum probed power level for all channels, arg is a float* -#define AF_CONTROL_VOLUME_PROBE_MAX 0x00000F00 | AF_CONTROL_FILTER_SPECIFIC - // Compressor/expander // Turn compressor/expander on and off

1 0

r36491 - in trunk/libaf: af.h af_center.c af_channels.c af_comp.c af_delay.c af_equalizer.c af_extrastereo.c af_lavcresample.c af_pan.c af_resample.c af_sub.c af_tools.c af_volnorm.c af_volume.c
by reimar 26 Oct '13

26 Oct '13

Author: reimar Date: Sat Oct 26 11:36:23 2013 New Revision: 36491 Log: Remove some macros and switch to libavutil equivalents. Modified: trunk/libaf/af.h trunk/libaf/af_center.c trunk/libaf/af_channels.c trunk/libaf/af_comp.c trunk/libaf/af_delay.c trunk/libaf/af_equalizer.c trunk/libaf/af_extrastereo.c trunk/libaf/af_lavcresample.c trunk/libaf/af_pan.c trunk/libaf/af_resample.c trunk/libaf/af_sub.c trunk/libaf/af_tools.c trunk/libaf/af_volnorm.c trunk/libaf/af_volume.c Modified: trunk/libaf/af.h ============================================================================== --- trunk/libaf/af.h Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af.h Sat Oct 26 11:36:23 2013 (r36491) @@ -325,25 +325,4 @@ void af_fix_parameters(af_data_t *data); #define RESIZE_LOCAL_BUFFER(a,d)\ ((a->data->len < af_lencalc(a->mul,d))?af_resize_local_buffer(a,d):AF_OK) -/* Some other useful macro definitions*/ -#ifndef min -#define min(a,b)(((a)>(b))?(b):(a)) -#endif - -#ifndef max -#define max(a,b)(((a)>(b))?(a):(b)) -#endif - -#ifndef clamp -#define clamp(a,min,max) (((a)>(max))?(max):(((a)<(min))?(min):(a))) -#endif - -#ifndef sign -#define sign(a) (((a)>0)?(1):(-1)) -#endif - -#ifndef lrnd -#define lrnd(a,b) ((b)((a)>=0.0?(a)+0.5:(a)-0.5)) -#endif - #endif /* MPLAYER_AF_H */ Modified: trunk/libaf/af_center.c ============================================================================== --- trunk/libaf/af_center.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_center.c Sat Oct 26 11:36:23 2013 (r36491) @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -49,7 +50,7 @@ static int control(struct af_instance_s* if(!arg) return AF_ERROR; af->data->rate = ((af_data_t*)arg)->rate; - af->data->nch = max(s->ch+1,((af_data_t*)arg)->nch); + af->data->nch = FFMAX(s->ch+1,((af_data_t*)arg)->nch); af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; Modified: trunk/libaf/af_channels.c ============================================================================== --- trunk/libaf/af_channels.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_channels.c Sat Oct 26 11:36:23 2013 (r36491) @@ -25,6 +25,7 @@ #include <string.h> #include <inttypes.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -149,14 +150,14 @@ static int control(struct af_instance_s* // If mono: fake stereo if(((af_data_t*)arg)->nch == 1){ - s->nr = min(af->data->nch,2); + s->nr = FFMIN(af->data->nch,2); for(i=0;i<s->nr;i++){ s->route[i][FR] = 0; s->route[i][TO] = i; } } else{ - s->nr = min(af->data->nch, ((af_data_t*)arg)->nch); + s->nr = FFMIN(af->data->nch, ((af_data_t*)arg)->nch); for(i=0;i<s->nr;i++){ s->route[i][FR] = i; s->route[i][TO] = i; Modified: trunk/libaf/af_comp.c ============================================================================== --- trunk/libaf/af_comp.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_comp.c Sat Oct 26 11:36:23 2013 (r36491) @@ -26,6 +26,7 @@ #include <math.h> #include <limits.h> +#include "libavutil/common.h" #include "af.h" // Data for specific instances of this filter @@ -94,7 +95,7 @@ static int control(struct af_instance_s* return af_to_ms(AF_NCH,s->release,(float*)arg,af->data->rate); case AF_CONTROL_COMP_RATIO | AF_CONTROL_SET: for(i=0;i<AF_NCH;i++) - s->ratio[i] = clamp(((float*)arg)[i],1.0,10.0); + s->ratio[i] = av_clipf(((float*)arg)[i],1.0,10.0); return AF_OK; case AF_CONTROL_COMP_RATIO | AF_CONTROL_GET: for(i=0;i<AF_NCH;i++) Modified: trunk/libaf/af_delay.c ============================================================================== --- trunk/libaf/af_delay.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_delay.c Sat Oct 26 11:36:23 2013 (r36491) @@ -25,6 +25,7 @@ #include <string.h> #include <inttypes.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -87,7 +88,7 @@ static int control(struct af_instance_s* s->ri = 0; for(i=0;i<AF_NCH;i++){ mp_msg(MSGT_AFILTER, MSGL_DBG2, "[delay] Channel %i delayed by %0.3fms\n", - i,clamp(s->d[i],0.0,1000.0)); + i,av_clipf(s->d[i],0.0,1000.0)); mp_msg(MSGT_AFILTER, MSGL_DBG3, "[delay] Channel %i delayed by %i samples\n", i,s->wi[i]); } Modified: trunk/libaf/af_equalizer.c ============================================================================== --- trunk/libaf/af_equalizer.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_equalizer.c Sat Oct 26 11:36:23 2013 (r36491) @@ -29,6 +29,7 @@ #include <inttypes.h> #include <math.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -146,7 +147,7 @@ static int control(struct af_instance_s* for(i=0;i<AF_NCH;i++){ for(j=0;j<KM;j++){ ((af_equalizer_t*)af->setup)->g[i][j] = - pow(10.0,clamp(g[j],G_MIN,G_MAX)/20.0)-1.0; + pow(10.0,av_clipf(g[j],G_MIN,G_MAX)/20.0)-1.0; } } return AF_OK; @@ -159,7 +160,7 @@ static int control(struct af_instance_s* return AF_ERROR; for(k = 0 ; k<KM ; k++) - s->g[ch][k] = pow(10.0,clamp(gain[k],G_MIN,G_MAX)/20.0)-1.0; + s->g[ch][k] = pow(10.0,av_clipf(gain[k],G_MIN,G_MAX)/20.0)-1.0; return AF_OK; } Modified: trunk/libaf/af_extrastereo.c ============================================================================== --- trunk/libaf/af_extrastereo.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_extrastereo.c Sat Oct 26 11:36:23 2013 (r36491) @@ -26,6 +26,7 @@ #include <math.h> #include <limits.h> +#include "libavutil/common.h" #include "af.h" // Data for specific instances of this filter @@ -102,8 +103,8 @@ static af_data_t* play_s16(struct af_ins l = avg + (int)(s->mul * (a[i] - avg)); r = avg + (int)(s->mul * (a[i + 1] - avg)); - a[i] = clamp(l, SHRT_MIN, SHRT_MAX); - a[i + 1] = clamp(r, SHRT_MIN, SHRT_MAX); + a[i] = av_clip_int16(l); + a[i + 1] = av_clip_int16(r); } return data; Modified: trunk/libaf/af_lavcresample.c ============================================================================== --- trunk/libaf/af_lavcresample.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_lavcresample.c Sat Oct 26 11:36:23 2013 (r36491) @@ -66,7 +66,7 @@ static int control(struct af_instance_s* af->data->format = AF_FORMAT_S16_NE; af->data->bps = 2; af->mul = (double)af->data->rate / data->rate; - af->delay = af->data->nch * s->filter_length / min(af->mul, 1); // *bps*.5 + af->delay = af->data->nch * s->filter_length / FFMIN(af->mul, 1); // *bps*.5 if (s->ctx_out_rate != af->data->rate || s->ctx_in_rate != data->rate || s->ctx_filter_size != s->filter_length || s->ctx_phase_shift != s->phase_shift || s->ctx_linear != s->linear || s->ctx_cutoff != s->cutoff) { @@ -89,7 +89,7 @@ static int control(struct af_instance_s* case AF_CONTROL_COMMAND_LINE:{ s->cutoff= 0.0; sscanf((char*)arg,"%d:%d:%d:%d:%lf", &af->data->rate, &s->filter_length, &s->linear, &s->phase_shift, &s->cutoff); - if(s->cutoff <= 0.0) s->cutoff= max(1.0 - 6.5/(s->filter_length+8), 0.80); + if(s->cutoff <= 0.0) s->cutoff= FFMAX(1.0 - 6.5/(s->filter_length+8), 0.80); return AF_OK; } case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET: @@ -132,7 +132,7 @@ static af_data_t* play(struct af_instanc out= (int16_t*)af->data->audio; - out_len= min(out_len, af->data->len/(2*chans)); + out_len= FFMIN(out_len, af->data->len/(2*chans)); if(s->in_alloc < in_len + s->index){ s->in_alloc= in_len + s->index; @@ -196,7 +196,7 @@ static int af_open(af_instance_t* af){ af->mul=1; af->data=calloc(1,sizeof(af_data_t)); s->filter_length= 16; - s->cutoff= max(1.0 - 6.5/(s->filter_length+8), 0.80); + s->cutoff= FFMAX(1.0 - 6.5/(s->filter_length+8), 0.80); s->phase_shift= 10; // s->setup = RSMP_INT | FREQ_SLOPPY; af->setup=s; Modified: trunk/libaf/af_pan.c ============================================================================== --- trunk/libaf/af_pan.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_pan.c Sat Oct 26 11:36:23 2013 (r36491) @@ -25,6 +25,7 @@ #include <math.h> #include <limits.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -123,10 +124,10 @@ static int control(struct af_instance_s* if (s->nch) return AF_ERROR; if (af->data->nch >= 2) { - s->level[0][0] = min(1.f, 1.f - val); - s->level[0][1] = max(0.f, val); - s->level[1][0] = max(0.f, -val); - s->level[1][1] = min(1.f, 1.f + val); + s->level[0][0] = FFMIN(1.f, 1.f - val); + s->level[0][1] = FFMAX(0.f, val); + s->level[1][0] = FFMAX(0.f, -val); + s->level[1][1] = FFMIN(1.f, 1.f + val); } return AF_OK; } Modified: trunk/libaf/af_resample.c ============================================================================== --- trunk/libaf/af_resample.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_resample.c Sat Oct 26 11:36:23 2013 (r36491) @@ -234,7 +234,7 @@ static int control(struct af_instance_s* s->i = 0; // Calculate cutoff frequency for filter - fc = 1/(float)(max(s->up,s->dn)); + fc = 1/(float)(FFMAX(s->up,s->dn)); // Allocate space for polyphase filter bank and prototype filter w = malloc(sizeof(float) * s->up *L); free(s->w); @@ -277,7 +277,7 @@ static int control(struct af_instance_s* int sloppy=1; sscanf((char*)arg,"%i:%i:%i", &rate, &sloppy, &type); s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) | - (clamp(type,RSMP_LIN,RSMP_FLOAT)); + (av_clip(type,RSMP_LIN,RSMP_FLOAT)); return af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, &rate); } case AF_CONTROL_POST_CREATE: Modified: trunk/libaf/af_sub.c ============================================================================== --- trunk/libaf/af_sub.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_sub.c Sat Oct 26 11:36:23 2013 (r36491) @@ -32,6 +32,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" #include "dsp.h" @@ -71,7 +72,7 @@ static int control(struct af_instance_s* if(!arg) return AF_ERROR; af->data->rate = ((af_data_t*)arg)->rate; - af->data->nch = max(s->ch+1,((af_data_t*)arg)->nch); + af->data->nch = FFMAX(s->ch+1,((af_data_t*)arg)->nch); af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; Modified: trunk/libaf/af_tools.c ============================================================================== --- trunk/libaf/af_tools.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_tools.c Sat Oct 26 11:36:23 2013 (r36491) @@ -18,6 +18,7 @@ #include <math.h> #include <string.h> +#include "libavutil/common.h" #include "af.h" /* Convert to gain value from dB. Returns AF_OK if of and AF_ERROR if @@ -33,7 +34,7 @@ int af_from_dB(int n, float* in, float* if(in[i]<=-200) out[i]=0.0; else - out[i]=pow(10.0,clamp(in[i],mi,ma)/k); + out[i]=pow(10.0,av_clipf(in[i],mi,ma)/k); } return AF_OK; } @@ -65,7 +66,7 @@ int af_from_ms(int n, float* in, int* ou return AF_ERROR; for(i=0;i<n;i++) - out[i]=(int)((float)rate * clamp(in[i],mi,ma)/1000.0); + out[i]=(int)((float)rate * av_clipf(in[i],mi,ma)/1000.0); return AF_OK; } Modified: trunk/libaf/af_volnorm.c ============================================================================== --- trunk/libaf/af_volnorm.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_volnorm.c Sat Oct 26 11:36:23 2013 (r36491) @@ -26,6 +26,7 @@ #include <math.h> #include <limits.h> +#include "libavutil/common.h" #include "af.h" // Methods: @@ -144,14 +145,14 @@ static void method1_int16(af_volnorm_t * s->mul = (1.0 - SMOOTH_MUL) * s->mul + SMOOTH_MUL * neededmul; // clamp the mul coefficient - s->mul = clamp(s->mul, MUL_MIN, MUL_MAX); + s->mul = av_clipf(s->mul, MUL_MIN, MUL_MAX); } // Scale & clamp the samples for (i = 0; i < len; i++) { tmp = s->mul * data[i]; - tmp = clamp(tmp, SHRT_MIN, SHRT_MAX); + tmp = av_clip_int16(tmp); data[i] = tmp; } @@ -185,7 +186,7 @@ static void method1_float(af_volnorm_t * s->mul = (1.0 - SMOOTH_MUL) * s->mul + SMOOTH_MUL * neededmul; // clamp the mul coefficient - s->mul = clamp(s->mul, MUL_MIN, MUL_MAX); + s->mul = av_clipf(s->mul, MUL_MIN, MUL_MAX); } // Scale & clamp the samples @@ -228,7 +229,7 @@ static void method2_int16(af_volnorm_t * if (avg >= SIL_S16) { s->mul = s->mid_s16 / avg; - s->mul = clamp(s->mul, MUL_MIN, MUL_MAX); + s->mul = av_clipf(s->mul, MUL_MIN, MUL_MAX); } } @@ -236,7 +237,7 @@ static void method2_int16(af_volnorm_t * for (i = 0; i < len; i++) { tmp = s->mul * data[i]; - tmp = clamp(tmp, SHRT_MIN, SHRT_MAX); + tmp = av_clip_int16(tmp); data[i] = tmp; } @@ -278,7 +279,7 @@ static void method2_float(af_volnorm_t * if (avg >= SIL_FLOAT) { s->mul = s->mid_float / avg; - s->mul = clamp(s->mul, MUL_MIN, MUL_MAX); + s->mul = av_clipf(s->mul, MUL_MIN, MUL_MAX); } } Modified: trunk/libaf/af_volume.c ============================================================================== --- trunk/libaf/af_volume.c Sat Oct 26 11:36:21 2013 (r36490) +++ trunk/libaf/af_volume.c Sat Oct 26 11:36:23 2013 (r36491) @@ -42,6 +42,7 @@ #include <math.h> #include <limits.h> +#include "libavutil/common.h" #include "mp_msg.h" #include "af.h" @@ -121,7 +122,7 @@ static int control(struct af_instance_s* int i; if(!s->fast){ for(i=0;i<AF_NCH;i++) - m=max(m,s->max[i]); + m=FFMAX(m,s->max[i]); af_to_dB(1, &m, &m, 10.0); mp_msg(MSGT_AFILTER, MSGL_INFO, "[volume] The maximum volume was %0.2fdB \n", m); } @@ -156,7 +157,7 @@ static af_data_t* play(struct af_instanc register int vol = (int)(255.0 * s->level[ch]); for(i=ch;i<len;i+=nch){ register int x = (a[i] * vol) >> 8; - a[i]=clamp(x,SHRT_MIN,SHRT_MAX); + a[i]=av_clip_int16(x); } } } @@ -189,7 +190,7 @@ static af_data_t* play(struct af_instanc x=af_softclip(x); // Hard clipping else - x=clamp(x,-1.0,1.0); + x=av_clipf(x,-1.0,1.0); a[i] = x; } }

1 0