[FFmpeg-devel] [PATCH 1/6] truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

[Ben Avison]

On Wed, 19 Mar 2014 17:50:33 -0000, Michael Niedermayer <michaelni at gmx.at> wrote:
>> +// This code uses too many ARM-only tricks to easily assemble as Thumb
>> +.arm
>> +#undef CONFIG_THUMB
>> +#define CONFIG_THUMB 0
>
> this results in a warning when config.h is included later
[...]
> also compilation fails with:

Ah, that's unfortunate. I thought I'd neatly sidestepped the ARM/Thumb
differences there - as you saw, I noticed that I'd used a *lot* of
instructions that Thumb doesn't support.

I suppose I could change libavutil/arm/asm.S to accept an override for
the CONFIG_THUMB setting from config.h, but as this is a one-off, perhaps
a slightly different fudge will do... would you mind trying this to see
if it works please?

Thanks,
Ben


diff --git a/libavcodec/arm/mlpdsp_arm.S b/libavcodec/arm/mlpdsp_arm.S
index 338d323..820a961 100644
--- a/libavcodec/arm/mlpdsp_arm.S
+++ b/libavcodec/arm/mlpdsp_arm.S
@@ -19,12 +19,14 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */

+#include "libavutil/arm/asm.S"
+
  // This code uses too many ARM-only tricks to easily assemble as Thumb
  .arm
-#undef CONFIG_THUMB
-#define CONFIG_THUMB 0
-
-#include "libavutil/arm/asm.S"
+#undef A
+#undef T
+#define A
+#define T @

  #define MAX_CHANNELS        8
  #define MAX_FIR_ORDER       8