Changeset a593fa18ef93069b6152cc571561c5ccc053e67b

Timestamp:

27/08/06 18:18:59 (2 years ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1156695539 +0000

git-parent:

[faef0357a70215aed00dd680b7c430f365f2992f]

git-author:

Damien Fouilleul <damienf@videolan.org> 1156695539 +0000

Message:

all: rewrite of mozilla plugin
- added a couple of support APIs in libvlc
- retired XPCOM interface, all scripting now goes through NPObject apis
- new APIs using libvlc (roughly similar to java bindings)

Files:

• include/video_output.h (modified) (1 diff)
• include/vlc/libvlc.h (modified) (3 diffs)
• modules/gui/macosx/voutgl.m (modified) (8 diffs)
• mozilla/Makefile.am (modified) (4 diffs)
• mozilla/control/npolibvlc.cpp (added)
• mozilla/control/npolibvlc.h (added)
• mozilla/control/nporuntime.cpp (added)
• mozilla/control/nporuntime.h (added)
• mozilla/control/npovlc.cpp (added)
• mozilla/control/npovlc.h (added)
• mozilla/vlcintf.idl (deleted)
• mozilla/vlcpeer.cpp (deleted)
• mozilla/vlcpeer.h (deleted)
• mozilla/vlcplugin.cpp (modified) (1 diff)
• mozilla/vlcplugin.h (modified) (5 diffs)
• mozilla/vlcruntime.cpp (deleted)
• mozilla/vlcruntime.h (deleted)
• mozilla/vlcshell.cpp (modified) (23 diffs)
• src/control/video.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)

include/video_output.h

@@ -276 +276 @@
-    VOUT_SNAPSHOT,
-    VOUT_CLOSE,
-
+
+
-};
-

include/vlc/libvlc.h

