diff options
| author | James Almer <jamrial@gmail.com> | 2014-11-10 17:06:08 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-11-12 14:41:45 -0300 |
| commit | 84ccc317cecf3e0feebbdec2e6c21dc9bc35d505 (patch) | |
| tree | 530647d879f141a6b9183f7bb8ee2fd4c564463b | |
| parent | 39dfe6801a3f67c2964a829b65e8e38e3cb22217 (diff) | |
| download | ffmpeg-84ccc317cecf3e0feebbdec2e6c21dc9bc35d505.tar.gz | |
x86/flacdsp: separate decoder and encoder dsp initialization
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/x86/flacdsp_init.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libavcodec/x86/flacdsp_init.c b/libavcodec/x86/flacdsp_init.c index ad88e5bbd1..33b31f12e4 100644 --- a/libavcodec/x86/flacdsp_init.c +++ b/libavcodec/x86/flacdsp_init.c @@ -35,15 +35,22 @@ av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, #if HAVE_YASM int cpu_flags = av_get_cpu_flags(); +#if CONFIG_FLAC_DECODER if (EXTERNAL_SSE4(cpu_flags)) { - if (bps > 16 && CONFIG_FLAC_DECODER) + if (bps > 16) c->lpc = ff_flac_lpc_32_sse4; - if (bps == 16 && CONFIG_FLAC_ENCODER && CONFIG_GPL) - c->lpc_encode = ff_flac_enc_lpc_16_sse4; } if (EXTERNAL_XOP(cpu_flags)) { - if (bps > 16 && CONFIG_FLAC_DECODER) + if (bps > 16) c->lpc = ff_flac_lpc_32_xop; } #endif + +#if CONFIG_FLAC_ENCODER + if (EXTERNAL_SSE4(cpu_flags)) { + if (CONFIG_GPL && bps == 16) + c->lpc_encode = ff_flac_enc_lpc_16_sse4; + } +#endif +#endif /* HAVE_YASM */ } |