mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-23 23:06:41 +00:00
039e9fe01c
* qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
87 lines
2.4 KiB
C
87 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2012 Mans Rullgard <mans@mansr.com>
|
|
*
|
|
* 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>
|
|
|
|
#undef FUNC
|
|
#undef sample
|
|
|
|
#if SAMPLE_SIZE == 32
|
|
# define FUNC(n) n ## _32
|
|
# define sample int32_t
|
|
#else
|
|
# define FUNC(n) n ## _16
|
|
# define sample int16_t
|
|
#endif
|
|
|
|
static void FUNC(flac_decorrelate_indep_c)(uint8_t **out, int32_t **in,
|
|
int channels, int len, int shift)
|
|
{
|
|
sample *samples = (sample *) out[0];
|
|
int i, j;
|
|
|
|
for (j = 0; j < len; j++)
|
|
for (i = 0; i < channels; i++)
|
|
*samples++ = in[i][j] << shift;
|
|
}
|
|
|
|
static void FUNC(flac_decorrelate_ls_c)(uint8_t **out, int32_t **in,
|
|
int channels, int len, int shift)
|
|
{
|
|
sample *samples = (sample *) out[0];
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
int a = in[0][i];
|
|
int b = in[1][i];
|
|
*samples++ = a << shift;
|
|
*samples++ = (a - b) << shift;
|
|
}
|
|
}
|
|
|
|
static void FUNC(flac_decorrelate_rs_c)(uint8_t **out, int32_t **in,
|
|
int channels, int len, int shift)
|
|
{
|
|
sample *samples = (sample *) out[0];
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
int a = in[0][i];
|
|
int b = in[1][i];
|
|
*samples++ = (a + b) << shift;
|
|
*samples++ = b << shift;
|
|
}
|
|
}
|
|
|
|
static void FUNC(flac_decorrelate_ms_c)(uint8_t **out, int32_t **in,
|
|
int channels, int len, int shift)
|
|
{
|
|
sample *samples = (sample *) out[0];
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
int a = in[0][i];
|
|
int b = in[1][i];
|
|
a -= b >> 1;
|
|
*samples++ = (a + b) << shift;
|
|
*samples++ = a << shift;
|
|
}
|
|
}
|