Changeset 1382:d90a390c781b in mediastreamer2

Timestamp:

May 6, 2011 1:40:08 PM (2 years ago)

Author:

Guillaume Beraudo <guillaume.beraudo@…>

Branch:

default

Message:

Fix bad locking style. Fix crash on resize on Mac?

File:

• src/videoout.c (modified) (3 diffs)

src/videoout.c

@@ -654 +654 @@
 }
 
-static void poll_for_resizing_lock_filter_and_enventually_prepare(MSFilter *f) {
-        VideoOut *obj=(VideoOut*)f->data;
+static void poll_for_resizing(MSFilter *f) {
         int i;
-
         for(i=0;i<100;++i){
                 int ret = _video_out_handle_resizing(f, NULL);
-                if (ret<0)
-                        break;
-        }
-        ms_filter_lock(f);
-        if (!obj->ready) video_out_prepare(f);
+                if (ret<0) break;
+        }
 }
 
@@ -672 +667 @@
         MSFilter *f = (MSFilter *) info;
         VideoOut *obj=(VideoOut*)f->data;
-        poll_for_resizing_lock_filter_and_enventually_prepare(f);
+        poll_for_resizing(f);
+        ms_filter_lock(f);
+        if (!obj->ready) video_out_prepare(f);
 
         if (obj->need_update) {
@@ -724 +721 @@
         int update_selfview=0;
 
-#ifndef __APPLE__
-        poll_for_resizing_lock_filter_and_enventually_prepare(f);
+#ifdef __APPLE__
+        ms_filter_lock(f);
+#else
+        poll_for_resizing(f);
+        ms_filter_lock(f);
+        if (!obj->ready) video_out_prepare(f);
 #endif
         if (!obj->ready){