[vlc-devel] commit: qtcapture: Initialize our structure no sooner than needed. ( Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed May 28 13:16:50 2008 +0200| [b3983d355b1feae3b007c1353cec5207654704f8]

qtcapture: Initialize our structure no sooner than needed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b3983d355b1feae3b007c1353cec5207654704f8
---

 modules/access/qtcapture.m |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index f12e0a4..47e2725 100644
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -55,7 +55,7 @@ vlc_module_begin();
    set_category( CAT_INPUT );
    set_subcategory( SUBCAT_INPUT_ACCESS );
    add_shortcut( "qtcapture" );
-   set_capability( "access_demux", 0 );
+   set_capability( "access_demux", 10 );
    set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -182,13 +182,6 @@ static int Open( vlc_object_t *p_this )
     int i_aspect;
     int result = 0;
 
-    /* Set up p_demux */
-    p_demux->pf_demux = Demux;
-    p_demux->pf_control = Control;
-    p_demux->info.i_update = 0;
-    p_demux->info.i_title = 0;
-    p_demux->info.i_seekpoint = 0;
-
     /* Only when selected */
     if( *p_demux->psz_access == '\0' )
         return VLC_EGENERIC;
@@ -197,12 +190,6 @@ static int Open( vlc_object_t *p_this )
 
     msg_Dbg( p_demux, "QTCapture Probed" );
 
-    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
-    if( !p_sys ) return VLC_ENOMEM;
-
-    memset( p_sys, 0, sizeof( demux_sys_t ) );
-    memset( &fmt, 0, sizeof( es_format_t ) );
-
     QTCaptureDeviceInput * input = nil;
     QTCaptureSession * session = nil;
     VLCDecompressedVideoOutput * output = nil;
@@ -252,6 +239,7 @@ static int Open( vlc_object_t *p_this )
 
     [session startRunning];
 
+
     int qtchroma = [[[device formatDescriptions] objectAtIndex: 0] formatType]; /* FIXME */
     int chroma = qtchroma_to_fourcc( qtchroma );
     if( !chroma )
@@ -260,6 +248,21 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
+    /* Now we can init */
+
+    /* Set up p_demux */
+    p_demux->pf_demux = Demux;
+    p_demux->pf_control = Control;
+    p_demux->info.i_update = 0;
+    p_demux->info.i_title = 0;
+    p_demux->info.i_seekpoint = 0;
+
+    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys ) return VLC_ENOMEM;
+
+    memset( p_sys, 0, sizeof( demux_sys_t ) );
+    memset( &fmt, 0, sizeof( es_format_t ) );
+
     es_format_Init( &fmt, VIDEO_ES, chroma );
 
     NSSize size = [[device attributeForKey:QTFormatDescriptionVideoEncodedPixelsSizeAttribute] sizeValue];