X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvoutgl.m;h=f8b9033e00d9a649180aec8980d07420d5719263;hb=5d09f6000a0b589d63e1fc9c6af4e5b055658203;hp=d4e468be7ca72ce32ae13e40cd690f39c8adb3c4;hpb=5262517960b2dcba585fe669fc1b340a9174eef8;p=vlc diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index d4e468be7c..f8b9033e00 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -41,6 +41,8 @@ #include #include +#include + /***************************************************************************** * 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,13 +83,23 @@ 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 ) ) { - msg_Warn( p_vout, "no hardware acceleration" ); + msg_Warn( p_vout, "no OpenGL hardware acceleration found. " + "Video display will be slow" ); return( 1 ); } msg_Dbg( p_vout, "display is Quartz Extreme accelerated" ); @@ -95,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, ¶m); + 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; } @@ -126,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 ); } @@ -150,6 +237,17 @@ static void End( vout_thread_t * p_vout ) static int Manage( vout_thread_t * p_vout ) { + if( p_vout->i_changes & VOUT_ASPECT_CHANGE ) + { + [p_vout->p_sys->o_glview reshape]; + p_vout->i_changes &= ~VOUT_ASPECT_CHANGE; + } + if( p_vout->i_changes & VOUT_CROP_CHANGE ) + { + [p_vout->p_sys->o_glview reshape]; + p_vout->i_changes &= ~VOUT_CROP_CHANGE; + } + if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) { NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; @@ -191,6 +289,7 @@ static int Manage( vout_thread_t * p_vout ) p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; } + [p_vout->p_sys->o_vout_view manage]; return VLC_SUCCESS; } @@ -259,7 +358,7 @@ static void Unlock( vout_thread_t * p_vout ) if( !fmt ) { - msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" ); + msg_Warn( p_vout, "could not create OpenGL video output" ); return nil; } @@ -294,16 +393,23 @@ static void Unlock( vout_thread_t * p_vout ) x = bounds.size.width; y = bounds.size.height; } - else if( bounds.size.height * p_vout->render.i_aspect < - bounds.size.width * VOUT_ASPECT_FACTOR ) + else if( bounds.size.height * p_vout->fmt_in.i_visible_width * + p_vout->fmt_in.i_sar_num < + bounds.size.width * p_vout->fmt_in.i_visible_height * + p_vout->fmt_in.i_sar_den ) { - x = bounds.size.height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; + x = ( bounds.size.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 = bounds.size.height; } else { x = bounds.size.width; - y = bounds.size.width * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect; + y = ( bounds.size.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( ( bounds.size.width - x ) / 2, @@ -346,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(NULL); +} + +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; +}