Commit ae940133 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Move libopus SSE4.1 source into the SSE4.1 block.

BUG=webrtc:9530
TEST=cq
R=sergeyu

Change-Id: I7c007d4dfd12aa86a56fccaef176d614531533c2
Reviewed-on: https://chromium-review.googlesource.com/c/1327151Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606579}
parent b884937f
...@@ -39,7 +39,7 @@ config("opus_private_config") { ...@@ -39,7 +39,7 @@ config("opus_private_config") {
# Prefer alloca() over variable length arrays which are often inefficient; # Prefer alloca() over variable length arrays which are often inefficient;
# the opus code will automatically handle this correctly per-platform. # the opus code will automatically handle this correctly per-platform.
"USE_ALLOCA", "USE_ALLOCA",
"HAVE_ALLOCA_H" "HAVE_ALLOCA_H",
] ]
include_dirs = [ include_dirs = [
...@@ -51,9 +51,7 @@ config("opus_private_config") { ...@@ -51,9 +51,7 @@ config("opus_private_config") {
cflags = [] cflags = []
if (is_win) { if (is_win) {
defines += [ defines += [ "inline=__inline" ]
"inline=__inline",
]
cflags += [ cflags += [
"/wd4305", # Disable truncation warning in celt/pitch.c . "/wd4305", # Disable truncation warning in celt/pitch.c .
...@@ -171,6 +169,7 @@ if (use_opus_x86_optimization) { ...@@ -171,6 +169,7 @@ if (use_opus_x86_optimization) {
"src/celt/x86/pitch_sse4_1.c", "src/celt/x86/pitch_sse4_1.c",
"src/silk/x86/NSQ_del_dec_sse.c", "src/silk/x86/NSQ_del_dec_sse.c",
"src/silk/x86/NSQ_sse.c", "src/silk/x86/NSQ_sse.c",
"src/silk/x86/VAD_sse.c",
] ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
...@@ -384,7 +383,6 @@ static_library("opus") { ...@@ -384,7 +383,6 @@ static_library("opus") {
"src/celt/x86/x86cpu.c", "src/celt/x86/x86cpu.c",
"src/celt/x86/x86cpu.h", "src/celt/x86/x86cpu.h",
"src/silk/x86/SigProc_FIX_sse.h", "src/silk/x86/SigProc_FIX_sse.h",
"src/silk/x86/VAD_sse.c",
"src/silk/x86/main_sse.h", "src/silk/x86/main_sse.h",
"src/silk/x86/x86_silk_map.c", "src/silk/x86/x86_silk_map.c",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment