- voutgl.m: added OpenGL provider for MacOS X Safari/mozilla plugin

- vlcshell.cpp: make opengl the default video output module for macosx
- vlc.r: remove Quicktime mimetype from supported list
- configure.ac: the OpenGL provider requires the AGL framework

configure.ac

@@ -4752,11 +4752,11 @@ AC_ARG_ENABLE(macosx,
   [if test "${enable_macosx}" = "yes"
    then
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
    )])
 CFLAGS=$ORIGCFLAGS
 

modules/gui/macosx/voutgl.m

@@ -41,6 +41,8 @@
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 
+#include <AGL/agl.h>
+
 /*****************************************************************************
  * VLCView interface
  *****************************************************************************/
@@ -61,6 +63,12 @@ struct vout_sys_t
     NSRect              s_frame;
     vlc_bool_t          b_got_frame;
     vlc_mutex_t         lock;
+    /* Mozilla plugin-related variables */
+    vlc_bool_t          b_embedded;
+    AGLContext          agl_ctx;
+    AGLDrawable         agl_drawable;
+    int                 i_offx, i_offy;
+    int                 i_width, i_height;
 };
 
 /*****************************************************************************
@@ -75,9 +83,18 @@ static void Swap   ( vout_thread_t * p_vout );
 static int  Lock   ( vout_thread_t * p_vout );
 static void Unlock ( vout_thread_t * p_vout );
 
+static int  aglInit   ( vout_thread_t * p_vout );
+static void aglEnd    ( vout_thread_t * p_vout );
+static int  aglManage ( vout_thread_t * p_vout );
+static void aglSwap   ( vout_thread_t * p_vout );
+
+static int DrawableRedraw( vlc_object_t *p_this, const char *psz_name,
+    vlc_value_t oval, vlc_value_t nval, void *param);
+
 int E_(OpenVideoGL)  ( vlc_object_t * p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *) p_this;
+    vlc_value_t value_drawable;
 
     if( !CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ) )
     {
@@ -96,30 +113,91 @@ int E_(OpenVideoGL)  ( vlc_object_t * p_this )
 
     memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
 
-    p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
     vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
 
-    /* Create the GL view */
-    p_vout->p_sys->o_glview = [[VLCGLView alloc] initWithVout: p_vout];
-    [p_vout->p_sys->o_glview autorelease];
-
-    /* Spawn the window */
-
-    if( !(p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
-                    subView: p_vout->p_sys->o_glview frame: nil]) )
+    var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+    if( value_drawable.i_int != 0 )
     {
-        return VLC_EGENERIC;
+        static const GLint ATTRIBUTES[] = { 
+            AGL_WINDOW,
+            AGL_RGBA,
+            AGL_NO_RECOVERY,
+            AGL_ACCELERATED,
+            AGL_DOUBLEBUFFER,
+            AGL_RED_SIZE,   8,
+            AGL_GREEN_SIZE, 8,
+            AGL_BLUE_SIZE,  8,
+            AGL_ALPHA_SIZE, 8,
+            AGL_DEPTH_SIZE, 24,
+            AGL_NONE };
+
+        AGLDevice screen;
+        AGLPixelFormat pixFormat;
+
+        p_vout->p_sys->b_embedded = VLC_TRUE;
+
+        screen = GetGWorldDevice((CGrafPtr)value_drawable.i_int);
+        if( NULL == screen )
+        {
+            msg_Err( p_vout, "can't find screen device for drawable" );
+            return VLC_EGENERIC;
+        }
+        
+        pixFormat = aglChoosePixelFormat(&screen, 1, ATTRIBUTES);
+        if( NULL == pixFormat )
+        {
+            msg_Err( p_vout, "no screen renderer available for required attributes." );
+            return VLC_EGENERIC;
+        }
+        
+        p_vout->p_sys->agl_ctx = aglCreateContext(pixFormat, NULL);
+        aglDestroyPixelFormat(pixFormat);
+        if( NULL == p_vout->p_sys->agl_ctx )
+        {
+            msg_Err( p_vout, "cannot create AGL context." );
+            return VLC_EGENERIC;
+        }
+        else {
+            // tell opengl to sync buffer swap with vertical retrace
+            GLint param = 1;
+            aglSetInteger(p_vout->p_sys->agl_ctx, AGL_SWAP_INTERVAL, &param);
+            aglEnable(p_vout->p_sys->agl_ctx, AGL_SWAP_INTERVAL);
+        }
+
+        p_vout->pf_init             = aglInit;
+        p_vout->pf_end              = aglEnd;
+        p_vout->pf_manage           = aglManage;
+        p_vout->pf_control          = NULL;
+        p_vout->pf_swap             = aglSwap;
+        p_vout->pf_lock             = Lock;
+        p_vout->pf_unlock           = Unlock;
     }
