Changeset 05f184decf17ab405efb648ce3d2c1e8a2ef1450 for modules/access

Timestamp:

18/07/08 00:42:53 (4 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1216334573 +0200

git-parent:

[b65ca27b5b5445bf4814dcbc22985cfc24f0900b]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1216334573 +0200

Message:

Revert "qtcapture: Use a direct block buffer, and remove a memcpy."

This reverts commit b65ca27b5b5445bf4814dcbc22985cfc24f0900b.

It doesn't work well enough.

Files:

• modules/access/qtcapture.m (modified) (4 diffs)

modules/access/qtcapture.m

@@ -48 +48 @@
-static int Control( demux_t *, int, va_list );
-
-typedef struct qtcapture_block_t
-{
-    block_t block;
-    CVImageBufferRef imageBuffer;
-    block_free_t pf_original_release;
-} qtcapture_block_t;
-
-static void qtcapture_block_release( block_t *p_block )
-{
-    qtcapture_block_t * p_qtblock = (qtcapture_block_t *)p_block;
-    CVBufferRelease(p_qtblock->imageBuffer);
-    CVPixelBufferUnlockBaseAddress(p_qtblock->imageBuffer, 0);
-    p_qtblock->pf_original_release( &p_qtblock->block );
-}
-
-static block_t * qtcapture_block_new( void * p_buffer,
-    int i_buffer,
-    CVImageBufferRef imageBufferToRelease )
-{
-    qtcapture_block_t * p_qtblock;
-
-    /* Build block */
-    p_qtblock = malloc( sizeof( qtcapture_block_t ) );
-    if(!p_qtblock) return NULL;
-
-    /* Fill all fields */
-    block_Init( &p_qtblock->block, p_buffer, i_buffer );
-    p_qtblock->block.pf_release = qtcapture_block_release;
-    p_qtblock->imageBuffer = imageBufferToRelease;
-
-    return (block_t *)p_qtblock;
-}
-
-
-/*****************************************************************************
-* Module descriptor
@@ -107 +73 @@
-- (id)init;
-- (void)outputVideoFrame:(CVImageBufferRef)videoFrame withSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection;
-block_t *)blockWithCurrentFrame
+mtime_t)copyCurrentFrameToBuffer:(void *)buffer
-@end
-
@@ -146 +112 @@
-        currentPts = 1000000L / [sampleBuffer presentationTime].timeScale * [sampleBuffer presentationTime].timeValue;
-    }
-
-    CVBufferRelease(imageBufferToRelease);
-}
-
-block_t *)blockWithCurrentFrame
+mtime_t)copyCurrentFrameToBuffer:(void *)buffer
-{
-    CVImageBufferRef imageBuffer;
-    mtime_t pts;
-    block_t * p_block = NULL;
-
-    if(!currentImageBuffer || currentPts == previousPts )
-NULL
+0
-
-    @synchronized (self)
-    {
-        // Released in the p_block release method.
-        imageBuffer = CVBufferRetain(currentImageBuffer);
-        pts = previousPts = currentPts;
-
-
-        // Unlocked in the p_block release method.
-        CVPixelBufferLockBaseAddress(imageBuffer, 0);
-        void * pixels = CVPixelBufferGetBaseAddress(imageBuffer);
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -380 +342 @@
-    block_t *p_block;
-
+    p_block = block_New( p_demux, p_sys->width *
+                            p_sys->height * 2 /* FIXME */ );
+    if( !p_block )
+    {
+        msg_Err( p_demux, "cannot get block" );
+        return 0;
+    }
+
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-    @synchronized (p_sys->output)
-    {
-    p_block = [p_sys->output blockWithCurrentFrame
-
-
-
+p_block->i_pts = [p_sys->output copyCurrentFrameToBuffer: p_block->p_buffer
+
+
+->i_pts
-    {
-        /* Nothing to display yet, just forget */
+        block_Release( p_block );
-        [pool release];
-        msleep( 10000 );