From: Ole André Vadla Ravnås Date: Fri, 5 Nov 2010 14:08:02 +0000 (+0100) Subject: celapi: update to reflect new API on iOS 4.x X-Git-Tag: 1.19.3~507^2~16211 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=517f3a75c206b483de60039dd96743ab499a2ce4;p=platform%2Fupstream%2Fgstreamer.git celapi: update to reflect new API on iOS 4.x Also add remaining property constants for device and stream. --- diff --git a/sys/applemedia/celapi.c b/sys/applemedia/celapi.c index 4e2bc98..b279b53 100644 --- a/sys/applemedia/celapi.c +++ b/sys/applemedia/celapi.c @@ -44,10 +44,111 @@ gst_cel_api_obtain (GError ** error) static const GstDynSymSpec symbols[] = { SYM_SPEC (FigCreateCaptureDevicesAndStreamsForPreset), + SYM_SPEC (kFigCaptureDeviceProperty_MultiplexStreams), + SYM_SPEC (kFigCapturePropertyValue_AFEarlyOutAllowPeakAtStart), + SYM_SPEC (kFigCapturePropertyValue_AFEarlyOutDecrementAmount), + SYM_SPEC (kFigCapturePropertyValue_AFEarlyOutEnable), + SYM_SPEC (kFigCapturePropertyValue_AFEarlyOutThreshold), + SYM_SPEC (kFigCapturePropertyValue_AFPositionCurrent), + SYM_SPEC (kFigCapturePropertyValue_AFPositionInfinity), + SYM_SPEC (kFigCapturePropertyValue_AFPositionMacro), + SYM_SPEC (kFigCapturePropertyValue_AFSearchPositionArray), + SYM_SPEC (kFigCapturePropertyValue_AGC), + SYM_SPEC (kFigCapturePropertyValue_CLPFControl), + SYM_SPEC (kFigCapturePropertyValue_ColorRangeFull), + SYM_SPEC (kFigCapturePropertyValue_ColorRangeSDVideo), + SYM_SPEC (kFigCapturePropertyValue_ModuleDate), + SYM_SPEC (kFigCapturePropertyValue_ModuleIntegratorInfo), + SYM_SPEC (kFigCapturePropertyValue_SensorID), + SYM_SPEC (kFigCapturePropertyValue_SigmaFilterControl), + SYM_SPEC (kFigCapturePropertyValue_YLPFControl), + SYM_SPEC (kFigCapturePropertyValue_hStart), + SYM_SPEC (kFigCapturePropertyValue_height), + SYM_SPEC (kFigCapturePropertyValue_ispDGain), + SYM_SPEC (kFigCapturePropertyValue_sensorDGain), + SYM_SPEC (kFigCapturePropertyValue_shutterSpeedDenominator), + SYM_SPEC (kFigCapturePropertyValue_shutterSpeedNumerator), + SYM_SPEC (kFigCapturePropertyValue_vStart), + SYM_SPEC (kFigCapturePropertyValue_weight), + SYM_SPEC (kFigCapturePropertyValue_width), + SYM_SPEC (kFigCaptureStreamPropertyValue_AEBracketedCaptureParams), + SYM_SPEC (kFigCaptureStreamPropertyValue_BLCCompensation), + SYM_SPEC (kFigCaptureStreamPropertyValue_BLCDebugMode), + SYM_SPEC (kFigCaptureStreamPropertyValue_BandHighFactor), + SYM_SPEC (kFigCaptureStreamPropertyValue_BandLowFactor), + SYM_SPEC (kFigCaptureStreamPropertyValue_CCMWarmUpWeight), + SYM_SPEC (kFigCaptureStreamPropertyValue_EdgeColorSuppressionSlope), + SYM_SPEC (kFigCaptureStreamPropertyValue_EdgeColorSuppressionThreshold), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableAESceneDynamicMetering), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableCCMWarmUp), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableHistogram1MetaData), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableHistogram2MetaData), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableHistogram3MetaData), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableHistogram4MetaData), + SYM_SPEC (kFigCaptureStreamPropertyValue_EnableHistogram), + SYM_SPEC (kFigCaptureStreamPropertyValue_HistogramBinMode), + SYM_SPEC (kFigCaptureStreamPropertyValue_HistogramDataType), + SYM_SPEC (kFigCaptureStreamPropertyValue_ImageCropRect), + SYM_SPEC (kFigCaptureStreamPropertyValue_LPExposure), + SYM_SPEC (kFigCaptureStreamPropertyValue_LPGain), + SYM_SPEC (kFigCaptureStreamPropertyValue_LowWeight), + SYM_SPEC (kFigCaptureStreamPropertyValue_MaxWeight), + SYM_SPEC (kFigCaptureStreamPropertyValue_MediumWeight), + SYM_SPEC (kFigCaptureStreamPropertyValue_MinWeight), + SYM_SPEC (kFigCaptureStreamPropertyValue_WeightDropOff), + SYM_SPEC (kFigCaptureStreamPropertyValue_WeightReduction), + SYM_SPEC (kFigCaptureStreamProperty_AEConvergenceSpeed), + SYM_SPEC (kFigCaptureStreamProperty_AEOutlierClipCount), + SYM_SPEC (kFigCaptureStreamProperty_AESceneDynamicMetering), + SYM_SPEC (kFigCaptureStreamProperty_AEStability), + SYM_SPEC (kFigCaptureStreamProperty_AEWindowManualWeightMatrix), + SYM_SPEC (kFigCaptureStreamProperty_AEWindowParams), + SYM_SPEC (kFigCaptureStreamProperty_AFEarlyOutParams), + SYM_SPEC (kFigCaptureStreamProperty_AFParams), + SYM_SPEC (kFigCaptureStreamProperty_AFSearchPositions), + SYM_SPEC (kFigCaptureStreamProperty_AFWindowParams), + SYM_SPEC (kFigCaptureStreamProperty_AGC), + SYM_SPEC (kFigCaptureStreamProperty_AWBWindowParams), + SYM_SPEC (kFigCaptureStreamProperty_AdditionalPTSOffset), + SYM_SPEC (kFigCaptureStreamProperty_AlternateAWB), + SYM_SPEC (kFigCaptureStreamProperty_Apply3AWindowSettings), + SYM_SPEC (kFigCaptureStreamProperty_AttachRAW), + SYM_SPEC (kFigCaptureStreamProperty_CCMWarmUp), + SYM_SPEC (kFigCaptureStreamProperty_ClientMaxBufferCountHint), + SYM_SPEC (kFigCaptureStreamProperty_ColorRange), + SYM_SPEC (kFigCaptureStreamProperty_ColorSaturation), + SYM_SPEC (kFigCaptureStreamProperty_ColorTables), + SYM_SPEC (kFigCaptureStreamProperty_EdgeColorSuppressionParams), + SYM_SPEC (kFigCaptureStreamProperty_ExposureBias), + SYM_SPEC (kFigCaptureStreamProperty_FastSwitchMode), + SYM_SPEC (kFigCaptureStreamProperty_FlashMode), + SYM_SPEC (kFigCaptureStreamProperty_HistogramParams), + SYM_SPEC (kFigCaptureStreamProperty_LockAENow), + SYM_SPEC (kFigCaptureStreamProperty_LockAWBNow), + SYM_SPEC (kFigCaptureStreamProperty_ManualAENow), + SYM_SPEC (kFigCaptureStreamProperty_ManualFocusNow), + SYM_SPEC (kFigCaptureStreamProperty_MaxIntegrationTime), + SYM_SPEC (kFigCaptureStreamProperty_ModuleInfo), + SYM_SPEC (kFigCaptureStreamProperty_NoiseReductionControls), + SYM_SPEC (kFigCaptureStreamProperty_PortType), + SYM_SPEC (kFigCaptureStreamProperty_PreFrameAE), + SYM_SPEC (kFigCaptureStreamProperty_RawImageProcessNow), + SYM_SPEC (kFigCaptureStreamProperty_RedEyeReductionParams), + SYM_SPEC (kFigCaptureStreamProperty_ResetParams), + SYM_SPEC (kFigCaptureStreamProperty_ScalerSharpening), + SYM_SPEC (kFigCaptureStreamProperty_SetGainCap), + SYM_SPEC (kFigCaptureStreamProperty_SharpeningControl), + SYM_SPEC (kFigCaptureStreamProperty_TorchLevel), + SYM_SPEC (kFigCaptureStreamProperty_UnlockAENow), + SYM_SPEC (kFigCaptureStreamProperty_UnlockAWBNow), + SYM_SPEC (kFigCaptureStreamProperty_UseFlashAFAssist), + SYM_SPEC (kFigCaptureStreamProperty_UseFlashRedEyeReduction), + SYM_SPEC (kFigCaptureStreamProperty_UseHardwareShutter), + SYM_SPEC (kFigCaptureStreamProperty_VideoRecordingInProgress), SYM_SPEC (kFigRecorderCapturePreset_AudioRecording), - SYM_SPEC (kFigRecorderCapturePreset_VideoRecording), SYM_SPEC (kFigRecorderCapturePreset_AudioVideoRecording), SYM_SPEC (kFigRecorderCapturePreset_PhotoCapture), + SYM_SPEC (kFigRecorderCapturePreset_VideoRecording), {NULL, 0}, }; diff --git a/sys/applemedia/celapi.h b/sys/applemedia/celapi.h index cbfb9dc..99f8f8a 100644 --- a/sys/applemedia/celapi.h +++ b/sys/applemedia/celapi.h @@ -44,10 +44,111 @@ struct _GstCelApi FigCaptureDeviceRef * outAudioDevice, FigCaptureStreamRef * outAudioStream); + CFStringRef * kFigCaptureDeviceProperty_MultiplexStreams; + CFStringRef * kFigCapturePropertyValue_AFEarlyOutAllowPeakAtStart; + CFStringRef * kFigCapturePropertyValue_AFEarlyOutDecrementAmount; + CFStringRef * kFigCapturePropertyValue_AFEarlyOutEnable; + CFStringRef * kFigCapturePropertyValue_AFEarlyOutThreshold; + CFStringRef * kFigCapturePropertyValue_AFPositionCurrent; + CFStringRef * kFigCapturePropertyValue_AFPositionInfinity; + CFStringRef * kFigCapturePropertyValue_AFPositionMacro; + CFStringRef * kFigCapturePropertyValue_AFSearchPositionArray; + CFStringRef * kFigCapturePropertyValue_AGC; + CFStringRef * kFigCapturePropertyValue_CLPFControl; + CFStringRef * kFigCapturePropertyValue_ColorRangeFull; + CFStringRef * kFigCapturePropertyValue_ColorRangeSDVideo; + CFStringRef * kFigCapturePropertyValue_ModuleDate; + CFStringRef * kFigCapturePropertyValue_ModuleIntegratorInfo; + CFStringRef * kFigCapturePropertyValue_SensorID; + CFStringRef * kFigCapturePropertyValue_SigmaFilterControl; + CFStringRef * kFigCapturePropertyValue_YLPFControl; + CFStringRef * kFigCapturePropertyValue_hStart; + CFStringRef * kFigCapturePropertyValue_height; + CFStringRef * kFigCapturePropertyValue_ispDGain; + CFStringRef * kFigCapturePropertyValue_sensorDGain; + CFStringRef * kFigCapturePropertyValue_shutterSpeedDenominator; + CFStringRef * kFigCapturePropertyValue_shutterSpeedNumerator; + CFStringRef * kFigCapturePropertyValue_vStart; + CFStringRef * kFigCapturePropertyValue_weight; + CFStringRef * kFigCapturePropertyValue_width; + CFStringRef * kFigCaptureStreamPropertyValue_AEBracketedCaptureParams; + CFStringRef * kFigCaptureStreamPropertyValue_BLCCompensation; + CFStringRef * kFigCaptureStreamPropertyValue_BLCDebugMode; + CFStringRef * kFigCaptureStreamPropertyValue_BandHighFactor; + CFStringRef * kFigCaptureStreamPropertyValue_BandLowFactor; + CFStringRef * kFigCaptureStreamPropertyValue_CCMWarmUpWeight; + CFStringRef * kFigCaptureStreamPropertyValue_EdgeColorSuppressionSlope; + CFStringRef * kFigCaptureStreamPropertyValue_EdgeColorSuppressionThreshold; + CFStringRef * kFigCaptureStreamPropertyValue_EnableAESceneDynamicMetering; + CFStringRef * kFigCaptureStreamPropertyValue_EnableCCMWarmUp; + CFStringRef * kFigCaptureStreamPropertyValue_EnableHistogram1MetaData; + CFStringRef * kFigCaptureStreamPropertyValue_EnableHistogram2MetaData; + CFStringRef * kFigCaptureStreamPropertyValue_EnableHistogram3MetaData; + CFStringRef * kFigCaptureStreamPropertyValue_EnableHistogram4MetaData; + CFStringRef * kFigCaptureStreamPropertyValue_EnableHistogram; + CFStringRef * kFigCaptureStreamPropertyValue_HistogramBinMode; + CFStringRef * kFigCaptureStreamPropertyValue_HistogramDataType; + CFStringRef * kFigCaptureStreamPropertyValue_ImageCropRect; + CFStringRef * kFigCaptureStreamPropertyValue_LPExposure; + CFStringRef * kFigCaptureStreamPropertyValue_LPGain; + CFStringRef * kFigCaptureStreamPropertyValue_LowWeight; + CFStringRef * kFigCaptureStreamPropertyValue_MaxWeight; + CFStringRef * kFigCaptureStreamPropertyValue_MediumWeight; + CFStringRef * kFigCaptureStreamPropertyValue_MinWeight; + CFStringRef * kFigCaptureStreamPropertyValue_WeightDropOff; + CFStringRef * kFigCaptureStreamPropertyValue_WeightReduction; + CFStringRef * kFigCaptureStreamProperty_AEConvergenceSpeed; + CFStringRef * kFigCaptureStreamProperty_AEOutlierClipCount; + CFStringRef * kFigCaptureStreamProperty_AESceneDynamicMetering; + CFStringRef * kFigCaptureStreamProperty_AEStability; + CFStringRef * kFigCaptureStreamProperty_AEWindowManualWeightMatrix; + CFStringRef * kFigCaptureStreamProperty_AEWindowParams; + CFStringRef * kFigCaptureStreamProperty_AFEarlyOutParams; + CFStringRef * kFigCaptureStreamProperty_AFParams; + CFStringRef * kFigCaptureStreamProperty_AFSearchPositions; + CFStringRef * kFigCaptureStreamProperty_AFWindowParams; + CFStringRef * kFigCaptureStreamProperty_AGC; + CFStringRef * kFigCaptureStreamProperty_AWBWindowParams; + CFStringRef * kFigCaptureStreamProperty_AdditionalPTSOffset; + CFStringRef * kFigCaptureStreamProperty_AlternateAWB; + CFStringRef * kFigCaptureStreamProperty_Apply3AWindowSettings; + CFStringRef * kFigCaptureStreamProperty_AttachRAW; + CFStringRef * kFigCaptureStreamProperty_CCMWarmUp; + CFStringRef * kFigCaptureStreamProperty_ClientMaxBufferCountHint; + CFStringRef * kFigCaptureStreamProperty_ColorRange; + CFStringRef * kFigCaptureStreamProperty_ColorSaturation; + CFStringRef * kFigCaptureStreamProperty_ColorTables; + CFStringRef * kFigCaptureStreamProperty_EdgeColorSuppressionParams; + CFStringRef * kFigCaptureStreamProperty_ExposureBias; + CFStringRef * kFigCaptureStreamProperty_FastSwitchMode; + CFStringRef * kFigCaptureStreamProperty_FlashMode; + CFStringRef * kFigCaptureStreamProperty_HistogramParams; + CFStringRef * kFigCaptureStreamProperty_LockAENow; + CFStringRef * kFigCaptureStreamProperty_LockAWBNow; + CFStringRef * kFigCaptureStreamProperty_ManualAENow; + CFStringRef * kFigCaptureStreamProperty_ManualFocusNow; + CFStringRef * kFigCaptureStreamProperty_MaxIntegrationTime; + CFStringRef * kFigCaptureStreamProperty_ModuleInfo; + CFStringRef * kFigCaptureStreamProperty_NoiseReductionControls; + CFStringRef * kFigCaptureStreamProperty_PortType; + CFStringRef * kFigCaptureStreamProperty_PreFrameAE; + CFStringRef * kFigCaptureStreamProperty_RawImageProcessNow; + CFStringRef * kFigCaptureStreamProperty_RedEyeReductionParams; + CFStringRef * kFigCaptureStreamProperty_ResetParams; + CFStringRef * kFigCaptureStreamProperty_ScalerSharpening; + CFStringRef * kFigCaptureStreamProperty_SetGainCap; + CFStringRef * kFigCaptureStreamProperty_SharpeningControl; + CFStringRef * kFigCaptureStreamProperty_TorchLevel; + CFStringRef * kFigCaptureStreamProperty_UnlockAENow; + CFStringRef * kFigCaptureStreamProperty_UnlockAWBNow; + CFStringRef * kFigCaptureStreamProperty_UseFlashAFAssist; + CFStringRef * kFigCaptureStreamProperty_UseFlashRedEyeReduction; + CFStringRef * kFigCaptureStreamProperty_UseHardwareShutter; + CFStringRef * kFigCaptureStreamProperty_VideoRecordingInProgress; CFStringRef * kFigRecorderCapturePreset_AudioRecording; - CFStringRef * kFigRecorderCapturePreset_VideoRecording; CFStringRef * kFigRecorderCapturePreset_AudioVideoRecording; CFStringRef * kFigRecorderCapturePreset_PhotoCapture; + CFStringRef * kFigRecorderCapturePreset_VideoRecording; }; struct _GstCelApiClass