+    else
+    {
+        p_vout->p_sys->b_embedded = VLC_FALSE;
 
-    p_vout->p_sys->b_got_frame = VLC_FALSE;
+        p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
+
+        /* Create the GL view */
+        p_vout->p_sys->o_glview = [[VLCGLView alloc] initWithVout: p_vout];
+        [p_vout->p_sys->o_glview autorelease];
 
-    p_vout->pf_init   = Init;
-    p_vout->pf_end    = End;
-    p_vout->pf_manage = Manage;
-    p_vout->pf_control= Control;
-    p_vout->pf_swap   = Swap;
-    p_vout->pf_lock   = Lock;
-    p_vout->pf_unlock = Unlock;
+        /* Spawn the window */
+
+        if( !(p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
+                        subView: p_vout->p_sys->o_glview frame: nil]) )
+        {
+            return VLC_EGENERIC;
+        }
+        p_vout->pf_init   = Init;
+        p_vout->pf_end    = End;
+        p_vout->pf_manage = Manage;
+        p_vout->pf_control= Control;
+        p_vout->pf_swap   = Swap;
+        p_vout->pf_lock   = Lock;
+        p_vout->pf_unlock = Unlock;
+    }
+    p_vout->p_sys->b_got_frame = VLC_FALSE;
 
     return VLC_SUCCESS;
 }
@@ -127,14 +205,22 @@ int E_(OpenVideoGL)  ( vlc_object_t * p_this )
 void E_(CloseVideoGL) ( vlc_object_t * p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *) p_this;
-    NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+    if( p_vout->p_sys->b_embedded )
+    {
+        var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+        aglDestroyContext(p_vout->p_sys->agl_ctx);
+    }
+    else
+    {
+        NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
 
-    /* Close the window */
-    [p_vout->p_sys->o_vout_view closeVout];
+        /* Close the window */
+        [p_vout->p_sys->o_vout_view closeVout];
 
+        [o_pool release];
+    }
     /* Clean up */
     vlc_mutex_destroy( &p_vout->p_sys->lock );
-    [o_pool release];
     free( p_vout->p_sys );
 }
 
@@ -366,4 +452,179 @@ static void Unlock( vout_thread_t * p_vout )
 
 @end
 
