Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'qatar/master'
* qatar/master: x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place trasher: Include all the necessary headers x86: Remove some leftover declarations for non-existent functions ARM: libavresample: NEON optimised generic fltp to s16 conversion ARM: libavresample: NEON optimised stereo fltp to s16 conversion ARM: libavresample: NEON optimised flat float to s16 conversion Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
- Loading branch information
Showing
10 changed files
with
452 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,2 @@ | |||
OBJS += arm/audio_convert_init.o | |||
NEON-OBJS += arm/audio_convert_neon.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,49 @@ | |||
/* | |||
* This file is part of FFmpeg. | |||
* | |||
* FFmpeg is free software; you can redistribute it and/or | |||
* modify it under the terms of the GNU Lesser General Public | |||
* License as published by the Free Software Foundation; either | |||
* version 2.1 of the License, or (at your option) any later version. | |||
* | |||
* FFmpeg is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Lesser General Public | |||
* License along with FFmpeg; if not, write to the Free Software | |||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |||
*/ | |||
|
|||
#include <stdint.h> | |||
|
|||
#include "config.h" | |||
#include "libavutil/attributes.h" | |||
#include "libavutil/cpu.h" | |||
#include "libavutil/arm/cpu.h" | |||
#include "libavutil/samplefmt.h" | |||
#include "libavresample/audio_convert.h" | |||
|
|||
void ff_conv_flt_to_s16_neon(int16_t *dst, const float *src, int len); | |||
void ff_conv_fltp_to_s16_neon(int16_t *dst, float *const *src, | |||
int len, int channels); | |||
void ff_conv_fltp_to_s16_2ch_neon(int16_t *dst, float *const *src, | |||
int len, int channels); | |||
|
|||
av_cold void ff_audio_convert_init_arm(AudioConvert *ac) | |||
{ | |||
int cpu_flags = av_get_cpu_flags(); | |||
|
|||
if (have_neon(cpu_flags)) { | |||
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLT, | |||
0, 16, 8, "NEON", | |||
ff_conv_flt_to_s16_neon); | |||
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLTP, | |||
0, 16, 8, "NEON", | |||
ff_conv_fltp_to_s16_neon); | |||
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLTP, | |||
2, 16, 8, "NEON", | |||
ff_conv_fltp_to_s16_2ch_neon); | |||
} | |||
} |
Oops, something went wrong.