Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfixes and makefile improvements

Browse source
This commit is contained in:
Simon Morlat 2010-11-14 19:15:27 +01:00
parent a07c80ef59
commit 4a34869d3a
7 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
libs/armeabi-v7a/liblinphone.so
View file

Binary file not shown.

BIN
libs/armeabi/liblinphone.so
View file

Binary file not shown.

1
src/org/linphone/AboutActivity.java
View file

@ -38,4 +38,5 @@ public class AboutActivity extends Activity {
Log.e(LinphoneService.TAG, "cannot get version name", e); Log.e(LinphoneService.TAG, "cannot get version name", e);
} }
} }
} }

5
src/org/linphone/core/AndroidVideoWindowImpl.java
View file

@ -28,8 +28,9 @@ public class AndroidVideoWindowImpl {
int width, int height) { int width, int height) {
synchronized(AndroidVideoWindowImpl.this){ synchronized(AndroidVideoWindowImpl.this){
mBitmap=Bitmap.createBitmap(width,height,Config.RGB_565); mBitmap=Bitmap.createBitmap(width,height,Config.RGB_565);
if (mListener!=null) mListener.onSurfaceReady(AndroidVideoWindowImpl.this);
mSurface=holder.getSurface(); mSurface=holder.getSurface();
if (mListener!=null) mListener.onSurfaceReady(AndroidVideoWindowImpl.this);
} }
} }
@ -38,10 +39,10 @@ public class AndroidVideoWindowImpl {
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
synchronized(AndroidVideoWindowImpl.this){ synchronized(AndroidVideoWindowImpl.this){
mBitmap=null;
if (mListener!=null) if (mListener!=null)
mListener.onSurfaceDestroyed(AndroidVideoWindowImpl.this); mListener.onSurfaceDestroyed(AndroidVideoWindowImpl.this);
mSurface=null; mSurface=null;
mBitmap=null;
} }
} }
}); });

2
submodules/externals/build/ffmpeg/Android_libavcodec.mk vendored
View file

@ -87,6 +87,8 @@ LOCAL_SRC_FILES = \
libavcodec/pthread.c libavcodec/pthread.c
LOCAL_ARM_MODE := arm
#LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm #LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H

2
submodules/externals/build/ffmpeg/Android_libavutil.mk vendored
View file

@ -37,7 +37,7 @@ LOCAL_SRC_FILES = \
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
LOCAL_ARM_MODE := arm
#for including config.h: #for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/

3
submodules/externals/build/ffmpeg/Android_libswscale.mk vendored
View file

@ -13,10 +13,13 @@ LOCAL_SRC_FILES = \
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
LOCAL_ARM_MODE := arm
#for including config.h: #for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg \
$(LOCAL_PATH)/../ffmpeg \ $(LOCAL_PATH)/../ffmpeg \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/../ $(LOCAL_PATH)/../
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)