From 5a20ed36e654a8721f4e67743e2a75f99c52a7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1ri=20Tristan=20Helgason?= Date: Thu, 15 Sep 2016 10:56:19 +0200 Subject: [PATCH] Fix undefined reference to log2 on android R=nisse@webrtc.org TBR=sakal@webrtc.org, sprang@webrtc.org Review URL: https://codereview.webrtc.org/2341433004 . Cr-Commit-Position: refs/heads/master@{#14225} --- webrtc/modules/video_coding/utility/quality_scaler.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/video_coding/utility/quality_scaler.cc b/webrtc/modules/video_coding/utility/quality_scaler.cc index 99bc6dad22..7ef7c575ba 100644 --- a/webrtc/modules/video_coding/utility/quality_scaler.cc +++ b/webrtc/modules/video_coding/utility/quality_scaler.cc @@ -10,8 +10,15 @@ #include "webrtc/modules/video_coding/utility/quality_scaler.h" +#include + #include -#include + +// TODO(kthelgason): Some versions of Android have issues with log2. +// See https://code.google.com/p/android/issues/detail?id=212634 for details +#if defined(WEBRTC_ANDROID) +#define log2(x) (log(x) / log(2)) +#endif namespace webrtc { @@ -182,7 +189,7 @@ void QualityScaler::UpdateTargetResolution(int width, int height) { maximum_shift_ = 0; } else { maximum_shift_ = static_cast( - std::log2(std::min(width, height) / kMinDownscaleDimension)); + log2(std::min(width, height) / kMinDownscaleDimension)); } target_res_ = Resolution{width, height}; }