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

Clean up ANDROID macro definitions [video_render]

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/95004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@254 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com 2011-07-26 05:03:10 +00:00
parent 0e07d82f47
commit 03bc96d69a
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/modules/video_render/main/source/Android.mk
View File

@ -14,8 +14,8 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := libwebrtc_video_render LOCAL_MODULE := libwebrtc_video_render
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_GENERATED_SOURCES := LOCAL_SRC_FILES := \
LOCAL_SRC_FILES := incoming_video_stream.cc \ incoming_video_stream.cc \
video_render_frames.cc \ video_render_frames.cc \
video_render_impl.cc \ video_render_impl.cc \
external/video_render_external_impl.cc \ external/video_render_external_impl.cc \
@ -25,40 +25,27 @@ LOCAL_SRC_FILES := incoming_video_stream.cc \
Android/video_render_opengles20.cc Android/video_render_opengles20.cc
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
MY_CFLAGS := LOCAL_CFLAGS := \
MY_CFLAGS_C := $(MY_WEBRTC_COMMON_DEFS)
MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER' \
'-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \
'-DWEBRTC_ANDROID' \
'-DANDROID'
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
# Include paths placed before CFLAGS/CPPFLAGS $(LOCAL_PATH)/Android \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/. \
$(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../../../interface \ $(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
$(LOCAL_PATH)/../../../../system_wrappers/interface \
$(LOCAL_PATH)/../../../utility/interface \
$(LOCAL_PATH)/../../../audio_coding/main/interface \ $(LOCAL_PATH)/../../../audio_coding/main/interface \
$(LOCAL_PATH)/Android $(LOCAL_PATH)/../../../interface \
$(LOCAL_PATH)/../../../utility/interface \
$(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
$(LOCAL_PATH)/../../../../system_wrappers/interface
# Flags passed to only C++ (and not C) files. # TODO(leozwang) organize shared library in a better way
LOCAL_CPPFLAGS := LOCAL_SHARED_LIBRARIES := \
libcutils \
LOCAL_LDFLAGS :=
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := libcutils \
libdl \ libdl \
libstlport libstlport
LOCAL_ADDITIONAL_DEPENDENCIES :=
ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
src/modules/video_render/main/source/video_render_impl.cc
View File

@ -39,7 +39,7 @@
#include "mac/video_render_mac_carbon_impl.h" #include "mac/video_render_mac_carbon_impl.h"
#endif #endif
#elif defined(ANDROID) #elif defined(WEBRTC_ANDROID)
#include "Android/video_render_android_impl.h" #include "Android/video_render_android_impl.h"
#include "Android/video_render_android_surface_view.h" #include "Android/video_render_android_surface_view.h"
#include "Android/video_render_android_native_opengl2.h" #include "Android/video_render_android_native_opengl2.h"
@ -99,7 +99,7 @@ void VideoRender::DestroyVideoRender(
WebRtc_Word32 VideoRender::SetAndroidObjects(void *javaVM) WebRtc_Word32 VideoRender::SetAndroidObjects(void *javaVM)
{ {
#ifdef ANDROID #ifdef WEBRTC_ANDROID
return VideoRenderAndroid::SetAndroidEnvVariables(javaVM); return VideoRenderAndroid::SetAndroidEnvVariables(javaVM);
#else #else
return -1; return -1;
@ -170,7 +170,7 @@ ModuleVideoRenderImpl::ModuleVideoRenderImpl(
break; break;
#endif #endif
#elif defined(ANDROID) #elif defined(WEBRTC_ANDROID)
case kRenderAndroid: case kRenderAndroid:
{ {
if(AndroidNativeOpenGl2Renderer::UseOpenGL2(window)) if(AndroidNativeOpenGl2Renderer::UseOpenGL2(window))
@ -298,7 +298,7 @@ ModuleVideoRenderImpl::~ModuleVideoRenderImpl()
case kRenderiPhone: case kRenderiPhone:
break; break;
#elif defined(ANDROID) #elif defined(WEBRTC_ANDROID)
case kRenderAndroid: case kRenderAndroid:
{ {
VideoRenderAndroid* ptrRenderer = reinterpret_cast<VideoRenderAndroid*> (_ptrRenderer); VideoRenderAndroid* ptrRenderer = reinterpret_cast<VideoRenderAndroid*> (_ptrRenderer);