Changeset 1193:58278fd087fd in mediastreamer2

Timestamp:

Nov 12, 2010 2:12:28 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

rework msandroiddisplay filter to be included statically

Files:

• build/android/Android.mk (modified) (2 diffs)
• src/android-display.c (modified) (5 diffs)
• src/mscommon.c (modified) (2 diffs)

build/android/Android.mk

@@ -109 +109 @@
         rfc3984.c \
         mire.c \
-        videostream.c 
+        videostream.c \
+        layouts.c \
+        android-display.c
 
 endif
@@ -152 +154 @@
 
 
-
 include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := msandroiddisplay
-
-LOCAL_SRC_FILES := android-display.c
-
-LOCAL_C_INCLUDES += \
-        $(MEDIASTREAMER2_INCLUDES)
-
-LOCAL_CFLAGS += \
-        -UHAVE_CONFIG_H \
-        -include $(LOCAL_PATH)/../build/android/libmediastreamer2_AndroidConfig.h \
-        -D_POSIX_SOURCE
-
-LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
-
-include $(BUILD_SHARED_LIBRARY)
 
 
 
+

src/android-display.c

@@ -25 +25 @@
 #include <android/bitmap.h>
 #include <jni.h>
+#include <dlfcn.h>
 
 /*defined in msandroid.cpp*/
@@ -41 +42 @@
 }AndroidDisplay;
 
+
+static int (*sym_AndroidBitmap_getInfo)(JNIEnv *env,jobject bitmap, AndroidBitmapInfo *bmpinfo)=NULL;
+static int (*sym_AndroidBitmap_lockPixels)(JNIEnv *env, jobject bitmap, void **pixels)=NULL;
+static int (*sym_AndroidBitmap_unlockPixels)(JNIEnv *env, jobject bitmap)=NULL;
+
 static void android_display_init(MSFilter *f){
         AndroidDisplay *ad=(AndroidDisplay*)ms_new0(AndroidDisplay,1);
@@ -116 +122 @@
                                         }
                                 }
-                                if (AndroidBitmap_lockPixels(ad->jenv,ad->jbitmap,&pixels)==0){
+                                if (sym_AndroidBitmap_lockPixels(ad->jenv,ad->jbitmap,&pixels)==0){
                                         dest.planes[0]=(uint8_t*)pixels+(vrect.y*ad->bmpinfo.stride)+(vrect.x*2);
                                         dest.strides[0]=ad->bmpinfo.stride;
                                         ms_sws_scale (ad->sws,pic.planes,pic.strides,0,pic.h,dest.planes,dest.strides);
-                                        AndroidBitmap_unlockPixels(ad->jenv,ad->jbitmap);
+                                        sym_AndroidBitmap_unlockPixels(ad->jenv,ad->jbitmap);
                                 }else{
                                         ms_error("AndroidBitmap_lockPixels() failed !");
@@ -151 +157 @@
         ad->jbitmap=(*jenv)->CallObjectMethod(jenv,window,ad->get_bitmap_id);
         ad->android_video_window=window;
-        err=AndroidBitmap_getInfo(jenv,ad->jbitmap,&ad->bmpinfo);
+        err=sym_AndroidBitmap_getInfo(jenv,ad->jbitmap,&ad->bmpinfo);
         if (err!=0){
                 ms_error("AndroidBitmap_getInfo() failed.");
@@ -182 +188 @@
 
 void libmsandroiddisplay_init(void){
-        ms_filter_register(&ms_android_display_desc);
-}
-
-
+        /*See if we can use AndroidBitmap_* symbols (only since android 2.2 normally)*/
+        void *handle=dlopen("libjnigraphics.so",RTLD_LAZY);
+        if (handle!=NULL){
+                sym_AndroidBitmap_getInfo=dlsym(handle,"AndroidBitmap_getInfo");
+                sym_AndroidBitmap_lockPixels=dlsym(handle,"AndroidBitmap_lockPixels");
+                sym_AndroidBitmap_unlockPixels=dlsym(handle,"AndroidBitmap_unlockPixels");
+
+                if (sym_AndroidBitmap_getInfo==NULL || sym_AndroidBitmap_lockPixels==NULL
+                        || sym_AndroidBitmap_unlockPixels==NULL){
+                        ms_warning("AndroidBitmap not available.");
+                }else{
+                        ms_filter_register(&ms_android_display_desc);
+                        ms_message("MSAndroidDisplay registered.");
+                }
+        }else ms_warning("libjnigraphics.so cannot be loaded.");
+}
+
+

src/mscommon.c

@@ -23 +23 @@
 
 extern void __register_ffmpeg_encoders_if_possible(void);
+extern void libmsandroiddisplay_init(void);
 
 #include "mediastreamer2/mscommon.h"
@@ -596 +597 @@
         ms_load_plugins(PACKAGE_PLUGINS_DIR);
 #endif
+
+#if defined(ANDROID) && defined (VIDEO_ENABLED)
+        libmsandroiddisplay_init();
+#endif
         ms_message("ms_init() done");
 }