From 9f97af2688e1cbb6cca4ea50e3dece3bc8f5bb97 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 18 Jul 2012 09:46:38 +0200 Subject: [PATCH 1/3] x86: dsputil: drop some unused CPU flag debug code --- libavcodec/x86/dsputil_mmx.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index c1d158e166..5eb4a242c0 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -3006,21 +3006,6 @@ void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); -#if 0 - av_log(avctx, AV_LOG_INFO, "libavcodec: CPU flags:"); - if (mm_flags & AV_CPU_FLAG_MMX) - av_log(avctx, AV_LOG_INFO, " mmx"); - if (mm_flags & AV_CPU_FLAG_MMX2) - av_log(avctx, AV_LOG_INFO, " mmx2"); - if (mm_flags & AV_CPU_FLAG_3DNOW) - av_log(avctx, AV_LOG_INFO, " 3dnow"); - if (mm_flags & AV_CPU_FLAG_SSE) - av_log(avctx, AV_LOG_INFO, " sse"); - if (mm_flags & AV_CPU_FLAG_SSE2) - av_log(avctx, AV_LOG_INFO, " sse2"); - av_log(avctx, AV_LOG_INFO, "\n"); -#endif - if (mm_flags & AV_CPU_FLAG_MMX) { const int idct_algo = avctx->idct_algo; From bf1cf4d5a5c73942b193ccf4af75dd851f4f4fd2 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 5 Jul 2012 12:25:40 +0100 Subject: [PATCH 2/3] flacdec: reverse lpc coeff order, simplify filter Reversing the lpc coefficient order simplifies indexing in the filter. Signed-off-by: Mans Rullgard --- libavcodec/flacdec.c | 2 +- libavcodec/flacdsp.c | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 53070a348c..8cbd389d47 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -321,7 +321,7 @@ static int decode_subframe_lpc(FLACContext *s, int channel, int pred_order, } for (i = 0; i < pred_order; i++) { - coeffs[i] = get_sbits(&s->gb, coeff_prec); + coeffs[pred_order - i - 1] = get_sbits(&s->gb, coeff_prec); } if (decode_residuals(s, channel, pred_order) < 0) diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index a2e335b4de..88d689d3eb 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -45,27 +45,26 @@ static void flac_lpc_16_c(int32_t *decoded, const int coeffs[32], { int i, j; - for (i = pred_order; i < len - 1; i += 2) { - int c; - int d = decoded[i-pred_order]; + for (i = pred_order; i < len - 1; i += 2, decoded += 2) { + int c = coeffs[0]; + int d = decoded[0]; int s0 = 0, s1 = 0; - for (j = pred_order-1; j > 0; j--) { - c = coeffs[j]; + for (j = 1; j < pred_order; j++) { s0 += c*d; - d = decoded[i-j]; + d = decoded[j]; s1 += c*d; + c = coeffs[j]; } - c = coeffs[0]; s0 += c*d; - d = decoded[i] += s0 >> qlevel; + d = decoded[j] += s0 >> qlevel; s1 += c*d; - decoded[i+1] += s1 >> qlevel; + decoded[j + 1] += s1 >> qlevel; } if (i < len) { int sum = 0; for (j = 0; j < pred_order; j++) - sum += coeffs[j] * decoded[i-j-1]; - decoded[i] += sum >> qlevel; + sum += coeffs[j] * decoded[j]; + decoded[j] += sum >> qlevel; } } @@ -74,11 +73,11 @@ static void flac_lpc_32_c(int32_t *decoded, const int coeffs[32], { int i, j; - for (i = pred_order; i < len; i++) { + for (i = pred_order; i < len; i++, decoded++) { int64_t sum = 0; for (j = 0; j < pred_order; j++) - sum += (int64_t)coeffs[j] * decoded[i-j-1]; - decoded[i] += sum >> qlevel; + sum += (int64_t)coeffs[j] * decoded[j]; + decoded[j] += sum >> qlevel; } } From 45870f8b6eb3529992a4315a6957150124d7ca03 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 18 Jul 2012 17:57:57 +0100 Subject: [PATCH 3/3] Print full compiler identification, not only version number This provides a more precise identification of the compiler used. Signed-off-by: Mans Rullgard --- cmdutils.c | 4 ++-- configure | 17 +---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index 11a5f03eec..6a93f283d8 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -503,8 +503,8 @@ void show_banner(void) av_log(NULL, AV_LOG_INFO, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav developers\n", program_name, program_birth_year, this_year); - av_log(NULL, AV_LOG_INFO, " built on %s %s with %s %s\n", - __DATE__, __TIME__, CC_TYPE, CC_VERSION); + av_log(NULL, AV_LOG_INFO, " built on %s %s with %s\n", + __DATE__, __TIME__, CC_IDENT); av_log(NULL, AV_LOG_VERBOSE, " configuration: " LIBAV_CONFIGURATION "\n"); print_all_libs_info(INDENT|SHOW_CONFIG, AV_LOG_VERBOSE); print_all_libs_info(INDENT|SHOW_VERSION, AV_LOG_VERBOSE); diff --git a/configure b/configure index ca24e3ca88..6760c0ee43 100755 --- a/configure +++ b/configure @@ -1651,7 +1651,6 @@ shlibdir_default="$libdir_default" # toolchain ar_default="ar" cc_default="gcc" -cc_version=\"unknown\" host_cc_default="gcc" ln_s="ln -sf" nm_default="nm" @@ -1953,7 +1952,6 @@ filter_cppflags=echo if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then cc_type=llvm_gcc - cc_version=__VERSION__ gcc_extra_ver=$(expr "$($cc --version | head -n1)" : '.*\((.*)\)') cc_ident="llvm-gcc $($cc -dumpversion) $gcc_extra_ver" CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -1962,7 +1960,6 @@ if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then size_cflags='-Os' elif $cc -v 2>&1 | grep -qi ^gcc; then cc_type=gcc - cc_version=__VERSION__ gcc_version=$($cc --version | head -n1) gcc_basever=$($cc -dumpversion) gcc_pkg_ver=$(expr "$gcc_version" : '[^ ]* \(([^)]*)\)') @@ -1976,7 +1973,6 @@ elif $cc -v 2>&1 | grep -qi ^gcc; then size_cflags='-Os' elif $cc --version 2>/dev/null | grep -q Intel; then cc_type=icc - cc_version="AV_STRINGIFY(__INTEL_COMPILER)" cc_ident=$($cc --version | head -n1) icc_version=$($cc -dumpversion) CC_DEPFLAGS='-MMD' @@ -1986,13 +1982,11 @@ elif $cc --version 2>/dev/null | grep -q Intel; then noopt_cflags='-O1' elif $cc -v 2>&1 | grep -q xlc; then cc_type=xlc - cc_version="AV_STRINGIFY(__IBMC__)" cc_ident=$($cc -qversion 2>/dev/null | head -n1) speed_cflags='-O5' size_cflags='-O5 -qcompact' elif $cc -V 2>/dev/null | grep -q Compaq; then cc_type=ccc - cc_version="AV_STRINGIFY(__DECC_VER)" cc_ident=$($cc -V | head -n1 | cut -d' ' -f1-3) DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M' debuglevel=3 @@ -2002,7 +1996,6 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then test -d "$sysroot" || die "No valid sysroot specified." cc_type=armcc - cc_version="AV_STRINGIFY(__ARMCC_VERSION)" cc_ident=$($cc --vsn | head -n1) armcc_conf="$PWD/armcc.conf" $cc --arm_linux_configure \ @@ -2020,7 +2013,6 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then filter_asflags="filter_out -W${armcc_opt}*" elif $cc -version 2>/dev/null | grep -q TMS470; then cc_type=tms470 - cc_version="AV_STRINGIFY(__TI_COMPILER_VERSION__)" cc_ident=$($cc -version | head -n1 | tr -s ' ') cc="$cc --gcc --abi=eabi -eo=.o -mc -me" CC_O='-fr=$(@D)' @@ -2060,8 +2052,6 @@ elif $cc -version 2>/dev/null | grep -q TMS470; then } elif $cc -v 2>&1 | grep -q clang; then cc_type=clang - $cc -dM -E $TMPC | grep -q __clang_version__ && - cc_version=__clang_version__ || cc_version=__VERSION__ cc_ident=$($cc --version | head -n1) CC_DEPFLAGS='-MMD' AS_DEPFLAGS='-MMD' @@ -2069,7 +2059,6 @@ elif $cc -v 2>&1 | grep -q clang; then size_cflags='-Os' elif $cc -V 2>&1 | grep -q Sun; then cc_type=suncc - cc_version="AV_STRINGIFY(__SUNPRO_C)" cc_ident=$($cc -V 2>&1 | head -n1 | cut -d' ' -f 2-) DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)' DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -xM1' @@ -2112,7 +2101,6 @@ elif $cc -V 2>&1 | grep -q Sun; then } elif $cc -v 2>&1 | grep -q 'PathScale\|Path64'; then cc_type=pathscale - cc_version=__PATHSCALE__ cc_ident=$($cc -v 2>&1 | head -n1 | tr -d :) CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -2121,7 +2109,6 @@ elif $cc -v 2>&1 | grep -q 'PathScale\|Path64'; then filter_cflags='filter_out -Wdisabled-optimization' elif $cc -v 2>&1 | grep -q Open64; then cc_type=open64 - cc_version=__OPEN64__ cc_ident=$($cc -v 2>&1 | head -n1 | tr -d :) CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -2130,7 +2117,6 @@ elif $cc -v 2>&1 | grep -q Open64; then filter_cflags='filter_out -Wdisabled-optimization|-Wtype-limits|-fno-signed-zeros' elif $cc -V 2>&1 | grep -q Portland; then cc_type=pgi - cc_version='AV_STRINGIFY(__PGIC__.__PGIC_MINOR__.__PGIC_PATCHLEVEL__)' cc_ident="PGI $($cc -V 2>&1 | awk '/^pgcc/ { print $2; exit }')" opt_common='-alias=ansi -Mlre -Mpre' speed_cflags="-O3 -Mautoinline -Munroll=c:4 $opt_common" @@ -3419,8 +3405,7 @@ cat > $TMPH <