[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/armv4l dsputil_arm_s.S, 1.1, 1.2 jrevdct_arm.S, 1.1, 1.2 simple_idct_arm.S, 1.1, 1.2

Sat Dec 17 19:15:05 CET 2005

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/armv4l
In directory mail:/var2/tmp/cvs-serv18206/libavcodec/armv4l

Modified Files:
	dsputil_arm_s.S jrevdct_arm.S simple_idct_arm.S 
Log Message:
COSMETICS: Remove all trailing whitespace.


Index: dsputil_arm_s.S
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/armv4l/dsputil_arm_s.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2

--- dsputil_arm_s.S	26 May 2005 14:32:46 -0000	1.1
+++ dsputil_arm_s.S	17 Dec 2005 18:14:32 -0000	1.2
@@ -637,15 +637,15 @@
         .align 8
 2:
         RND_XY2_EXPAND 1, 1
-        
+
         .align 8
 3:
         RND_XY2_EXPAND 2, 1
-        
+
         .align 8
 4:
         RND_XY2_EXPAND 3, 1
-        
+
 5:
         .word 0x03030303
         .word 2b
@@ -674,15 +674,15 @@
         .align 8
 2:
         RND_XY2_EXPAND 1, 0
-        
+
         .align 8
 3:
         RND_XY2_EXPAND 2, 0
-        
+
         .align 8
 4:
         RND_XY2_EXPAND 3, 0
-        
+
 5:
         .word 0x03030303
         .word 2b

Index: jrevdct_arm.S
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/armv4l/jrevdct_arm.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jrevdct_arm.S	13 Aug 2001 21:38:25 -0000	1.1
+++ jrevdct_arm.S	17 Dec 2005 18:14:32 -0000	1.2
@@ -1,4 +1,4 @@
-/* 
+/*
    C-like prototype :
 	void j_rev_dct_ARM(DCTBLOCK data)
 
@@ -22,7 +22,7 @@
    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	
+
 */
 #define FIX_0_298631336 2446
 #define FIX_0_541196100 4433
@@ -36,8 +36,8 @@
 #define FIX_M_1_847759065 -15137
 #define FIX_M_1_961570560 -16069
 #define FIX_M_2_562915447 -20995
-#define FIX_0xFFFF 0xFFFF	
-		
+#define FIX_0xFFFF 0xFFFF
+
 #define FIX_0_298631336_ID      0
 #define FIX_0_541196100_ID      4
 #define FIX_0_765366865_ID      8
@@ -53,7 +53,7 @@
 #define FIX_0xFFFF_ID          48
 	.text
 	.align
-	
+
 	.global j_rev_dct_ARM
 j_rev_dct_ARM:
 	stmdb   sp!, { r4 - r12, lr }   @ all callee saved regs
@@ -63,7 +63,7 @@
 
 	mov lr, r0                      @ lr = pointer to the current row
 	mov r12, #8                     @ r12 = row-counter
-	add r11, pc, #(const_array-.-8) @ r11 = base pointer to the constants array	
+	add r11, pc, #(const_array-.-8) @ r11 = base pointer to the constants array
 row_loop:
 	ldrsh r0, [lr, # 0]             @ r0 = 'd0'
 	ldrsh r1, [lr, # 8]             @ r1 = 'd1'
@@ -80,11 +80,11 @@
 	beq end_of_row_loop             @ nothing to be done as ALL of them are '0'
 	orrs r2, r3, r1
 	beq empty_row
-	
+
 	ldrsh r2, [lr, # 2]             @ r2 = 'd2'
 	ldrsh r4, [lr, # 4]             @ r4 = 'd4'
 	ldrsh r6, [lr, # 6]             @ r6 = 'd6'
-	
+
 	ldr r3, [r11, #FIX_0_541196100_ID]
 	add r7, r2, r6
 	ldr r5, [r11, #FIX_M_1_847759065_ID]
@@ -101,7 +101,7 @@
 	rsb r3, r6, r3, lsl #13             @ r3 = tmp12
 
 	stmdb   sp!, { r0, r2, r3, r4 } @ save on the stack tmp10, tmp13, tmp12, tmp11
-	
+
 	ldrsh r3, [lr, #10]             @ r3 = 'd3'
 	ldrsh r5, [lr, #12]             @ r5 = 'd5'
 	ldrsh r7, [lr, #14]             @ r7 = 'd7'
@@ -136,49 +136,49 @@
 
 	ldmia sp!, { r0, r2, r4, r6 } @ r0 = tmp10 / r2 = tmp13 / r4 = tmp12 / r6 = tmp11
 	                              @ r1 = tmp3  / r3 = tmp2  / r5 = tmp1  / r7 = tmp0
-	
+
 	@ Compute DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS)
 	add r8, r0, r1
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, # 0]
-	
+
 	@ Compute DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS)
 	sub r8, r0, r1
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, #14]
-	
+
 	@ Compute DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS)
 	add r8, r6, r3
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, # 2]
-	
+
 	@ Compute DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS)
 	sub r8, r6, r3
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, #12]
-	
+
 	@ Compute DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS)
 	add r8, r4, r5
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, # 4]
-	
+
 	@ Compute DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS)
 	sub r8, r4, r5
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, #10]
-	
+
 	@ Compute DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS)
 	add r8, r2, r7
 	add r8, r8, #(1<<10)
 	mov r8, r8, asr #11
 	strh r8, [lr, # 6]
-	
+
 	@ Compute DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS)
 	sub r8, r2, r7
 	add r8, r8, #(1<<10)
@@ -190,7 +190,7 @@
 	subs r12, r12, #1
 	bne row_loop
 	beq start_column_loop
-	
+
 empty_row:
 	ldr r1, [r11, #FIX_0xFFFF_ID]
 	mov r0, r0, lsl #2
@@ -244,7 +244,7 @@
 	beq empty_odd_column
 
 	stmdb   sp!, { r0, r2, r4, r6 } @ save on the stack tmp10, tmp13, tmp12, tmp11
-		
+
 	add r0, r3, r5	                @ r0 = 'z2'
 	add r2, r1, r7                  @ r2 = 'z1'
 	add r4, r3, r7                  @ r4 = 'z3'
@@ -271,53 +271,53 @@
 	mla r1, r9, r1, r2              @ r1 = tmp3 + z1
 	add r5,	r5, r6                  @ r5 = tmp1
 	add r3, r3, r4                  @ r3 = tmp2
-	add r1, r1, r6                  @ r1 = tmp3	
-	
+	add r1, r1, r6                  @ r1 = tmp3
+
 	ldmia sp!, { r0, r2, r4, r6 } @ r0 = tmp10 / r2 = tmp13 / r4 = tmp11 / r6 = tmp12
-	                              @ r1 = tmp3  / r3 = tmp2  / r5 = tmp1  / r7 = tmp0	
+	                              @ r1 = tmp3  / r3 = tmp2  / r5 = tmp1  / r7 = tmp0
 
 	@ Compute DESCALE(tmp10 + tmp3, CONST_BITS+PASS1_BITS+3)
 	add r8, r0, r1
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #( 0*8)]
-	
+
 	@ Compute DESCALE(tmp10 - tmp3, CONST_BITS+PASS1_BITS+3)
 	sub r8, r0, r1
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #(14*8)]
-	
+
 	@ Compute DESCALE(tmp11 + tmp2, CONST_BITS+PASS1_BITS+3)
 	add r8, r4, r3
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #( 2*8)]
-	
+
 	@ Compute DESCALE(tmp11 - tmp2, CONST_BITS+PASS1_BITS+3)
 	sub r8, r4, r3
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #(12*8)]
-	
+
 	@ Compute DESCALE(tmp12 + tmp1, CONST_BITS+PASS1_BITS+3)
 	add r8, r6, r5
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #( 4*8)]
-	
+
 	@ Compute DESCALE(tmp12 - tmp1, CONST_BITS+PASS1_BITS+3)
 	sub r8, r6, r5
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #(10*8)]
-	
+
 	@ Compute DESCALE(tmp13 + tmp0, CONST_BITS+PASS1_BITS+3)
 	add r8, r2, r7
 	add r8, r8, #(1<<17)
 	mov r8, r8, asr #18
 	strh r8, [lr, #( 6*8)]
-	
+
 	@ Compute DESCALE(tmp13 - tmp0, CONST_BITS+PASS1_BITS+3)
 	sub r8, r2, r7
 	add r8, r8, #(1<<17)
@@ -329,7 +329,7 @@
 	subs r12, r12, #1
 	bne column_loop
 	beq the_end
-	
+
 empty_odd_column:
 	@ Compute DESCALE(tmp10 + tmp3, CONST_BITS+PASS1_BITS+3)
 	@ Compute DESCALE(tmp10 - tmp3, CONST_BITS+PASS1_BITS+3)
@@ -337,21 +337,21 @@
 	mov r0, r0, asr #18
 	strh r0, [lr, #( 0*8)]
 	strh r0, [lr, #(14*8)]
-	
+
 	@ Compute DESCALE(tmp11 + tmp2, CONST_BITS+PASS1_BITS+3)
 	@ Compute DESCALE(tmp11 - tmp2, CONST_BITS+PASS1_BITS+3)
 	add r4, r4, #(1<<17)
 	mov r4, r4, asr #18
 	strh r4, [lr, #( 2*8)]
 	strh r4, [lr, #(12*8)]
-	
+
 	@ Compute DESCALE(tmp12 + tmp1, CONST_BITS+PASS1_BITS+3)
 	@ Compute DESCALE(tmp12 - tmp1, CONST_BITS+PASS1_BITS+3)
 	add r6, r6, #(1<<17)
 	mov r6, r6, asr #18
 	strh r6, [lr, #( 4*8)]
 	strh r6, [lr, #(10*8)]
-	
+
 	@ Compute DESCALE(tmp13 + tmp0, CONST_BITS+PASS1_BITS+3)
 	@ Compute DESCALE(tmp13 - tmp0, CONST_BITS+PASS1_BITS+3)
 	add r2, r2, #(1<<17)
@@ -363,8 +363,8 @@
 	add lr, lr, #2
 	subs r12, r12, #1
 	bne column_loop
-		
-the_end:	
+
+the_end:
 	@ The end....
 	add sp, sp, #4
 	ldmia   sp!, { r4 - r12, pc }   @ restore callee saved regs and return

Index: simple_idct_arm.S
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/armv4l/simple_idct_arm.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- simple_idct_arm.S	7 Jul 2003 11:19:18 -0000	1.1
+++ simple_idct_arm.S	17 Dec 2005 18:14:32 -0000	1.2
@@ -1,4 +1,4 @@
-/* 
+/*
  * simple_idct_arm.S
  * Copyright (C) 2002 Frederic 'dilb' Boulay.
  * All Rights Reserved.
@@ -20,7 +20,7 @@
  *
  *
  * The function defined in this file, is derived from the simple_idct function
- * from the libavcodec library part of the ffmpeg project. 
+ * from the libavcodec library part of the ffmpeg project.
  */
 
 /* useful constants for the algorithm, they are save in __constant_ptr__ at */



