mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 23:33:05 +04:00
committed by
Alexander Alekhin
parent
5e2bcc9149
commit
f9c514b391
@@ -319,8 +319,8 @@ enum
|
||||
CV_CAP_PROP_XI_COOLING = 466, // Start camera cooling.
|
||||
CV_CAP_PROP_XI_TARGET_TEMP = 467, // Set sensor target temperature for cooling.
|
||||
CV_CAP_PROP_XI_CHIP_TEMP = 468, // Camera sensor temperature
|
||||
CV_CAP_PROP_XI_HOUS_TEMP = 469, // Camera housing tepmerature
|
||||
CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP = 590, // Camera housing back side tepmerature
|
||||
CV_CAP_PROP_XI_HOUS_TEMP = 469, // Camera housing temperature
|
||||
CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP = 590, // Camera housing back side temperature
|
||||
CV_CAP_PROP_XI_SENSOR_BOARD_TEMP = 596, // Camera sensor board temperature
|
||||
CV_CAP_PROP_XI_CMS = 470, // Mode of color management system.
|
||||
CV_CAP_PROP_XI_APPLY_CMS = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE).
|
||||
|
||||
@@ -299,7 +299,7 @@ bool CvCaptureCAM_Aravis::grabFrame()
|
||||
size_t buffer_size;
|
||||
framebuffer = (void*)arv_buffer_get_data (arv_buffer, &buffer_size);
|
||||
|
||||
// retrieve image size properites
|
||||
// retrieve image size properties
|
||||
arv_buffer_get_image_region (arv_buffer, &xoffset, &yoffset, &width, &height);
|
||||
|
||||
// retrieve image ID set by camera
|
||||
|
||||
@@ -1293,7 +1293,7 @@ bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) {
|
||||
colorSpace, kCGImageAlphaLast|kCGBitmapByteOrderDefault,
|
||||
provider, NULL, false, kCGRenderingIntentDefault);
|
||||
|
||||
//CGImage -> CVPixelBufferRef coversion
|
||||
//CGImage -> CVPixelBufferRef conversion
|
||||
CVPixelBufferRef pixelBuffer = NULL;
|
||||
CFDataRef cfData = CGDataProviderCopyData(CGImageGetDataProvider(cgImage));
|
||||
int status = CVPixelBufferCreateWithBytes(NULL,
|
||||
|
||||
@@ -805,7 +805,7 @@ bool CvCaptureFile::setupReadingAt(CMTime position) {
|
||||
if (mMode == CV_CAP_MODE_BGR || mMode == CV_CAP_MODE_RGB) {
|
||||
// For CV_CAP_MODE_BGR, read frames as BGRA (AV Foundation's YUV->RGB conversion is slightly faster than OpenCV's CV_YUV2BGR_YV12)
|
||||
// kCVPixelFormatType_32ABGR is reportedly faster on OS X, but OpenCV doesn't have a CV_ABGR2BGR conversion.
|
||||
// kCVPixelFormatType_24RGB is significanly slower than kCVPixelFormatType_32BGRA.
|
||||
// kCVPixelFormatType_24RGB is significantly slower than kCVPixelFormatType_32BGRA.
|
||||
pixelFormat = kCVPixelFormatType_32BGRA;
|
||||
mFormat = CV_8UC3;
|
||||
} else if (mMode == CV_CAP_MODE_GRAY) {
|
||||
@@ -1323,7 +1323,7 @@ bool CvVideoWriter_AVFoundation::writeFrame(const IplImage* iplimage) {
|
||||
colorSpace, kCGImageAlphaLast|kCGBitmapByteOrderDefault,
|
||||
provider, NULL, false, kCGRenderingIntentDefault);
|
||||
|
||||
//CGImage -> CVPixelBufferRef coversion
|
||||
//CGImage -> CVPixelBufferRef conversion
|
||||
CVPixelBufferRef pixelBuffer = NULL;
|
||||
CFDataRef cfData = CGDataProviderCopyData(CGImageGetDataProvider(cgImage));
|
||||
int status = CVPixelBufferCreateWithBytes(NULL,
|
||||
|
||||
@@ -1045,7 +1045,7 @@ bool GStreamerCapture::open(const String &filename_)
|
||||
* \return property value
|
||||
*
|
||||
* There are two ways the properties can be retrieved. For seek-based properties we can query the pipeline.
|
||||
* For frame-based properties, we use the caps of the lasst receivef sample. This means that some properties
|
||||
* For frame-based properties, we use the caps of the last receivef sample. This means that some properties
|
||||
* are not available until a first frame was received
|
||||
*/
|
||||
double GStreamerCapture::getProperty(int propId) const
|
||||
|
||||
Reference in New Issue
Block a user