diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:54:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 18:02:00 +0100 |
| commit | 2e88f82a8a50b21a3273785ac1349fd94c1a8aa0 (patch) | |
| tree | 2b67d8e5bb10e18729dddfcd1a25b5ea13e17490 /libavcodec/proresdsp.c | |
| parent | 18d870da83b172c89495b6543001b2ecdf4ae1e2 (diff) | |
| parent | 92e598a57a7ce4b8ac9ea56274af39f5fd888311 (diff) | |
| download | ffmpeg-2e88f82a8a50b21a3273785ac1349fd94c1a8aa0.tar.gz | |
Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'
* commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311':
prores: Drop DSP infrastructure for prores encoder bits
Conflicts:
libavcodec/Makefile
libavcodec/proresdsp.c
libavcodec/proresenc_kostya.c
Note, these changes only affect one of the 2 prores encoders we have
If someone wants to add optimizations to the affected encoder, or needs/wants
this infrastructure, then iam happy to revert this
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdsp.c')
| -rw-r--r-- | libavcodec/proresdsp.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index f6246331fb..b523064950 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/common.h" -#include "dct.h" #include "dsputil.h" #include "proresdsp.h" #include "simple_idct.h" @@ -33,7 +33,6 @@ #define CLIP(x) (av_clip((x), CLIP_MIN, CLIP_MAX)) -#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER /** * Add bias value, clamp and output pixels of a slice */ @@ -55,26 +54,9 @@ static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const ff_prores_idct(block, qmat); put_pixels(out, linesize >> 1, block); } -#endif - -#if CONFIG_PRORES_KS_ENCODER -static void prores_fdct_c(const uint16_t *src, int linesize, int16_t *block) -{ - int x, y; - const uint16_t *tsrc = src; - - for (y = 0; y < 8; y++) { - for (x = 0; x < 8; x++) - block[y * 8 + x] = tsrc[x]; - tsrc += linesize >> 1; - } - ff_jpeg_fdct_islow_10(block); -} -#endif av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) { -#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER dsp->idct_put = prores_idct_put_c; dsp->idct_permutation_type = FF_NO_IDCT_PERM; @@ -83,8 +65,4 @@ av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) ff_init_scantable_permutation(dsp->idct_permutation, dsp->idct_permutation_type); -#endif -#if CONFIG_PRORES_KS_ENCODER - dsp->fdct = prores_fdct_c; -#endif } |