mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
* 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:
commit
1c788eaca9
@ -2631,7 +2631,7 @@ static void apply_dependent_coupling(AACContext *ac,
|
||||
const float gain = cce->coup.gain[index][idx];
|
||||
for (group = 0; group < ics->group_len[g]; group++) {
|
||||
for (k = offsets[i]; k < offsets[i + 1]; k++) {
|
||||
// XXX dsputil-ize
|
||||
// FIXME: SIMDify
|
||||
dest[group * 128 + k] += gain * src[group * 128 + k];
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* AC-3 DSP utils
|
||||
* AC-3 DSP functions
|
||||
* Copyright (c) 2011 Justin Ruggles
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* AC-3 DSP utils
|
||||
* AC-3 DSP functions
|
||||
* Copyright (c) 2011 Justin Ruggles
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
@
|
||||
@ ARMv4 optimized DSP utils
|
||||
@ ARMv4-optimized halfpel functions
|
||||
@ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
|
||||
@
|
||||
@ This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* ARM optimized DSP utils
|
||||
* ARM-optimized halfpel functions
|
||||
* Copyright (c) 2001 Lionel Ulmer
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
@
|
||||
@ ARMv5te optimized DSP utils
|
||||
@ ARMv5te-optimized core video DSP functions
|
||||
@ Copyright (c) 2004 AGAWA Koji <i (AT) atty (DOT) jp>
|
||||
@
|
||||
@ This file is part of FFmpeg
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* BlackFin DSPUTILS
|
||||
* BlackFin halfpel functions
|
||||
*
|
||||
* Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
|
||||
* Copyright (c) 2006 Michael Benjamin <michael.benjamin@analog.com>
|
||||
|
@ -403,7 +403,7 @@ static void mpeg_motion_field(MpegEncContext *s, uint8_t *dest_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)
|
||||
{
|
||||
int x;
|
||||
|
@ -1,5 +1,5 @@
|
||||
;*****************************************************************************
|
||||
;* x86-optimized AC-3 DSP utils
|
||||
;* x86-optimized AC-3 DSP functions
|
||||
;* Copyright (c) 2011 Justin Ruggles
|
||||
;*
|
||||
;* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* x86-optimized AC-3 DSP utils
|
||||
* x86-optimized AC-3 DSP functions
|
||||
* Copyright (c) 2011 Justin Ruggles
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
;******************************************************************************
|
||||
;* MMX optimized deinterlacing functions
|
||||
;* SIMD-optimized deinterlacing functions
|
||||
;* Copyright (c) 2010 Vitor Sessak
|
||||
;* Copyright (c) 2002 Michael Niedermayer
|
||||
;*
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* MMX optimized forward DCT
|
||||
* SIMD-optimized forward DCT
|
||||
* The gcc porting is Copyright (c) 2001 Fabrice Bellard.
|
||||
* cleanup/optimizations are Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
|
||||
* SSE2 optimization is Copyright (c) 2004 Denes Balatoni.
|
||||
|
@ -1,5 +1,5 @@
|
||||
;******************************************************************************
|
||||
;* MMX optimized DSP utils
|
||||
;* SIMD-optimized fullpel functions
|
||||
;* Copyright (c) 2008 Loren Merritt
|
||||
;* Copyright (c) 2003-2013 Michael Niedermayer
|
||||
;* Copyright (c) 2013 Daniel Kang
|
||||
|
@ -6,7 +6,7 @@
|
||||
;* Copyright (c) 2002 Zdenek Kabelac <kabi@informatics.muni.cz>
|
||||
;* Copyright (c) 2013 Daniel Kang
|
||||
;*
|
||||
;* MMX optimized hpel functions
|
||||
;* SIMD-optimized halfpel functions
|
||||
;*
|
||||
;* This file is part of FFmpeg.
|
||||
;*
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* MMX optimized DSP utils
|
||||
* SIMD-optimized halfpel functions
|
||||
* Copyright (c) 2000, 2001 Fabrice Bellard
|
||||
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
|
||||
*
|
||||
|
@ -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) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
|
||||
*
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* MMX optimized LPC DSP utils
|
||||
* SIMD-optimized LPC functions
|
||||
* Copyright (c) 2007 Loren Merritt
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* MMX optimized MP3 decoding functions
|
||||
* SIMD-optimized MP3 decoding functions
|
||||
* Copyright (c) 2010 Vitor Sessak
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
|
@ -1,5 +1,5 @@
|
||||
;******************************************************************************
|
||||
;* MMX optimized DSP utils
|
||||
;* SIMD-optimized quarterpel functions
|
||||
;* Copyright (c) 2008 Loren Merritt
|
||||
;* Copyright (c) 2003-2013 Michael Niedermayer
|
||||
;* Copyright (c) 2013 Daniel Kang
|
||||
|
@ -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) 2003-2004 Michael Niedermayer <michaelni@gmx.at>
|
||||
*
|
||||
|
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* ARM optimized DSP utils
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
Loading…
Reference in New Issue
Block a user