Updated the vision task runner to split the method that creates normalized rect based on ROI
This commit is contained in:
parent
9483ac4651
commit
e6fd39b3ee
|
@ -58,38 +58,57 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
error:(NSError **)error NS_DESIGNATED_INITIALIZER;
|
error:(NSError **)error NS_DESIGNATED_INITIALIZER;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a `NormalizedRect` from a region of interest and an image orientation, performing
|
* Creates a `NormalizedRect` from image orientation for a task which does not support roi,
|
||||||
* sanity checks on-the-fly.
|
* performing sanity checks on-the-fly. Mirrored orientations
|
||||||
* If the input region of interest equals `CGRectZero`, returns a default `NormalizedRect` covering
|
* (`UIImageOrientationUpMirrored`,`UIImageOrientationDownMirrored`,
|
||||||
* the whole image with rotation set according `imageOrientation`. If `ROIAllowed` is NO, an error
|
|
||||||
* will be returned if the input region of interest is not equal to `CGRectZero`. Mirrored
|
|
||||||
* orientations (`UIImageOrientationUpMirrored`,`UIImageOrientationDownMirrored`,
|
|
||||||
* `UIImageOrientationLeftMirrored`,`UIImageOrientationRightMirrored`) are not supported. An error
|
* `UIImageOrientationLeftMirrored`,`UIImageOrientationRightMirrored`) are not supported. An error
|
||||||
* will be returned if `imageOrientation` is equal to any one of them.
|
* will be returned if `imageOrientation` is equal to any one of them.
|
||||||
*
|
*
|
||||||
* @param roi A `CGRect` specifying the region of interest. If the input region of interest equals
|
|
||||||
* `CGRectZero`, the returned `NormalizedRect` covers the whole image. Make sure that `roi` equals
|
|
||||||
* `CGRectZero` if `ROIAllowed` is NO. Otherwise, an error will be returned.
|
|
||||||
* @param imageSize A `CGSize` specifying the size of the image within which normalized rect is
|
|
||||||
* calculated.
|
|
||||||
* @param imageOrientation A `UIImageOrientation` indicating the rotation to be applied to the
|
* @param imageOrientation A `UIImageOrientation` indicating the rotation to be applied to the
|
||||||
* image. The resulting `NormalizedRect` will convert the `imageOrientation` to degrees clockwise.
|
* image. The resulting `NormalizedRect` will convert the `imageOrientation` to degrees clockwise.
|
||||||
* Mirrored orientations (`UIImageOrientationUpMirrored`, `UIImageOrientationDownMirrored`,
|
* Mirrored orientations (`UIImageOrientationUpMirrored`, `UIImageOrientationDownMirrored`,
|
||||||
* `UIImageOrientationLeftMirrored`, `UIImageOrientationRightMirrored`) are not supported. An error
|
* `UIImageOrientationLeftMirrored`, `UIImageOrientationRightMirrored`) are not supported. An error
|
||||||
* will be returned if `imageOrientation` is equal to any one of them.
|
* will be returned if `imageOrientation` is equal to any one of them.
|
||||||
* @param ROIAllowed Indicates if the `roi` field is allowed to be a value other than `CGRectZero`.
|
* @param imageSize A `CGSize` specifying the size of the image within which normalized rect is
|
||||||
|
* calculated.
|
||||||
|
* @param error Pointer to the memory location where errors if any should be saved. If @c NULL, no
|
||||||
|
* error will be saved.
|
||||||
|
*
|
||||||
|
* @return An optional `NormalizedRect` from the given region of interest and image orientation.
|
||||||
|
*/
|
||||||
|
- (std::optional<mediapipe::NormalizedRect>)normalizedRectWithImageOrientation:
|
||||||
|
(UIImageOrientation)imageOrientation
|
||||||
|
imageSize:(CGSize)imageSize
|
||||||
|
error:(NSError **)error;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a `NormalizedRect` from roi and image orientation for a task which supports roi,
|
||||||
|
* performing sanity checks on-the-fly. If the input region of interest equals `CGRectZero`, returns
|
||||||
|
* a default `NormalizedRect` covering the whole image with rotation set according
|
||||||
|
* `imageOrientation`. Mirrored orientations
|
||||||
|
* (`UIImageOrientationUpMirrored`,`UIImageOrientationDownMirrored`,
|
||||||
|
* `UIImageOrientationLeftMirrored`,`UIImageOrientationRightMirrored`) are not supported. An error
|
||||||
|
* will be returned if `imageOrientation` is equal to any one of them.
|
||||||
|
*
|
||||||
|
* @param roi A `CGRect` specifying the region of interest. If the input region of interest equals
|
||||||
|
* `CGRectZero`, the returned `NormalizedRect` covers the whole image.
|
||||||
|
* @param imageOrientation A `UIImageOrientation` indicating the rotation to be applied to the
|
||||||
|
* image. The resulting `NormalizedRect` will convert the `imageOrientation` to degrees clockwise.
|
||||||
|
* Mirrored orientations (`UIImageOrientationUpMirrored`, `UIImageOrientationDownMirrored`,
|
||||||
|
* `UIImageOrientationLeftMirrored`, `UIImageOrientationRightMirrored`) are not supported. An error
|
||||||
|
* will be returned if `imageOrientation` is equal to any one of them.
|
||||||
|
* @param imageSize A `CGSize` specifying the size of the image within which normalized rect is
|
||||||
|
* calculated.
|
||||||
* @param error Pointer to the memory location where errors if any should be saved. If @c NULL, no
|
* @param error Pointer to the memory location where errors if any should be saved. If @c NULL, no
|
||||||
* error will be saved.
|
* error will be saved.
|
||||||
*
|
*
|
||||||
* @return An optional `NormalizedRect` from the given region of interest and image orientation.
|
* @return An optional `NormalizedRect` from the given region of interest and image orientation.
|
||||||
*/
|
*/
|
||||||
- (std::optional<mediapipe::NormalizedRect>)
|
- (std::optional<mediapipe::NormalizedRect>)
|
||||||
normalizedRectFromRegionOfInterest:(CGRect)roi
|
normalizedRectWithRegionOfInterest:(CGRect)roi
|
||||||
imageSize:(CGSize)imageSize
|
|
||||||
imageOrientation:(UIImageOrientation)imageOrientation
|
imageOrientation:(UIImageOrientation)imageOrientation
|
||||||
ROIAllowed:(BOOL)ROIAllowed
|
imageSize:(CGSize)imageSize
|
||||||
error:(NSError **)error;
|
error:(NSError **)error;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A synchronous method to invoke the C++ task runner to process single image inputs. The call
|
* A synchronous method to invoke the C++ task runner to process single image inputs. The call
|
||||||
* blocks the current thread until a failure status or a successful result is returned.
|
* blocks the current thread until a failure status or a successful result is returned.
|
||||||
|
|
|
@ -91,7 +91,30 @@ static NSString *const kTaskPrefix = @"com.mediapipe.tasks.vision";
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (std::optional<NormalizedRect>)normalizedRectFromRegionOfInterest:(CGRect)roi
|
- (std::optional<NormalizedRect>)normalizedRectWithRegionOfInterest:(CGRect)roi
|
||||||
|
imageOrientation:
|
||||||
|
(UIImageOrientation)imageOrientation
|
||||||
|
imageSize:(CGSize)imageSize
|
||||||
|
error:(NSError **)error {
|
||||||
|
return [self normalizedRectWithRegionOfInterest:roi
|
||||||
|
imageSize:imageSize
|
||||||
|
imageOrientation:imageOrientation
|
||||||
|
ROIAllowed:YES
|
||||||
|
error:error];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (std::optional<NormalizedRect>)normalizedRectWithImageOrientation:
|
||||||
|
(UIImageOrientation)imageOrientation
|
||||||
|
imageSize:(CGSize)imageSize
|
||||||
|
error:(NSError **)error {
|
||||||
|
return [self normalizedRectWithRegionOfInterest:CGRectZero
|
||||||
|
imageSize:imageSize
|
||||||
|
imageOrientation:imageOrientation
|
||||||
|
ROIAllowed:NO
|
||||||
|
error:error];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (std::optional<NormalizedRect>)normalizedRectWithRegionOfInterest:(CGRect)roi
|
||||||
imageSize:(CGSize)imageSize
|
imageSize:(CGSize)imageSize
|
||||||
imageOrientation:
|
imageOrientation:
|
||||||
(UIImageOrientation)imageOrientation
|
(UIImageOrientation)imageOrientation
|
||||||
|
|
|
@ -166,10 +166,9 @@ static const int kMicroSecondsPerMilliSecond = 1000;
|
||||||
regionOfInterest:(CGRect)roi
|
regionOfInterest:(CGRect)roi
|
||||||
error:(NSError **)error {
|
error:(NSError **)error {
|
||||||
std::optional<NormalizedRect> rect =
|
std::optional<NormalizedRect> rect =
|
||||||
[_visionTaskRunner normalizedRectFromRegionOfInterest:roi
|
[_visionTaskRunner normalizedRectWithRegionOfInterest:roi
|
||||||
imageSize:CGSizeMake(image.width, image.height)
|
|
||||||
imageOrientation:image.orientation
|
imageOrientation:image.orientation
|
||||||
ROIAllowed:YES
|
imageSize:CGSizeMake(image.width, image.height)
|
||||||
error:error];
|
error:error];
|
||||||
if (!rect.has_value()) {
|
if (!rect.has_value()) {
|
||||||
return nil;
|
return nil;
|
||||||
|
@ -196,15 +195,18 @@ static const int kMicroSecondsPerMilliSecond = 1000;
|
||||||
outputPacketMap.value()[kClassificationsStreamName.cppString]];
|
outputPacketMap.value()[kClassificationsStreamName.cppString]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (nullable MPPImageClassifierResult *)classifyImage:(MPPImage *)image error:(NSError **)error {
|
||||||
|
return [self classifyImage:image regionOfInterest:CGRectZero error:error];
|
||||||
|
}
|
||||||
|
|
||||||
- (std::optional<PacketMap>)inputPacketMapWithMPPImage:(MPPImage *)image
|
- (std::optional<PacketMap>)inputPacketMapWithMPPImage:(MPPImage *)image
|
||||||
timestampInMilliseconds:(NSInteger)timestampInMilliseconds
|
timestampInMilliseconds:(NSInteger)timestampInMilliseconds
|
||||||
regionOfInterest:(CGRect)roi
|
regionOfInterest:(CGRect)roi
|
||||||
error:(NSError **)error {
|
error:(NSError **)error {
|
||||||
std::optional<NormalizedRect> rect =
|
std::optional<NormalizedRect> rect =
|
||||||
[_visionTaskRunner normalizedRectFromRegionOfInterest:roi
|
[_visionTaskRunner normalizedRectWithRegionOfInterest:roi
|
||||||
imageSize:CGSizeMake(image.width, image.height)
|
|
||||||
imageOrientation:image.orientation
|
imageOrientation:image.orientation
|
||||||
ROIAllowed:YES
|
imageSize:CGSizeMake(image.width, image.height)
|
||||||
error:error];
|
error:error];
|
||||||
if (!rect.has_value()) {
|
if (!rect.has_value()) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
|
@ -225,10 +227,6 @@ static const int kMicroSecondsPerMilliSecond = 1000;
|
||||||
return inputPacketMap;
|
return inputPacketMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (nullable MPPImageClassifierResult *)classifyImage:(MPPImage *)image error:(NSError **)error {
|
|
||||||
return [self classifyImage:image regionOfInterest:CGRectZero error:error];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (nullable MPPImageClassifierResult *)classifyVideoFrame:(MPPImage *)image
|
- (nullable MPPImageClassifierResult *)classifyVideoFrame:(MPPImage *)image
|
||||||
timestampInMilliseconds:(NSInteger)timestampInMilliseconds
|
timestampInMilliseconds:(NSInteger)timestampInMilliseconds
|
||||||
regionOfInterest:(CGRect)roi
|
regionOfInterest:(CGRect)roi
|
||||||
|
|
|
@ -160,10 +160,8 @@ static NSString *const kTaskName = @"objectDetector";
|
||||||
timestampInMilliseconds:(NSInteger)timestampInMilliseconds
|
timestampInMilliseconds:(NSInteger)timestampInMilliseconds
|
||||||
error:(NSError **)error {
|
error:(NSError **)error {
|
||||||
std::optional<NormalizedRect> rect =
|
std::optional<NormalizedRect> rect =
|
||||||
[_visionTaskRunner normalizedRectFromRegionOfInterest:CGRectZero
|
[_visionTaskRunner normalizedRectWithImageOrientation:image.orientation
|
||||||
imageSize:CGSizeMake(image.width, image.height)
|
imageSize:CGSizeMake(image.width, image.height)
|
||||||
imageOrientation:image.orientation
|
|
||||||
ROIAllowed:NO
|
|
||||||
error:error];
|
error:error];
|
||||||
if (!rect.has_value()) {
|
if (!rect.has_value()) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
|
@ -188,10 +186,8 @@ static NSString *const kTaskName = @"objectDetector";
|
||||||
regionOfInterest:(CGRect)roi
|
regionOfInterest:(CGRect)roi
|
||||||
error:(NSError **)error {
|
error:(NSError **)error {
|
||||||
std::optional<NormalizedRect> rect =
|
std::optional<NormalizedRect> rect =
|
||||||
[_visionTaskRunner normalizedRectFromRegionOfInterest:roi
|
[_visionTaskRunner normalizedRectWithImageOrientation:image.orientation
|
||||||
imageSize:CGSizeMake(image.width, image.height)
|
imageSize:CGSizeMake(image.width, image.height)
|
||||||
imageOrientation:image.orientation
|
|
||||||
ROIAllowed:NO
|
|
||||||
error:error];
|
error:error];
|
||||||
if (!rect.has_value()) {
|
if (!rect.has_value()) {
|
||||||
return nil;
|
return nil;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user