#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
-#include <vlc_vout.h>
#include <vlc_demux.h>
#include <vlc_interface.h>
+#include <vlc_dialog.h>
#import <QTKit/QTKit.h>
#import <CoreAudio/CoreAudio.h>
} qtchroma_to_fourcc[] =
{
/* Raw data types */
- { k422YpCbCr8CodecType, VLC_FOURCC('U','Y','V','Y') },
- { kComponentVideoCodecType,VLC_FOURCC('Y','U','Y','2') },
+ { '2vuy', VLC_CODEC_UYVY },
+ { 'yuv2',VLC_CODEC_YUYV },
+ { 'yuvs', VLC_CODEC_YUYV },
{ 0, 0 }
};
int i;
int i;
int i_width;
int i_height;
- int i_aspect;
int result = 0;
/* Only when selected */
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;
+ p_demux->p_sys = p_sys = calloc( 1, 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;
p_sys->device = [QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeVideo];
if( !p_sys->device )
{
- intf_UserFatal( p_demux, true, _("No Input device found"),
+ dialog_FatalWait( p_demux, _("No Input device found"),
_("Your Mac does not seem to be equipped with a suitable input device. "
"Please check your connectors and drivers.") );
msg_Err( p_demux, "Can't find any Video device" );
if( ![p_sys->device open: &o_returnedError] )
{
- msg_Err( p_demux, "Unable to open the capture device (%i)", [o_returnedError code] );
+ msg_Err( p_demux, "Unable to open the capture device (%ld)", [o_returnedError code] );
goto error;
}
/* Get the formats */
NSArray *format_array = [p_sys->device formatDescriptions];
QTFormatDescription* camera_format = NULL;
- for( int k=0; k < [format_array count]; k++ )
+ for( int k = 0; k < [format_array count]; k++ )
{
camera_format = [format_array objectAtIndex: k];
- NSLog( [camera_format localizedFormatSummary] );
- NSLog( [[camera_format formatDescriptionAttributes] description] );
+ NSLog( @"%@", [camera_format localizedFormatSummary] );
+ NSLog( @"%@",[[camera_format formatDescriptionAttributes] description] );
}
if( [format_array count] )
camera_format = [format_array objectAtIndex: 0];
fmt.video.i_height = p_sys->height = encoded_size.height;
if( par_size.width != encoded_size.width )
{
- fmt.video.i_aspect = par_size.width * VOUT_ASPECT_FACTOR / encoded_size.width ;
+ fmt.video.i_sar_num = (int64_t)encoded_size.height * par_size.width / encoded_size.width;
+ fmt.video.i_sar_den = encoded_size.width;
}
NSLog( @"encoded_size %d %d", (int)encoded_size.width, (int)encoded_size.height );
bool ret = [p_sys->session addInput:input error: &o_returnedError];
if( !ret )
{
- msg_Err( p_demux, "default video capture device could not be added to capture session (%i)", [o_returnedError code] );
+ msg_Err( p_demux, "default video capture device could not be added to capture session (%ld)", [o_returnedError code] );
goto error;
}
ret = [p_sys->session addOutput:p_sys->output error: &o_returnedError];
if( !ret )
{
- msg_Err( p_demux, "output could not be added to capture session (%i)", [o_returnedError code] );
+ msg_Err( p_demux, "output could not be added to capture session (%ld)", [o_returnedError code] );
goto error;
}
* Else we dead lock. */
if( vlc_object_alive(p_this->p_libvlc))
{
- [p_sys->session stopRunning];
- [p_sys->output release];
- [p_sys->session release];
+ // Perform this on main thread, as the framework itself will sometimes try to synchronously
+ // work on main thread. And this will create a dead lock.
+ [p_sys->session performSelectorOnMainThread:@selector(stopRunning) withObject:nil waitUntilDone:NO];
+ [p_sys->output performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
+ [p_sys->session performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
}
free( p_sys );