Fix slice params for interlaced video am: 2c9d67ffaf am: b70297ef4b am: 4abe7805da
am: 64e6a63272
* commit '64e6a632724d5420509a7e32be6961ad3918df87':
Fix slice params for interlaced video
Change-Id: I0aeefd91593569f95101c73e5830ed976e94f584
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c
index 7c4305b..493258c 100644
--- a/decoder/ih264d_dpb_mgr.c
+++ b/decoder/ih264d_dpb_mgr.c
@@ -17,9 +17,10 @@
*****************************************************************************
* Originally developed and contributed by Ittiam Systems Pvt. Ltd, Bangalore
*/
+#ifdef __ANDROID__
#include "log/log.h"
#include <cutils/log.h>
-
+#endif
#include "ih264_typedefs.h"
#include "ih264_macros.h"
#include "ih264_platform_macros.h"
@@ -877,8 +878,10 @@
{
if (j >= MAX_REF_BUFS)
{
+#ifdef __ANDROID__
ALOGE("b/25818142");
android_errorWriteLog(0x534e4554, "25818142");
+#endif
ps_dpb_cmds->u1_num_of_commands = 0;
return -1;
}
diff --git a/test/decoder.mk b/test/decoder.mk
index 1a49a92..0dda948 100644
--- a/test/decoder.mk
+++ b/test/decoder.mk
@@ -9,5 +9,5 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/decoder/
LOCAL_SRC_FILES := decoder/main.c
LOCAL_STATIC_LIBRARIES := libavcdec
-
+LOCAL_SHARED_LIBRARIES := liblog
include $(BUILD_EXECUTABLE)