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

Fix compilation errors

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@591 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com 2011-09-13 17:16:24 +00:00
parent 803a5f2795
commit b1b3e67c97
3 changed files with 3 additions and 2 deletions
src
modules/video_capture/main/source/Android
video_capture_android.cc
video_engine/main/source
Android.mkvie_impl.cc

2
src/modules/video_capture/main/source/Android/video_capture_android.cc

@ -29,7 +29,7 @@ VideoCaptureModule* VideoCaptureImpl::Create(
RefCountImpl<videocapturemodule::VideoCaptureAndroid>* implementation =
new RefCountImpl<videocapturemodule::VideoCaptureAndroid>(id);
if (!implementation || implementation->Init(id, deviceUniqueId) != 0)
if (!implementation || implementation->Init(id, deviceUniqueIdUTF8) != 0)
{
delete implementation;
implementation = NULL;

1
src/video_engine/main/source/Android.mk

@ -64,6 +64,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../modules/udp_transport/interface \
$(LOCAL_PATH)/../../../modules/utility/interface \
$(LOCAL_PATH)/../../../modules/video_capture/main/interface \
$(LOCAL_PATH)/../../../modules/video_capture/main/source \
$(LOCAL_PATH)/../../../modules/video_coding/codecs/interface \
$(LOCAL_PATH)/../../../modules/video_coding/main/interface \
$(LOCAL_PATH)/../../../modules/video_mixer/main/interface \

2
src/video_engine/main/source/vie_impl.cc

@ -282,7 +282,7 @@ int VideoEngine::SetAndroidObjects(void* javaVM, void* javaContext)
"SetAndroidObjects()");
#ifdef WEBRTC_ANDROID
if (VideoCaptureImpl::SetAndroidObjects(javaVM,javaContext) != 0)
if (videocapturemodule::VideoCaptureImpl::SetAndroidObjects(javaVM,javaContext) != 0)
{
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo, gViEActiveInstanceCounter,
"Could not set capture module Android objects");