Changeset 1192:29ad880561b5 in mediastreamer2

Timestamp:

Nov 1, 2010 11:31:16 AM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Children:

1193:58278fd087fd, 1194:cf51505c817f

Message:

android display in progress

File:

• src/android-display.c (modified) (6 diffs)

src/android-display.c

@@ -32 +32 @@
         JavaVM *jvm;
         JNIEnv *jenv;
+        jobject android_video_window;
         jobject jbitmap;
+        jmethodID get_bitmap_id;
+        jmethodID update_id;
         AndroidBitmapInfo bmpinfo;
         struct ms_SwsContext *sws;
@@ -40 +43 @@
 static void android_display_init(MSFilter *f){
         AndroidDisplay *ad=(AndroidDisplay*)ms_new0(AndroidDisplay,1);
+        JNIEnv *jenv=NULL;
+        jclass wc;
+
         ad->jvm=ms_andsnd_jvm;
+
+        if ((*(ad->jvm))->AttachCurrentThread(ad->jvm,&jenv,NULL)!=0){
+                ms_error("Could not get JNIEnv");
+                return ;
+        }
+        wc=(*jenv)->FindClass(jenv,"org/linphone/core/AndroidVideoWindowImpl");
+        if (wc==0){
+                ms_fatal("Could not find org.linphone.core.AndroidVideoWindowImpl class !");
+        }
+        ad->get_bitmap_id=(*jenv)->GetMethodID(jenv,wc,"getBitmap", "()Landroid/graphics/Bitmap;");
+        ad->update_id=(*jenv)->GetMethodID(jenv,wc,"update","()V");
+
         MS_VIDEO_SIZE_ASSIGN(ad->vsize,CIF);
         f->data=ad;
@@ -106 +124 @@
                                         ms_error("AndroidBitmap_lockPixels() failed !");
                                 }
+                                ms_message("Ask draw of bitmap");
+                                (*ad->jenv)->CallVoidMethod(ad->jenv,ad->android_video_window,ad->update_id);
                         }
                 }
@@ -116 +136 @@
 }
 
-static int android_display_set_bitmap(MSFilter *f, void *arg){
+static int android_display_set_window(MSFilter *f, void *arg){
         AndroidDisplay *ad=(AndroidDisplay*)f->data;
         unsigned long id=*(unsigned long*)arg;
         int err;
         JNIEnv *jenv=NULL;
+        jobject window=(jobject)id;
         
         if ((*(ad->jvm))->AttachCurrentThread(ad->jvm,&jenv,NULL)!=0){
@@ -126 +147 @@
                 return -1;
         }
+        
         ms_filter_lock(f);
-        ad->jbitmap=(jobject)id;
+        ad->jbitmap=(*jenv)->CallObjectMethod(jenv,window,ad->get_bitmap_id);
+        ad->android_video_window=window;
         err=AndroidBitmap_getInfo(jenv,ad->jbitmap,&ad->bmpinfo);
         if (err!=0){
@@ -141 +164 @@
 
 static MSFilterMethod methods[]={
-        {       MS_VIDEO_DISPLAY_SET_NATIVE_WINDOW_ID , android_display_set_bitmap },
+        {       MS_VIDEO_DISPLAY_SET_NATIVE_WINDOW_ID , android_display_set_window },
         {       0, NULL}
 };