@@ -357 +357 @@
-
-/**
-Get current mute status
+change the video output parent
- * \param p_instance libvlc instance
- * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
@@ -365 +365 @@
-int libvlc_video_reparent( libvlc_input_t *, libvlc_drawable_t, libvlc_exception_t * );
-
+/**
+ * Set the video output parent
+ * \param p_instance libvlc instance
+ * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
+ * \param p_exception an initialized exception
+ */
+void libvlc_video_set_parent( libvlc_instance_t *, libvlc_drawable_t, libvlc_exception_t * );
+
+/**
+ * Set the video output size
+ * \param p_instance libvlc instance
+ * \param width new width for video drawable
+ * \param height new height for video drawable
+ * \param p_exception an initialized exception
+ */
+void libvlc_video_set_size( libvlc_instance_t *, int, int, libvlc_exception_t * );
+
+/**
+* Downcast to this general type as placeholder for a platform specific one, such as:
+*  Drawable on X11,
+*  CGrafPort on MacOSX,
+*  HWND on win32
+*/
+typedef struct
+{
+    int top, left;
+    int bottom, right;
+}
+libvlc_rectangle_t;
+
+/**
+ * Set the video output viewport for a windowless video ouput (MacOS X only)
+ * \param p_instance libvlc instance
+ * \param view coordinates within video drawable
+ * \param clip coordinates within video drawable
+ * \param p_exception an initialized exception
+ */
+void libvlc_video_set_viewport( libvlc_instance_t *, const libvlc_rectangle_t *, const libvlc_rectangle_t *, libvlc_exception_t * );
+
-
-/** @} */
@@ -380 +419 @@
- * @{
- */
+
+/**
+ * Toggle mute status
+ * \param p_instance libvlc instance
+ * \param p_exception an initialized exception
+ * \return void
+ */
+void libvlc_audio_toggle_mute( libvlc_instance_t *, libvlc_exception_t * );
-
-/**

modules/gui/macosx/voutgl.m

@@ -87 +87 @@
-static void aglEnd    ( vout_thread_t * p_vout );
-static int  aglManage ( vout_thread_t * p_vout );
+static int  aglControl( vout_thread_t *, int, va_list );
-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 )
@@ -132 +130 @@
-            AGL_NONE };
-
-        AGLDevice screen;
-        AGLPixelFormat pixFormat;
-
-        p_vout->p_sys->b_embedded = VLC_TRUE;
-
-
-
-
-
-
-
-
-
+
-        if( NULL == pixFormat )
-        {
@@ -159 +149 @@
-        }
-        else {
-
-1
+not 
+0
-            aglSetInteger(p_vout->p_sys->agl_ctx, AGL_SWAP_INTERVAL, &param);
-            aglEnable(p_vout->p_sys->agl_ctx, AGL_SWAP_INTERVAL);
@@ -168 +158 @@
-        p_vout->pf_end              = aglEnd;
-        p_vout->pf_manage           = aglManage;
-NULL
+aglControl
-        p_vout->pf_swap             = aglSwap;
-        p_vout->pf_lock             = Lock;
@@ -208 +198 @@
-    if( p_vout->p_sys->b_embedded )
-    {
-        var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
-        aglDestroyContext(p_vout->p_sys->agl_ctx);
-    }
@@ -457 +446 @@
- *****************************************************************************/
-
-UpdateEmbeddedGeometry( vout_thread_t *p_vout
+aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBounds
-static void aglReshape( vout_thread_t * p_vout );
-
-static int aglInit( vout_thread_t * p_vout )
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    aglSetCurrentContext(p_vout->p_sys->agl_ctx);
@@ -548 +562 @@
-}
-
+static int aglControl( vout_thread_t *p_vout, int i_query, va_list args )
+{
+    switch( i_query )
+    {
+        case VOUT_SET_VIEWPORT:
+    {
+        Rect viewBounds, clipBounds;
+            viewBounds.top = va_arg( args, int);
+            viewBounds.left = va_arg( args, int);
+            viewBounds.bottom = va_arg( args, int);
+            viewBounds.right = va_arg( args, int);
+            clipBounds.top = va_arg( args, int);
+            clipBounds.left = va_arg( args, int);
+            clipBounds.bottom = va_arg( args, int);
+            clipBounds.right = va_arg( args, int);
+        aglSetViewport(p_vout, viewBounds, clipBounds);
+            return VLC_SUCCESS;
+    }
+
+        case VOUT_REPARENT:
+    {
+        AGLDrawable drawable = (AGLDrawable)va_arg( args, int);
+        if( drawable != p_vout->p_sys->agl_drawable )
+        {
+        p_vout->p_sys->agl_drawable = drawable;
+        aglSetDrawable(p_vout->p_sys->agl_ctx, drawable);
+        }
+            return VLC_SUCCESS;
+    }
+
+        default:
+            return vout_vaControlDefault( p_vout, i_query, args );
+    }
+}
+
-static void aglSwap( vout_thread_t * p_vout )
-{
@@ -554 +603 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    // mozilla plugin provides coordinates based on port bounds
-    // however AGL coordinates are based on window structure region
-    // and are vertically flipped
-
-
+
+
+
+
+
-        kWindowStructureRgn, &winBounds);
-(CGrafPtr)val.i_in
+por
-        kWindowContentRgn, &clientBounds);
-
-    /* update video clipping bounds in drawable */
-    rect[0] = (clientBounds.left-winBounds.left)
-vall.i_int;     
+clipBounds.left;
-    rect[1] = (winBounds.bottom-winBounds.top)
-            - (clientBounds.top-winBounds.top)
-valb.i_int;       
-valr.i_int-vall.i_int;           
-valb.i_int-valt.i_int;           
+clipBounds.bottom;
+clipBounds.right-clipBounds.left;
+clipBounds.bottom-clipBounds.top;
-    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 */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    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/Makefile.am

@@ -5 +5 @@
-noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
-
- $(vlcintf_xpt_DATA)
+
-CLEANFILES = stamp-pic $(BUILT_SOURCES)
-vlcintf.idl 
+
-
-SOURCES_mozilla_common = \
@@ -13 +13 @@
-    vlcplugin.cpp \
-    vlcplugin.h \
-
-
-
-
+
+
+
+
+
+
-    support/classinfo.h
-
@@ -142 +144 @@
-noinst_LIBRARIES_mozilla = libnpvlc.a
-
-$(SOURCES_mozilla): vlcintf.h
-
-BUILT_SOURCES = vlcintf.h
-vlcintf_xpt_DATA = vlcintf.xpt
-
-if USE_LIBTOOL
-# FIXME: name is incorrect on Win32 & Darwin
@@ -176 +173 @@
-    @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
-
-vlcintf_xptdir = $(libdir)/mozilla/components
-vlcintf.xpt: vlcintf.idl
-    $(XPIDL) $(XPIDL_INCL) \
-      -m typelib -o vlcintf $(srcdir)/vlcintf.idl
-
-vlcintf.h: vlcintf.idl
-    $(XPIDL) $(XPIDL_INCL) \
-      -m header -o vlcintf $(srcdir)/vlcintf.idl
-
-###############################################################################
-# Stamp rules

