generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

Browse Source 
* commit '831a1180785a786272cdcefb71566a770bfb879e':
  Update dsputil- and SIMD-related comments to match reality more closely

Conflicts:
	libavcodec/x86/hpeldsp.asm
	libavutil/arm/float_dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-13 23:59:56 +01:00
commit 1c788eaca9
21 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacdec.c
View File

@ -2631,7 +2631,7 @@ static void apply_dependent_coupling(AACContext *ac,
const float gain = cce->coup.gain[index][idx]; const float gain = cce->coup.gain[index][idx];
for (group = 0; group < ics->group_len[g]; group++) { for (group = 0; group < ics->group_len[g]; group++) {
for (k = offsets[i]; k < offsets[i + 1]; k++) { for (k = offsets[i]; k < offsets[i + 1]; k++) {
// XXX dsputil-ize // FIXME: SIMDify
dest[group * 128 + k] += gain * src[group * 128 + k]; dest[group * 128 + k] += gain * src[group * 128 + k];
} }
} }

2
libavcodec/ac3dsp.c
View File

@ -1,5 +1,5 @@
/* /*
* AC-3 DSP utils * AC-3 DSP functions
* Copyright (c) 2011 Justin Ruggles * Copyright (c) 2011 Justin Ruggles
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

2
libavcodec/ac3dsp.h
View File

@ -1,5 +1,5 @@
/* /*
* AC-3 DSP utils * AC-3 DSP functions
* Copyright (c) 2011 Justin Ruggles * Copyright (c) 2011 Justin Ruggles
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

2
libavcodec/arm/hpeldsp_arm.S
View File

@ -1,5 +1,5 @@
@ @
@ ARMv4 optimized DSP utils @ ARMv4-optimized halfpel functions
@ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp> @ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@ @
@ This file is part of FFmpeg. @ This file is part of FFmpeg.

2
libavcodec/arm/hpeldsp_init_arm.c
View File

@ -1,5 +1,5 @@
/* /*
* ARM optimized DSP utils * ARM-optimized halfpel functions
* Copyright (c) 2001 Lionel Ulmer * Copyright (c) 2001 Lionel Ulmer
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

2
libavcodec/arm/videodsp_armv5te.S
View File

@ -1,5 +1,5 @@
@ @
@ ARMv5te optimized DSP utils @ ARMv5te-optimized core video DSP functions
@ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp> @ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
@ @
@ This file is part of FFmpeg @ This file is part of FFmpeg

2
libavcodec/bfin/hpeldsp_bfin.c
View File

@ -1,5 +1,5 @@
/* /*
* BlackFin DSPUTILS * BlackFin halfpel functions
* *
* Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com> * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
* Copyright (c) 2006 Michael Benjamin <michael.benjamin@analog.com> * Copyright (c) 2006 Michael Benjamin <michael.benjamin@analog.com>

2
libavcodec/mpegvideo_motion.c
View File

@ -403,7 +403,7 @@ static void mpeg_motion_field(MpegEncContext *s, uint8_t *dest_y,
motion_x, motion_y, h, 0, mb_y); motion_x, motion_y, h, 0, mb_y);
} }
// FIXME move to dsputil, avg variant, 16x16 version // FIXME: SIMDify, avg variant, 16x16 version
static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride) static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride)
{ {
int x; int x;

2
libavcodec/x86/ac3dsp.asm
View File

@ -1,5 +1,5 @@
;***************************************************************************** ;*****************************************************************************
;* x86-optimized AC-3 DSP utils ;* x86-optimized AC-3 DSP functions
;* Copyright (c) 2011 Justin Ruggles ;* Copyright (c) 2011 Justin Ruggles
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.

2
libavcodec/x86/ac3dsp_init.c
View File

@ -1,5 +1,5 @@
/* /*
* x86-optimized AC-3 DSP utils * x86-optimized AC-3 DSP functions
* Copyright (c) 2011 Justin Ruggles * Copyright (c) 2011 Justin Ruggles
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

2
libavcodec/x86/deinterlace.asm
View File

@ -1,5 +1,5 @@
;****************************************************************************** ;******************************************************************************
;* MMX optimized deinterlacing functions ;* SIMD-optimized deinterlacing functions
;* Copyright (c) 2010 Vitor Sessak ;* Copyright (c) 2010 Vitor Sessak
;* Copyright (c) 2002 Michael Niedermayer ;* Copyright (c) 2002 Michael Niedermayer
;* ;*

2
libavcodec/x86/fdct.c
View File

@ -1,5 +1,5 @@
/* /*
* MMX optimized forward DCT * SIMD-optimized forward DCT
* The gcc porting is Copyright (c) 2001 Fabrice Bellard. * The gcc porting is Copyright (c) 2001 Fabrice Bellard.
* cleanup/optimizations are Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * cleanup/optimizations are Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
* SSE2 optimization is Copyright (c) 2004 Denes Balatoni. * SSE2 optimization is Copyright (c) 2004 Denes Balatoni.

2
libavcodec/x86/fpel.asm
View File

@ -1,5 +1,5 @@
;****************************************************************************** ;******************************************************************************
;* MMX optimized DSP utils ;* SIMD-optimized fullpel functions
;* Copyright (c) 2008 Loren Merritt ;* Copyright (c) 2008 Loren Merritt
;* Copyright (c) 2003-2013 Michael Niedermayer ;* Copyright (c) 2003-2013 Michael Niedermayer
;* Copyright (c) 2013 Daniel Kang ;* Copyright (c) 2013 Daniel Kang

2
libavcodec/x86/hpeldsp.asm
View File

@ -6,7 +6,7 @@
;* Copyright (c) 2002 Zdenek Kabelac <kabi@informatics.muni.cz> ;* Copyright (c) 2002 Zdenek Kabelac <kabi@informatics.muni.cz>
;* Copyright (c) 2013 Daniel Kang ;* Copyright (c) 2013 Daniel Kang
;* ;*
;* MMX optimized hpel functions ;* SIMD-optimized halfpel functions
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.
;* ;*

2
libavcodec/x86/hpeldsp_init.c
View File

@ -1,5 +1,5 @@
/* /*
* MMX optimized DSP utils * SIMD-optimized halfpel functions
* Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2000, 2001 Fabrice Bellard
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
* *

2
libavcodec/x86/hpeldsp_rnd_template.c
View File

@ -1,5 +1,5 @@
/* /*
* DSP utils mmx functions are compiled twice for rnd/no_rnd * SIMD-optimized halfpel functions are compiled twice for rnd/no_rnd
* Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2000, 2001 Fabrice Bellard
* Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at> * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
* *

2
libavcodec/x86/lpc.c
View File

@ -1,5 +1,5 @@
/* /*
* MMX optimized LPC DSP utils * SIMD-optimized LPC functions
* Copyright (c) 2007 Loren Merritt * Copyright (c) 2007 Loren Merritt
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

2
libavcodec/x86/mpegaudiodsp.c
View File

@ -1,5 +1,5 @@
/* /*
* MMX optimized MP3 decoding functions * SIMD-optimized MP3 decoding functions
* Copyright (c) 2010 Vitor Sessak * Copyright (c) 2010 Vitor Sessak
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

2
libavcodec/x86/qpel.asm
View File

@ -1,5 +1,5 @@
;****************************************************************************** ;******************************************************************************
;* MMX optimized DSP utils ;* SIMD-optimized quarterpel functions
;* Copyright (c) 2008 Loren Merritt ;* Copyright (c) 2008 Loren Merritt
;* Copyright (c) 2003-2013 Michael Niedermayer ;* Copyright (c) 2003-2013 Michael Niedermayer
;* Copyright (c) 2013 Daniel Kang ;* Copyright (c) 2013 Daniel Kang

2
libavcodec/x86/rnd_template.c
View File

@ -1,5 +1,5 @@
/* /*
* DSP utils mmx functions are compiled twice for rnd/no_rnd * SIMD-optimized halfpel functions are compiled twice for rnd/no_rnd
* Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2000, 2001 Fabrice Bellard
* Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at> * Copyright (c) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
* *

2
libavutil/arm/float_dsp_init_arm.c
View File

@ -1,6 +1,4 @@
/* /*
* ARM optimized DSP utils
*
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
* FFmpeg is free software; you can redistribute it and/or * FFmpeg is free software; you can redistribute it and/or