+/*****************************************************************************
+ * embedded AGL context implementation
+ *****************************************************************************/
+
+static void UpdateEmbeddedGeometry( vout_thread_t *p_vout );
+static void aglReshape( vout_thread_t * p_vout );
+
+static int aglInit( vout_thread_t * p_vout )
+{
+    UpdateEmbeddedGeometry(p_vout);
+    var_AddCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+
+    aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+    return VLC_SUCCESS;
+}
+
+static void aglEnd( vout_thread_t * p_vout )
+{
+    aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+}
+
+static void aglReshape( vout_thread_t * p_vout )
+{
+    int x, y;
+    vlc_value_t val;
+    int i_offx   = p_vout->p_sys->i_offx;
+    int i_offy   = p_vout->p_sys->i_offy;
+    int i_height = p_vout->p_sys->i_height;
+    int i_width  = p_vout->p_sys->i_width;
+
+    Lock( p_vout );
+
+    aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+
+    var_Get( p_vout, "macosx-stretch", &val );
+    if( val.b_bool )
+    {
+        x = i_width;
+        y = i_height;
+    }
+    else if( i_height * p_vout->fmt_in.i_visible_width *
+             p_vout->fmt_in.i_sar_num <
+             i_width * p_vout->fmt_in.i_visible_height *
+             p_vout->fmt_in.i_sar_den )
+    {
+        x = ( i_height * p_vout->fmt_in.i_visible_width *
+              p_vout->fmt_in.i_sar_num ) /
+            ( p_vout->fmt_in.i_visible_height * p_vout->fmt_in.i_sar_den);
+
+        y = i_height;
+    }
+    else
+    {
+        x = i_width;
+        y = ( i_width * p_vout->fmt_in.i_visible_height *
+              p_vout->fmt_in.i_sar_den) /
+            ( p_vout->fmt_in.i_visible_width * p_vout->fmt_in.i_sar_num  );
+    }
+
+    glViewport( i_offx+( i_width - x ) / 2,
+                i_offy+( i_height - y ) / 2, x, y );
+
+    if( p_vout->p_sys->b_got_frame )
+    {
+        /* Ask the opengl module to redraw */
+        vout_thread_t * p_parent;
+        p_parent = (vout_thread_t *) p_vout->p_parent;
+        Unlock( p_vout );
+        if( p_parent && p_parent->pf_display )
+        {
+            p_parent->pf_display( p_parent, NULL );
+        }
+    }
+    else
+    {
+        glClear( GL_COLOR_BUFFER_BIT );
+        Unlock( p_vout );
+    }
+}
+
+static int aglManage( vout_thread_t * p_vout )
+{
+    if( p_vout->i_changes & VOUT_ASPECT_CHANGE )
+    {
+        aglReshape(p_vout);
+        p_vout->i_changes &= ~VOUT_ASPECT_CHANGE;
+    }
+    if( p_vout->i_changes & VOUT_CROP_CHANGE )
+    {
+        aglReshape(p_vout);
+        p_vout->i_changes &= ~VOUT_CROP_CHANGE;
+    }
+    return VLC_SUCCESS;
+}
+
+static void aglSwap( vout_thread_t * p_vout )
+{
+    p_vout->p_sys->b_got_frame = VLC_TRUE;
+    aglSwapBuffers(p_vout->p_sys->agl_ctx);
+}
+
+static void UpdateEmbeddedGeometry( vout_thread_t *p_vout )
+{
+    vlc_value_t val;
+    vlc_value_t valt, vall, valb, valr, valx, valy, valw, valh,
+                valportx, valporty;
+
+    Rect winBounds;    
+    Rect clientBounds;
+    
+    GLint rect[4];
+
+    var_Get( p_vout->p_vlc, "drawable", &val );
+    var_Get( p_vout->p_vlc, "drawablet", &valt );
+    var_Get( p_vout->p_vlc, "drawablel", &vall );
+    var_Get( p_vout->p_vlc, "drawableb", &valb );
+    var_Get( p_vout->p_vlc, "drawabler", &valr );
+    var_Get( p_vout->p_vlc, "drawablex", &valx );
+    var_Get( p_vout->p_vlc, "drawabley", &valy );
+    var_Get( p_vout->p_vlc, "drawablew", &valw );
+    var_Get( p_vout->p_vlc, "drawableh", &valh );
+    var_Get( p_vout->p_vlc, "drawableportx", &valportx );
+    var_Get( p_vout->p_vlc, "drawableporty", &valporty );
+
+    // mozilla plugin provides coordinates based on port bounds
+    // however AGL coordinates are based on window structure region
+    // and are vertically flipped
+
+    GetWindowBounds(GetWindowFromPort((CGrafPtr)val.i_int),
+        kWindowStructureRgn, &winBounds);
+    GetWindowBounds(GetWindowFromPort((CGrafPtr)val.i_int),
+        kWindowContentRgn, &clientBounds);
+
+    /* update video clipping bounds in drawable */
+    rect[0] = (clientBounds.left-winBounds.left)
+            + vall.i_int;                       // from window left edge
+    rect[1] = (winBounds.bottom-winBounds.top)
+            - (clientBounds.top-winBounds.top)
+            - valb.i_int;                       // from window bottom edge
+    rect[2] = valr.i_int-vall.i_int;            // width
+    rect[3] = valb.i_int-valt.i_int;            // height
+    aglSetInteger(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT, rect);
+    aglEnable(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT);
+
+    /* update video internal bounds in drawable */
+    p_vout->p_sys->i_offx   = -vall.i_int - valportx.i_int;
+    p_vout->p_sys->i_offy   = valb.i_int + valporty.i_int - valh.i_int; 
+    p_vout->p_sys->i_width  = valw.i_int;
+    p_vout->p_sys->i_height = valh.i_int;
+
+    if( p_vout->p_sys->agl_drawable == (AGLDrawable)val.i_int )
+    {
+        aglUpdateContext(p_vout->p_sys->agl_ctx);
+    }
+    else
+    {
+        p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
+        aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
+    }
+    aglReshape( p_vout );
+}
+
+/* If we're embedded, the application is expected to indicate a
+ * window change (move/resize/etc) via the "drawableredraw" value.
+ */
+
+static int DrawableRedraw( vlc_object_t *p_this, const char *psz_name,
+    vlc_value_t oval, vlc_value_t nval, void *param)
+{
+    vout_thread_t *p_vout = (vout_thread_t *)param;
+
+    UpdateEmbeddedGeometry( p_vout );
+
+    return VLC_SUCCESS;
+}
 