mozilla/vlcplugin.cpp

@@ -27 +27 @@
-#include "config.h"
-
-#include <vlc/vlc.h>
-
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-#include <nsISupports.h>
-#include <nsMemory.h>
-#include <npapi.h>
-
-#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
-#define XP_UNIX 1
-#elif defined(XP_MACOSX)
-#undef XP_UNIX
-#endif
-
-#include "vlcplugin.h"
+#include "control/npovlc.h"
+#include "control/npolibvlc.h"
-
-/*****************************************************************************
- * VlcPlugin constructor and destructor
- *****************************************************************************/
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-VlcPlugin::~VlcPlugin()
-{
-
-
-
-
-
-
-
+
+
+
+
+
-
-/*****************************************************************************
- * VlcPlugin methods
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

mozilla/vlcplugin.h

@@ -2 +2 @@
- * vlcplugin.h: a VLC plugin for Mozilla
- *****************************************************************************
-5
+6
- * $Id$
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
+            Damien Fouilleul <damienf@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -28 +29 @@
-#define __VLCPLUGIN_H__
-
-
+
+
+
-
-#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
@@ -36 +39 @@
-#endif
-
+#if 0
-#ifdef XP_WIN
-    /* Windows stuff */
@@ -51 +55 @@
-#   include <X11/StringDefs.h>
-#endif
+#endif
-
-class VlcPlugin
-{
-public:
-
+, uint16
-    virtual ~VlcPlugin();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-#endif
-
-
-
-
-
+
+
-#endif
-
-
-
-
-
+
-
-
-
-
+
-    int      b_stream;
-    int      b_autoplay;
@@ -92 +96 @@
-
-private:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

mozilla/vlcshell.cpp

@@ -22 +22 @@
- *****************************************************************************/
-
-/* XXX: disable VLC here */
-#define USE_LIBVLC 1
-
-/*****************************************************************************
- * Preamble
@@ -34 +31 @@
-#include <stdlib.h>
-
-/* vlc stuff */
-#ifdef USE_LIBVLC
-#   include <vlc/vlc.h>
-#endif
-
-/* Mozilla stuff */
-#ifdef HAVE_MOZILLA_CONFIG_H
-#   include <mozilla-config.h>
-#endif
-#include <nsISupports.h>
-#include <nsMemory.h>
-#include <npapi.h>
-#include <npruntime.h>
-
-/* This is from mozilla java, do we really need it? */
@@ -54 +42 @@
-
-#include "vlcplugin.h"
-#include "vlcruntime.h"
-
-#if USE_LIBVLC
-#   define WINDOW_TEXT "(no picture)"
-#else
-#   define WINDOW_TEXT "(no libvlc)"
-#endif
-
-/* Enable/disable debugging printf's for X11 resizing */
-#undef X11_RESIZE_DEBUG
+
+#define WINDOW_TEXT "(no video)"
-
-/*****************************************************************************
@@ -72 +55 @@
-#   define AOUT_PLUGINS "esd,arts,alsa,oss,dummy"
-
-static unsigned int i_previous_height = 100000;
-static unsigned int i_previous_width = 100000;
-
-static void Redraw( Widget w, XtPointer closure, XEvent *event );
-static void Resize( Widget w, XtPointer closure, XEvent *event );
+
-#endif
-
@@ -85 +66 @@
-#   define VOUT_PLUGINS "opengl,macosx,dummy"
-#   define AOUT_PLUGINS "auhal,macosx,dummy"
-
-#endif
-
@@ -95 +75 @@
-#   define AOUT_PLUGINS "directx,waveout,dummy"
-
-
-
-
+
+
-#endif
-
@@ -111 +90 @@
-{
-
-    static nsIID nsid = VLCINTF_IID;
-    static char psz_desc[1000];
-
+    /* plugin class variables */
-    switch( variable )
-    {
@@ -121 +100 @@
-
-        case NPPVpluginDescriptionString:
-
-
-
-
-
-
+
+
-            *((char **)value) = psz_desc;
-            return NPERR_NO_ERROR;
-
-        default:
-go on
+move on to instance variables 
-            break;
-    }
@@ -140 +115 @@
-    }
-
-
+
+
+
+
+
+
+
+
-
-    switch( variable )
-    {
-
-
-
+