0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687
  1. From 7abc597649a709b44603aee0ee8fd77383bbbe18 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Fri, 10 Aug 2012 16:02:07 +0200
  4. Subject: [PATCH 02/15] deinterlace/merge: use a macro to fix compilation for
  5. iOS
  6. ---
  7. modules/video_filter/deinterlace/merge_arm.S | 26 ++++++++++----------------
  8. 1 file changed, 10 insertions(+), 16 deletions(-)
  9. diff --git a/modules/video_filter/deinterlace/merge_arm.S b/modules/video_filter/deinterlace/merge_arm.S
  10. index dd77902..03e5042 100644
  11. --- a/modules/video_filter/deinterlace/merge_arm.S
  12. +++ b/modules/video_filter/deinterlace/merge_arm.S
  13. @@ -18,6 +18,8 @@
  14. @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  15. @****************************************************************************/
  16. +#include "../../arm_neon/asm.S"
  17. +
  18. .syntax unified
  19. .arm
  20. .arch armv6
  21. @@ -29,11 +31,8 @@
  22. #define SRC2 r2
  23. #define SIZE r3
  24. - .align 2
  25. - .global merge8_arm_neon
  26. - .type merge8_arm_neon, %function
  27. @ NOTE: Offset and pitch must be multiple of 16-bytes in VLC.
  28. -merge8_arm_neon:
  29. +function merge8_arm_neon, export=1
  30. cmp SIZE, #64
  31. blo 2f
  32. 1:
  33. @@ -70,11 +69,9 @@ merge8_arm_neon:
  34. vhadd.u8 q0, q0, q8
  35. vst1.u8 {q0}, [DEST,:128]!
  36. bx lr
  37. +endfunc
  38. - .align 2
  39. - .global merge16_arm_neon
  40. - .type merge16_arm_neon, %function
  41. -merge16_arm_neon:
  42. +function merge16_arm_neon, export=1
  43. cmp SIZE, #64
  44. blo 2f
  45. 1:
  46. @@ -111,11 +108,9 @@ merge16_arm_neon:
  47. vhadd.u16 q0, q0, q8
  48. vst1.u16 {q0}, [DEST,:128]!
  49. bx lr
  50. +endfunc
  51. - .align 2
  52. - .global merge8_armv6
  53. - .type merge8_armv6, %function
  54. -merge8_armv6:
  55. +function merge8_armv6, export=1
  56. push {r4-r9,lr}
  57. 1:
  58. pld [SRC1, #64]
  59. @@ -133,11 +128,9 @@ merge8_armv6:
  60. stm DEST!, {r6-r7}
  61. popeq {r4-r9,pc}
  62. b 1b
  63. +endfunc
  64. - .align 2
  65. - .global merge16_armv6
  66. - .type merge16_armv6, %function
  67. -merge16_armv6:
  68. +function merge16_armv6, export=1
  69. push {r4-r9,lr}
  70. 1:
  71. pld [SRC1, #64]
  72. @@ -155,3 +148,4 @@ merge16_armv6:
  73. stm DEST!, {r6-r7}
  74. popeq {r4-r9,pc}
  75. b 1b
  76. +endfunc
  77. --
  78. 2.9.2