Revision 153f4957

View differences:

libavcodec/Makefile
493 493
                                          arm/simple_idct_armv5te.o     \
494 494

  
495 495
OBJS-$(HAVE_ARMV6)                     += arm/dsputil_init_armv6.o      \
496
                                          arm/dsputil_armv6.o           \
496 497
                                          arm/simple_idct_armv6.o       \
497 498

  
498 499
OBJS-$(HAVE_ARMVFP)                    += arm/dsputil_vfp.o             \
libavcodec/arm/dsputil_armv6.S
1
/*
2
 * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
3
 *
4
 * This file is part of FFmpeg.
5
 *
6
 * FFmpeg is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU Lesser General Public
8
 * License as published by the Free Software Foundation; either
9
 * version 2.1 of the License, or (at your option) any later version.
10
 *
11
 * FFmpeg is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
 * Lesser General Public License for more details.
15
 *
16
 * You should have received a copy of the GNU Lesser General Public
17
 * License along with FFmpeg; if not, write to the Free Software
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
 */
20

  
21
#include "asm.S"
22

  
23
        .text
24

  
25
function ff_add_pixels_clamped_armv6, export=1
26
        push            {r4-r8,lr}
27
        mov             r3,  #8
28
1:
29
        ldm             r0!, {r4,r5,r12,lr}
30
        ldrd            r6,  r7,  [r1]
31
        pkhbt           r8,  r4,  r5,  lsl #16
32
        pkhtb           r5,  r5,  r4,  asr #16
33
        pkhbt           r4,  r12, lr,  lsl #16
34
        pkhtb           lr,  lr,  r12, asr #16
35
        pld             [r1, r2]
36
        uxtab16         r8,  r8,  r6
37
        uxtab16         r5,  r5,  r6,  ror #8
38
        uxtab16         r4,  r4,  r7
39
        uxtab16         lr,  lr,  r7,  ror #8
40
        usat16          r8,  #8,  r8
41
        usat16          r5,  #8,  r5
42
        usat16          r4,  #8,  r4
43
        usat16          lr,  #8,  lr
44
        orr             r6,  r8,  r5,  lsl #8
45
        orr             r7,  r4,  lr,  lsl #8
46
        subs            r3,  r3,  #1
47
        strd            r6,  r7,  [r1],  r2
48
        bgt             1b
49
        pop             {r4-r8,pc}
50
.endfunc
libavcodec/arm/dsputil_init_armv6.c
25 25
void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, DCTELEM *data);
26 26
void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, DCTELEM *data);
27 27

  
28
void ff_add_pixels_clamped_armv6(const DCTELEM *block,
29
                                 uint8_t *restrict pixels,
30
                                 int line_size);
31

  
28 32
void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx)
29 33
{
30 34
    if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO ||
......
34 38
        c->idct                  = ff_simple_idct_armv6;
35 39
        c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
36 40
    }
41

  
42
    c->add_pixels_clamped = ff_add_pixels_clamped_armv6;
37 43
}

Also available in: Unified diff