generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/x86/hevcdsp_init: fix SSE4 checks

Browse Source 
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-06 18:27:49 +02:00
parent 7be230b5fa
commit fc7d0d8201
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/x86/hevcdsp_init.c
View File

@ -346,11 +346,7 @@ void ff_hevcdsp_init_x86(HEVCDSPContext *c, const int bit_depth)
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
if (bit_depth == 8) { if (bit_depth == 8) {
if (EXTERNAL_MMX(mm_flags)) { if (EXTERNAL_SSE4(mm_flags) && ARCH_X86_64) {
if (EXTERNAL_MMXEXT(mm_flags)) {
if (EXTERNAL_SSSE3(mm_flags) && ARCH_X86_64) {
EPEL_LINKS(c->put_hevc_epel, 0, 0, pel_pixels, 8); EPEL_LINKS(c->put_hevc_epel, 0, 0, pel_pixels, 8);
EPEL_LINKS(c->put_hevc_epel, 0, 1, epel_h, 8); EPEL_LINKS(c->put_hevc_epel, 0, 1, epel_h, 8);
@ -363,13 +359,8 @@ void ff_hevcdsp_init_x86(HEVCDSPContext *c, const int bit_depth)
QPEL_LINKS(c->put_hevc_qpel, 1, 1, qpel_hv, 8); QPEL_LINKS(c->put_hevc_qpel, 1, 1, qpel_hv, 8);
} }
}
}
} else if (bit_depth == 10) { } else if (bit_depth == 10) {
if (EXTERNAL_MMX(mm_flags)) { if (EXTERNAL_SSE4(mm_flags) && ARCH_X86_64) {
if (EXTERNAL_MMXEXT(mm_flags) && ARCH_X86_64) {
if (EXTERNAL_SSSE3(mm_flags)) {
EPEL_LINKS(c->put_hevc_epel, 0, 0, pel_pixels, 10); EPEL_LINKS(c->put_hevc_epel, 0, 0, pel_pixels, 10);
EPEL_LINKS(c->put_hevc_epel, 0, 1, epel_h, 10); EPEL_LINKS(c->put_hevc_epel, 0, 1, epel_h, 10);
@ -381,8 +372,5 @@ void ff_hevcdsp_init_x86(HEVCDSPContext *c, const int bit_depth)
QPEL_LINKS(c->put_hevc_qpel, 1, 0, qpel_v, 10); QPEL_LINKS(c->put_hevc_qpel, 1, 0, qpel_v, 10);
QPEL_LINKS(c->put_hevc_qpel, 1, 1, qpel_hv, 10); QPEL_LINKS(c->put_hevc_qpel, 1, 1, qpel_hv, 10);
} }
}
}
} }
} }