YUV 422 Packed motion detect (still kind of broken).

[vlc] / modules / access / qtcapture.m

diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index a39b7a2fb0e913fb251b07079e4f7643beed9e35..48b8ac718dff388e02e169e99c225e50c9ccb1c8 100644 (file)
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
@@ -65,64 +65,69 @@ vlc_module_end();
 *****************************************************************************/
 @interface VLCDecompressedVideoOutput : QTCaptureDecompressedVideoOutput
 {
-   CVImageBufferRef currentImageBuffer;
+    CVImageBufferRef currentImageBuffer;
+    mtime_t currentPts;
 }
 - (id)init;
 - (void)outputVideoFrame:(CVImageBufferRef)videoFrame withSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection;
-- (BOOL)copyCurrentFrameToBuffer:(void *)buffer;
+- (mtime_t)copyCurrentFrameToBuffer:(void *)buffer;
 @end
 
 /* Apple sample code */
 @implementation VLCDecompressedVideoOutput : QTCaptureDecompressedVideoOutput
 - (id)init
 {
-   if( self = [super init] )
-   {
-       currentImageBuffer = nil;
-   }
-   return self;
+    if( self = [super init] )
+    {
+        currentImageBuffer = nil;
+        currentPts = 0;
+    }
+    return self;
 }
 - (void)dealloc
 {
-   @synchronized (self) {
-       CVBufferRelease(currentImageBuffer);
-       currentImageBuffer = nil;
-   }
-   [super dealloc];
+    @synchronized (self) {
+        CVBufferRelease(currentImageBuffer);
+        currentImageBuffer = nil;
+    }
+    [super dealloc];
 }
 
 - (void)outputVideoFrame:(CVImageBufferRef)videoFrame withSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection
 {
-   // Store the latest frame
-   // This must be done in a @synchronized block because this delegate method is not called on the main thread
-   CVImageBufferRef imageBufferToRelease;
+    // Store the latest frame
+    // This must be done in a @synchronized block because this delegate method is not called on the main thread
+    CVImageBufferRef imageBufferToRelease;
 
-   CVBufferRetain(videoFrame);
+    CVBufferRetain(videoFrame);
 
-   @synchronized (self) {
-       imageBufferToRelease = currentImageBuffer;
-       currentImageBuffer = videoFrame;
-   }
-   CVBufferRelease(imageBufferToRelease);
+    @synchronized (self) {
+        imageBufferToRelease = currentImageBuffer;
+        currentImageBuffer = videoFrame;
+        /* FIXME: is it the right PTS? */
+        currentPts = [sampleBuffer presentationTime].timeValue / [sampleBuffer presentationTime].timeScale;
+    }
+    CVBufferRelease(imageBufferToRelease);
 }
 
-- (BOOL)copyCurrentFrameToBuffer:(void *)buffer
+- (mtime_t)copyCurrentFrameToBuffer:(void *)buffer
 {
-   CVImageBufferRef imageBuffer;
-
-   @synchronized (self) {
-       if(!currentImageBuffer) return NO;
-       imageBuffer = CVBufferRetain(currentImageBuffer);
-   }
+    CVImageBufferRef imageBuffer;
+    mtime_t pts;
+    @synchronized (self) {
+        if(!currentImageBuffer) return 0;
+        imageBuffer = CVBufferRetain(currentImageBuffer);
+        pts = currentPts;
+    }
 
-   CVPixelBufferLockBaseAddress(imageBuffer, 0);
-   void * pixels = CVPixelBufferGetBaseAddress(imageBuffer);
-   memcpy( buffer, pixels, CVPixelBufferGetBytesPerRow(imageBuffer) * CVPixelBufferGetHeight(imageBuffer) );
-   CVPixelBufferUnlockBaseAddress(imageBuffer, 0);
+    CVPixelBufferLockBaseAddress(imageBuffer, 0);
+    void * pixels = CVPixelBufferGetBaseAddress(imageBuffer);
+    memcpy( buffer, pixels, CVPixelBufferGetBytesPerRow(imageBuffer) * CVPixelBufferGetHeight(imageBuffer) );
+    CVPixelBufferUnlockBaseAddress(imageBuffer, 0);
 
-   CVBufferRelease(imageBuffer);
+    CVBufferRelease(imageBuffer);
 
-   return YES;
+    return currentPts;
 }
 
 @end
@@ -177,23 +182,14 @@ 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;
 
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 
     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;
@@ -220,6 +216,11 @@ static int Open( vlc_object_t *p_this )
 
     output = [[VLCDecompressedVideoOutput alloc] init];
 
+    /* Hack - This will lower CPU consumption for some reason */
+    [output setPixelBufferAttributes: [NSDictionary dictionaryWithObjectsAndKeys:
+        [NSNumber numberWithInt:480], kCVPixelBufferHeightKey,
+        [NSNumber numberWithInt:640], kCVPixelBufferWidthKey, nil]];
+
     session = [[QTCaptureSession alloc] init];
 
     bool ret = [session addInput:input error:nil  /* FIXME */];
@@ -238,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 )
@@ -246,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];
@@ -315,7 +332,9 @@ static int Demux( demux_t *p_demux )
 
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 
-    if( ![p_sys->output copyCurrentFrameToBuffer: p_block->p_buffer] )
+    p_block->i_pts = [p_sys->output copyCurrentFrameToBuffer: p_block->p_buffer];
+
+    if( !p_block->i_pts )
     {
         /* Nothing to display yet, just forget */
         block_Release( p_block );
@@ -323,7 +342,8 @@ static int Demux( demux_t *p_demux )
         return 1;
     }
 
-    p_block->i_pts = mdate(); /* FIXME */
+    /* FIXME */
+    p_block->i_pts = mdate();
 
     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
     es_out_Send( p_demux->out, p_sys->p_es_video, p_block );