Changeset 1198:c58e3eb1b4b9 in mediastreamer2

Timestamp:

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

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

android-display works (but does not like screen rotation !)

Location:

src

Files:

• android-display.c (modified) (3 diffs)
• nowebcam.c (modified) (1 diff)
• videostream.c (modified) (1 diff)

src/android-display.c

@@ -130 +130 @@
                                         ms_error("AndroidBitmap_lockPixels() failed !");
                                 }
-                                ms_message("Ask draw of bitmap");
                                 (*ad->jenv)->CallVoidMethod(ad->jenv,ad->android_video_window,ad->update_id);
                         }
@@ -140 +139 @@
         ms_queue_flush(f->inputs[0]);
         ms_queue_flush(f->inputs[1]);
+
+        if (ad->jenv!=NULL){
+                jint result = (*(ad->jvm))->DetachCurrentThread(ad->jvm);
+                if (result != 0) {
+                        ms_error("android_display_process(): cannot detach VM");
+                }
+                ad->jenv=NULL;
+        }
 }
 
@@ -184 +191 @@
         .preprocess=android_display_preprocess,
         .process=android_display_process,
-        .uninit=android_display_uninit
+        .uninit=android_display_uninit,
+        .methods=methods
 };
 

src/nowebcam.c

@@ -49 +49 @@
         AVPacket pkt;
         MSPicture dest;
+        AVCodec *codec=avcodec_find_decoder(CODEC_ID_MJPEG);
+
+        if (codec==NULL){
+                ms_error("Could not find MJPEG decoder in ffmpeg.");
+                return NULL;
+        }
 
         avcodec_get_context_defaults(&av_context);
-        if (avcodec_open(&av_context,avcodec_find_decoder(CODEC_ID_MJPEG))<0){
+        if (avcodec_open(&av_context,codec)<0){
                 ms_error("jpeg2yuv: avcodec_open failed");
                 return NULL;

src/videostream.c

@@ -511 +511 @@
 void video_stream_set_native_window_id(VideoStream *stream, unsigned long id){
         stream->window_id=id;
+        if (stream->output){
+                ms_filter_call_method(stream->output,MS_VIDEO_DISPLAY_SET_NATIVE_WINDOW_ID,&id);
+        }
 }