mozilla/vlc.r

@@ -13,7 +13,7 @@ data 'carb' (0)
 resource 'STR#' (126)
 {
     {
-        "Version 0.8.5, Copyright 2006, The VideoLAN Team"
+        "Version 0.8.6, Copyright 2006, The VideoLAN Team"
         "<BR><A HREF='http://www.videolan.org'>http://www.videolan.org</A>",
         "VLC Multimedia Plugin"
     };
@@ -34,7 +34,7 @@ resource 'STR#' (127)
         "MPEG-4 video",
         "MPEG-4 video",
         "AVI video",
-        "QuickTime video",
+/*        "QuickTime video", */
         "Ogg stream",
         "Ogg stream",
         "VLC plugin",
@@ -63,7 +63,7 @@ resource 'STR#' (128,"MIME Type")
         "application/mpeg4-iod", "mp4,mpg4",
         "application/mpeg4-muxcodetable", "mp4,mpg4",
         "video/x-msvideo", "avi",
-        "video/quicktime", "mov, qt",
+/*        "video/quicktime", "mov, qt", */
         "application/ogg", "ogg",
         "application/x-ogg", "ogg",
         "application/x-vlc-plugin", "vlc",

mozilla/vlcshell.cpp

@@ -82,7 +82,7 @@ static void Resize( Widget w, XtPointer closure, XEvent *event );
  * MacOS-only declarations
 ******************************************************************************/
 #ifdef XP_MACOSX
-#   define VOUT_PLUGINS "macosx,dummy"
+#   define VOUT_PLUGINS "opengl,macosx,dummy"
 #   define AOUT_PLUGINS "auhal,macosx,dummy"
 
 #endif
@@ -204,17 +204,13 @@ int16 NPP_HandleEvent( NPP instance, void * event )
         case updateEvt:
         {
             NPWindow *npwindow = p_plugin->window;
-            NP_Port *npport = (NP_Port *)(npwindow->window);
-
-            SetPort( npport->port );
-            //SetOrigin( npport->portx , npport->porty);
 
             /* draw the beautiful "No Picture" */
 
             ForeColor(blackColor);
             PenMode( patCopy );
 
-	    Rect rect;
+            Rect rect;
             rect.left = 0;
             rect.top = 0;
             rect.right = npwindow->width;
@@ -236,8 +232,12 @@ int16 NPP_HandleEvent( NPP instance, void * event )
             return true;
         case NPEventType_AdjustCursorEvent:
             return false;
-	case NPEventType_ScrollingBeginsEvent:
-	case NPEventType_ScrollingEndsEvent:
+        case NPEventType_MenuCommandEvent:
+            return false;
+        case NPEventType_ClippingChangedEvent:
+            return false;
+        case NPEventType_ScrollingBeginsEvent:
+        case NPEventType_ScrollingEndsEvent:
             return true;
         default:
             ;