X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fqtcapture.m;h=088378f74923c0aa8905692769ba3e09112161bf;hb=9adc9c55e941b9ea04dec9228bb3e731ad518667;hp=0a334ecff1c843d559e254db23838d7bea232927;hpb=cd4c4f1dadf2a9b595948da6d70ac2eaad93c990;p=vlc diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m index 0a334ecff1..088378f749 100644 --- a/modules/access/qtcapture.m +++ b/modules/access/qtcapture.m @@ -36,6 +36,7 @@ #include #include #include +#include #import #import @@ -51,15 +52,15 @@ static int Control( demux_t *, int, va_list ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( N_("Quicktime Capture") ); - set_description( N_("Quicktime Capture") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_shortcut( "qtcapture" ); - set_capability( "access_demux", 10 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Quicktime Capture") ) + set_description( N_("Quicktime Capture") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_shortcut( "qtcapture" ) + set_capability( "access_demux", 10 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** @@ -163,7 +164,7 @@ struct demux_sys_t { *****************************************************************************/ static int qtchroma_to_fourcc( int i_qt ) { - static struct + static const struct { unsigned int i_qt; int i_fourcc; @@ -171,6 +172,7 @@ static int qtchroma_to_fourcc( int i_qt ) { /* Raw data types */ { k422YpCbCr8CodecType, VLC_FOURCC('U','Y','V','Y') }, + { kComponentVideoCodecType,VLC_FOURCC('Y','U','Y','2') }, { 0, 0 } }; int i; @@ -209,21 +211,19 @@ static int Open( vlc_object_t *p_this ) 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 ) ); - msg_Dbg( p_demux, "QTCapture Probed" ); - QTCaptureDeviceInput * input = nil; NSError *o_returnedError; 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" ); @@ -252,10 +252,51 @@ static int Open( vlc_object_t *p_this ) p_sys->output = [[VLCDecompressedVideoOutput alloc] init]; - /* Hack - This will lower CPU consumption for some reason */ + /* Get the formats */ + NSArray *format_array = [p_sys->device formatDescriptions]; + QTFormatDescription* camera_format = NULL; + for( int k=0; k < [format_array count]; k++ ) + { + camera_format = [format_array objectAtIndex: k]; + + NSLog( [camera_format localizedFormatSummary] ); + NSLog( [[camera_format formatDescriptionAttributes] description] ); + } + if( [format_array count] ) + camera_format = [format_array objectAtIndex: 0]; + else goto error; + + int qtchroma = [camera_format formatType]; + int chroma = qtchroma_to_fourcc( qtchroma ); + if( !chroma ) + { + msg_Err( p_demux, "Unknown qt chroma %4.4s provided by camera", (char*)&qtchroma ); + goto error; + } + + /* Now we can init */ + es_format_Init( &fmt, VIDEO_ES, chroma ); + + NSSize encoded_size = [[camera_format attributeForKey:QTFormatDescriptionVideoEncodedPixelsSizeAttribute] sizeValue]; + NSSize display_size = [[camera_format attributeForKey:QTFormatDescriptionVideoCleanApertureDisplaySizeAttribute] sizeValue]; + NSSize par_size = [[camera_format attributeForKey:QTFormatDescriptionVideoProductionApertureDisplaySizeAttribute] sizeValue]; + + fmt.video.i_width = p_sys->width = encoded_size.width; + 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 ; + } + + NSLog( @"encoded_size %d %d", (int)encoded_size.width, (int)encoded_size.height ); + NSLog( @"display_size %d %d", (int)display_size.width, (int)display_size.height ); + NSLog( @"PAR size %d %d", (int)par_size.width, (int)par_size.height ); + [p_sys->output setPixelBufferAttributes: [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt:480], kCVPixelBufferHeightKey, - [NSNumber numberWithInt:640], kCVPixelBufferWidthKey, nil]]; + [NSNumber numberWithInt: p_sys->height], kCVPixelBufferHeightKey, + [NSNumber numberWithInt: p_sys->width], kCVPixelBufferWidthKey, + [NSNumber numberWithBool:YES], (id)kCVPixelBufferOpenGLCompatibilityKey, + nil]]; p_sys->session = [[QTCaptureSession alloc] init]; @@ -275,23 +316,6 @@ static int Open( vlc_object_t *p_this ) [p_sys->session startRunning]; - - int qtchroma = [[[p_sys->device formatDescriptions] objectAtIndex: 0] formatType]; /* FIXME */ - int chroma = qtchroma_to_fourcc( qtchroma ); - if( !chroma ) - { - msg_Err( p_demux, "Unknown qt chroma %4.4s provided by camera", (char*)&qtchroma ); - goto error; - } - - /* Now we can init */ - - es_format_Init( &fmt, VIDEO_ES, chroma ); - - NSSize size = [[p_sys->device attributeForKey:QTFormatDescriptionVideoEncodedPixelsSizeAttribute] sizeValue]; - p_sys->width = fmt.video.i_width = 640;/* size.width; FIXME */ - p_sys->height = fmt.video.i_height = 480;/* size.height; FIXME */ - msg_Dbg( p_demux, "added new video es %4.4s %dx%d", (char*)&fmt.i_codec, fmt.video.i_width, fmt.video.i_height ); @@ -328,7 +352,6 @@ static void Close( vlc_object_t *p_this ) if( vlc_object_alive(p_this->p_libvlc)) { [p_sys->session stopRunning]; - [p_sys->device release]; [p_sys->output release]; [p_sys->session release]; }