aboutsummaryrefslogtreecommitdiffstats
path: root/videocodec
diff options
context:
space:
mode:
authorThierry Strudel <thierry.strudel@intel.com>2014-07-16 00:27:52 -0700
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:02:59 -0700
commit26a110c2a29667599733db5173a751e670b366a5 (patch)
tree52bf51f6adde9450b4611b432491747d592fbfff /videocodec
parentd06de36eb079130c029eb590dd56d600266cb7f2 (diff)
downloadandroid_hardware_intel_common_omx-components-26a110c2a29667599733db5173a751e670b366a5.tar.gz
android_hardware_intel_common_omx-components-26a110c2a29667599733db5173a751e670b366a5.tar.bz2
android_hardware_intel_common_omx-components-26a110c2a29667599733db5173a751e670b366a5.zip
Fix build for AOSP/L
BZ: 209178 Change-Id: I93cb3a3b69662688041ccfac4ebd26d911dc2971 Signed-off-by: Thierry Strudel <thierry.strudel@intel.com> Reviewed-on: https://android.intel.com/218914 Reviewed-by: Imberton, Guilhem <guilhem.imberton@intel.com> Tested-by: Imberton, Guilhem <guilhem.imberton@intel.com>
Diffstat (limited to 'videocodec')
-rw-r--r--videocodec/OMXComponentCodecBase.cpp2
-rw-r--r--videocodec/OMXVideoDecoderAVC.cpp2
-rw-r--r--videocodec/OMXVideoDecoderBase.cpp2
-rw-r--r--videocodec/OMXVideoDecoderH263.cpp2
-rw-r--r--videocodec/OMXVideoDecoderMPEG4.cpp2
-rw-r--r--videocodec/OMXVideoDecoderPAVC.cpp2
-rw-r--r--videocodec/OMXVideoDecoderVP8.cpp2
-rw-r--r--videocodec/OMXVideoDecoderWMV.cpp2
-rw-r--r--videocodec/OMXVideoEncoderBase.cpp2
-rw-r--r--videocodec/OMXVideoEncoderBase.h10
-rw-r--r--videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp2
-rw-r--r--videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp2
-rw-r--r--videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp2
-rwxr-xr-xvideocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp2
-rw-r--r--videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp2
15 files changed, 20 insertions, 18 deletions
diff --git a/videocodec/OMXComponentCodecBase.cpp b/videocodec/OMXComponentCodecBase.cpp
index 3b4e40e..4676b7e 100644
--- a/videocodec/OMXComponentCodecBase.cpp
+++ b/videocodec/OMXComponentCodecBase.cpp
@@ -16,7 +16,7 @@
#define LOG_NDEBUG 1
#define LOG_TAG "OMXComponentCodecBase"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXComponentCodecBase.h"
diff --git a/videocodec/OMXVideoDecoderAVC.cpp b/videocodec/OMXVideoDecoderAVC.cpp
index 875afd8..09a01ee 100644
--- a/videocodec/OMXVideoDecoderAVC.cpp
+++ b/videocodec/OMXVideoDecoderAVC.cpp
@@ -17,7 +17,7 @@
// #define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderAVC.h"
diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp
index 7766e42..c58f72d 100644
--- a/videocodec/OMXVideoDecoderBase.cpp
+++ b/videocodec/OMXVideoDecoderBase.cpp
@@ -16,7 +16,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderBase.h"
#include <va/va_android.h>
diff --git a/videocodec/OMXVideoDecoderH263.cpp b/videocodec/OMXVideoDecoderH263.cpp
index d1c66b1..7cec2ef 100644
--- a/videocodec/OMXVideoDecoderH263.cpp
+++ b/videocodec/OMXVideoDecoderH263.cpp
@@ -17,7 +17,7 @@
// #define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderH263.h"
// Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
diff --git a/videocodec/OMXVideoDecoderMPEG4.cpp b/videocodec/OMXVideoDecoderMPEG4.cpp
index ee831cd..818800f 100644
--- a/videocodec/OMXVideoDecoderMPEG4.cpp
+++ b/videocodec/OMXVideoDecoderMPEG4.cpp
@@ -17,7 +17,7 @@
// #define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderMPEG4.h"
// Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
diff --git a/videocodec/OMXVideoDecoderPAVC.cpp b/videocodec/OMXVideoDecoderPAVC.cpp
index a2cf08e..69584d0 100644
--- a/videocodec/OMXVideoDecoderPAVC.cpp
+++ b/videocodec/OMXVideoDecoderPAVC.cpp
@@ -17,7 +17,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderPAVC.h"
// Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
diff --git a/videocodec/OMXVideoDecoderVP8.cpp b/videocodec/OMXVideoDecoderVP8.cpp
index 16343a8..80fd5ac 100644
--- a/videocodec/OMXVideoDecoderVP8.cpp
+++ b/videocodec/OMXVideoDecoderVP8.cpp
@@ -17,7 +17,7 @@
// #define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderVP8.h"
// Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
diff --git a/videocodec/OMXVideoDecoderWMV.cpp b/videocodec/OMXVideoDecoderWMV.cpp
index f2e1e6b..7db5f38 100644
--- a/videocodec/OMXVideoDecoderWMV.cpp
+++ b/videocodec/OMXVideoDecoderWMV.cpp
@@ -17,7 +17,7 @@
// #define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderWMV.h"
// Be sure to have an equal string in VideoDecoderHost.cpp (libmix)
diff --git a/videocodec/OMXVideoEncoderBase.cpp b/videocodec/OMXVideoEncoderBase.cpp
index a2c2a4a..a8771a0 100644
--- a/videocodec/OMXVideoEncoderBase.cpp
+++ b/videocodec/OMXVideoEncoderBase.cpp
@@ -19,7 +19,7 @@
#include "OMXVideoEncoderBase.h"
#include "IntelMetadataBuffer.h"
#include <cutils/properties.h>
-#include <cutils/log.h>
+#include <wrs_omxil_core/log.h>
static const char *RAW_MIME_TYPE = "video/raw";
diff --git a/videocodec/OMXVideoEncoderBase.h b/videocodec/OMXVideoEncoderBase.h
index 65717c4..f16b0a3 100644
--- a/videocodec/OMXVideoEncoderBase.h
+++ b/videocodec/OMXVideoEncoderBase.h
@@ -24,10 +24,12 @@
#include <va/va_android.h>
#include <VideoEncoderHost.h>
-#define LOGV(...) LOGI_IF(mOmxLogLevel, __VA_ARGS__)
-#define LOGI(...) LOGI_IF(mOmxLogLevel, __VA_ARGS__)
-#define LOGW(...) LOGI_IF(mOmxLogLevel, __VA_ARGS__)
-#define LOGD(...) LOGI_IF(mOmxLogLevel, __VA_ARGS__)
+#define LOGV(...) ALOGI_IF(mOmxLogLevel, __VA_ARGS__)
+#define LOGI(...) ALOGI_IF(mOmxLogLevel, __VA_ARGS__)
+#define LOGW(...) ALOGI_IF(mOmxLogLevel, __VA_ARGS__)
+#define LOGD(...) ALOGI_IF(mOmxLogLevel, __VA_ARGS__)
+#define LOGE ALOGE
+#define LOGV_IF ALOGV_IF
using android::sp;
diff --git a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp
index 4df4aa6..9543b28 100644
--- a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp
@@ -16,7 +16,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderAVCSecure.h"
#include <time.h>
#include <signal.h>
diff --git a/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp
index c882bd1..2e2fd09 100644
--- a/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp
@@ -16,7 +16,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderAVCSecure.h"
#include <time.h>
#include <signal.h>
diff --git a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp
index 093945b..3983b46 100644
--- a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp
@@ -17,7 +17,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderAVCSecure.h"
#include <time.h>
#include <signal.h>
diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
index af5dbcd..8c810e2 100755
--- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
@@ -17,7 +17,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderAVCSecure.h"
#include <time.h>
#include <signal.h>
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
index 592b52f..bd488e7 100644
--- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
@@ -17,7 +17,7 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "OMXVideoDecoder"
-#include <utils/Log.h>
+#include <wrs_omxil_core/log.h>
#include "OMXVideoDecoderAVCSecure.h"
#include <time.h>
#include <signal.h>
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-14 15:48:19 +0000