From f99b896017cf8d4ac2998377b40a6c839a1bd91c Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Sun, 21 Nov 2010 21:54:46 +0000 Subject: Remove tabs. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28635 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libatrac/atrac3.c | 2 +- apps/codecs/libatrac/atrac3_armv5e.S | 98 ++++++++++++++++++------------------ apps/codecs/libwma/wmadeci.c | 8 +-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/apps/codecs/libatrac/atrac3.c b/apps/codecs/libatrac/atrac3.c index dbc7328c29..22e787d6e3 100644 --- a/apps/codecs/libatrac/atrac3.c +++ b/apps/codecs/libatrac/atrac3.c @@ -1259,7 +1259,7 @@ int atrac3_decode_init(ATRAC3Context *q, struct mp3entry *id3) vlcs_initialized = 1; } - + init_atrac3_transforms(); /* init the joint-stereo decoding data */ diff --git a/apps/codecs/libatrac/atrac3_armv5e.S b/apps/codecs/libatrac/atrac3_armv5e.S index 1add5faef5..1d9d35a5da 100644 --- a/apps/codecs/libatrac/atrac3_armv5e.S +++ b/apps/codecs/libatrac/atrac3_armv5e.S @@ -59,105 +59,105 @@ atrac3_iqmf_dewindowing_armv5e: /* r1 = input samples */ /* r2 = window coefficients */ /* r3 = counter */ - stmfd sp!, {r4-r11, lr} /* save non-scratch registers */ + stmfd sp!, {r4-r11, lr} /* save non-scratch registers */ .iqmf_dewindow_outer_loop: /* outer loop 0...counter-1 */ /* 0.. 7 */ ldmia r2!, {r4, r5, r8, r9} /* load win[0..7] */ ldmia r1!, {r6, r7, r10, r11} /* load in[0..3] to avoid stall on arm11 */ - smulwb lr, r6, r4 /* s1 = in[0] * win[0] */ - smulwt r12, r7, r4 /* s2 = in[1] * win[1] */ - smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ + smulwb lr, r6, r4 /* s1 = in[0] * win[0] */ + smulwt r12, r7, r4 /* s2 = in[1] * win[1] */ + smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r5, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - + ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r11, r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r11, r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ /* 8..15 */ ldmia r2!, {r4, r5, r8, r9} /* load win[8..15] */ ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r5, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - + ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ /* 16..23 */ ldmia r2!, {r4, r5, r8, r9} /* load win[16..23] */ ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r5, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - + ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ /* 24..31 */ ldmia r2!, {r4, r5, r8, r9} /* load win[24..31] */ ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r5, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - + ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ /* 32..39 */ ldmia r2!, {r4, r5, r8, r9} /* load win[32..39] */ ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r5, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - + ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ /* 40..47 */ ldmia r2!, {r4, r5, r8, r9} /* load win[40..47] */ ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r4, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r4, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r5, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r5, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - + ldmia r1!, {r6, r7, r10, r11} /* load in[i...i+3] */ - smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ - smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawb lr, r6, r8, lr /* s1 += in[i ] * win[i ] >> 16 */ + smlawt r12, r7, r8, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ + smlawb lr, r10, r9, lr /* s1 += in[i ] * win[i ] >> 16 */ smlawt r12, r11,r9, r12 /* s2 += in[i+1] * win[i+1] >> 16 */ - mov lr , lr , lsl #1 - mov r12, r12, lsl #1 + mov lr , lr , lsl #1 + mov r12, r12, lsl #1 - stmia r0!, {r12, lr} /* store result out[0]=s2, out[1]=s1 */ + stmia r0!, {r12, lr} /* store result out[0]=s2, out[1]=s1 */ sub r1, r1, #184 /* roll back 64 entries = 184 bytes */ - sub r2, r2, #96 /* roll back 48 entries * 2 bytes = 96 bytes = win[0] */ + sub r2, r2, #96 /* roll back 48 entries * 2 bytes = 96 bytes = win[0] */ subs r3, r3, #1 /* outer loop -= 1 */ bgt .iqmf_dewindow_outer_loop - ldmpc regs=r4-r11 /* restore registers */ + ldmpc regs=r4-r11 /* restore registers */ .atrac3_iqmf_dewindowing_armv5e_end: .size atrac3_iqmf_dewindowing_armv5e,.atrac3_iqmf_dewindowing_armv5e_end-atrac3_iqmf_dewindowing_armv5e diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index f24ac13a0e..9333f19ff1 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c @@ -1232,7 +1232,7 @@ static int wma_decode_block(WMADecodeContext *s) for(ch = 0; ch < s->nb_channels; ++ch) { /* BLOCK_MAX_SIZE is 2048 (samples) and MAX_CHANNELS is 2. */ - static uint32_t scratch_buf[BLOCK_MAX_SIZE * MAX_CHANNELS] IBSS_ATTR; + static uint32_t scratch_buf[BLOCK_MAX_SIZE * MAX_CHANNELS] IBSS_ATTR; if (s->channel_coded[ch]) { int n4, index; @@ -1348,9 +1348,9 @@ int wma_decode_superframe_frame(WMADecodeContext* s, int done = 0; for(ch = 0; ch < s->nb_channels; ch++) - memmove(&((*s->frame_out)[ch][0]), - &((*s->frame_out)[ch][s->frame_len]), - s->frame_len * sizeof(fixed32)); + memmove(&((*s->frame_out)[ch][0]), + &((*s->frame_out)[ch][s->frame_len]), + s->frame_len * sizeof(fixed32)); if ((s->use_bit_reservoir) && (s->current_frame == 0)) { -- cgit v1.2.3