Added pose landmarker result helpers
This commit is contained in:
parent
8fc3a0473f
commit
c4315c500d
|
@ -46,7 +46,7 @@ NS_SWIFT_NAME(PoseLandmarkerResult)
|
||||||
*/
|
*/
|
||||||
- (instancetype)initWithLandmarks:(NSArray<NSArray<MPPNormalizedLandmark *> *> *)landmarks
|
- (instancetype)initWithLandmarks:(NSArray<NSArray<MPPNormalizedLandmark *> *> *)landmarks
|
||||||
worldLandmarks:(NSArray<NSArray<MPPLandmark *> *> *)worldLandmarks
|
worldLandmarks:(NSArray<NSArray<MPPLandmark *> *> *)worldLandmarks
|
||||||
segmentationMasks:(NSArray<MPPMask *> *)segmentationMasks
|
segmentationMasks:(nullable NSArray<MPPMask *> *)segmentationMasks
|
||||||
timestampInMilliseconds:(NSInteger)timestampInMilliseconds NS_DESIGNATED_INITIALIZER;
|
timestampInMilliseconds:(NSInteger)timestampInMilliseconds NS_DESIGNATED_INITIALIZER;
|
||||||
|
|
||||||
- (instancetype)initWithTimestampInMilliseconds:(NSInteger)timestampInMilliseconds NS_UNAVAILABLE;
|
- (instancetype)initWithTimestampInMilliseconds:(NSInteger)timestampInMilliseconds NS_UNAVAILABLE;
|
||||||
|
|
|
@ -36,3 +36,20 @@ objc_library(
|
||||||
"//mediapipe/tasks/ios/vision/pose_landmarker:MPPPoseLandmarkerOptions",
|
"//mediapipe/tasks/ios/vision/pose_landmarker:MPPPoseLandmarkerOptions",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
objc_library(
|
||||||
|
name = "MPPPoseLandmarkerResultHelpers",
|
||||||
|
srcs = ["sources/MPPPoseLandmarkerResult+Helpers.mm"],
|
||||||
|
hdrs = ["sources/MPPPoseLandmarkerResult+Helpers.h"],
|
||||||
|
copts = [
|
||||||
|
"-ObjC++",
|
||||||
|
"-std=c++17",
|
||||||
|
"-x objective-c++",
|
||||||
|
],
|
||||||
|
deps = [
|
||||||
|
"//mediapipe/framework:packet",
|
||||||
|
"//mediapipe/framework/formats:image",
|
||||||
|
"//mediapipe/framework/formats:landmark_cc_proto",
|
||||||
|
"//mediapipe/tasks/ios/components/containers/utils:MPPLandmarkHelpers",
|
||||||
|
"//mediapipe/tasks/ios/vision/pose_landmarker:MPPPoseLandmarkerResult",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
// Copyright 2023 The MediaPipe Authors.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
#import "mediapipe/tasks/ios/vision/pose_landmarker/sources/MPPPoseLandmarkerResult.h"
|
||||||
|
|
||||||
|
#include "mediapipe/framework/formats/image.h"
|
||||||
|
#include "mediapipe/framework/formats/landmark.pb.h"
|
||||||
|
#include "mediapipe/framework/packet.h"
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
|
static const int kMicroSecondsPerMilliSecond = 1000;
|
||||||
|
|
||||||
|
@interface MPPPoseLandmarkerResult (Helpers)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates an `MPPPoseLandmarkerResult` from landmarks, world landmarks and segmentation mask
|
||||||
|
* packets.
|
||||||
|
*
|
||||||
|
* @param landmarksPacket A MediaPipe packet wrapping a `std::vector<NormalizedlandmarkListProto>`.
|
||||||
|
* @param worldLandmarksPacket A MediaPipe packet wrapping a `std::vector<LandmarkListProto>`.
|
||||||
|
* @param segmentationMasksPacket a MediaPipe packet wrapping a `std::vector<Image>`.
|
||||||
|
*
|
||||||
|
* @return An `MPPPoseLandmarkerResult` object that contains the hand landmark detection
|
||||||
|
* results.
|
||||||
|
*/
|
||||||
|
+ (MPPPoseLandmarkerResult *)
|
||||||
|
poseLandmarkerResultWithLandmarksPacket:(const mediapipe::Packet &)landmarksPacket
|
||||||
|
worldLandmarksPacket:(const mediapipe::Packet &)worldLandmarksPacket
|
||||||
|
segmentationMasksPacket:(const mediapipe::Packet *)segmentationMasksPacket;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates an `MPPPoseLandmarkerResult` from landmarks, world landmarks and segmentation mask
|
||||||
|
* images.
|
||||||
|
*
|
||||||
|
* @param landmarksProto A vector of protos of type `std::vector<NormalizedlandmarkListProto>`.
|
||||||
|
* @param worldLandmarksPacket A vector of protos of type `std::vector<LandmarkListProto>`.
|
||||||
|
* @param segmentationMasks A vector of type `std::vector<Image>`.
|
||||||
|
* @param timestampInMilliSeconds The timestamp of the Packet that contained the result.
|
||||||
|
*
|
||||||
|
* @return An `MPPPoseLandmarkerResult` object that contains the pose landmark detection
|
||||||
|
* results.
|
||||||
|
*/
|
||||||
|
+ (MPPPoseLandmarkerResult *)
|
||||||
|
poseLandmarkerResultWithLandmarksProto:
|
||||||
|
(const std::vector<mediapipe::NormalizedLandmarkList> &)landmarksProto
|
||||||
|
worldLandmarksProto:
|
||||||
|
(const std::vector<mediapipe::LandmarkList> &)worldLandmarksProto
|
||||||
|
segmentationMasks:(const std::vector<mediapipe::Image> *)segmentationMasks
|
||||||
|
timestampInMilliSeconds:(NSInteger)timestampInMilliseconds;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
|
NS_ASSUME_NONNULL_END
|
|
@ -0,0 +1,122 @@
|
||||||
|
// Copyright 2023 The MediaPipe Authors.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
#import "mediapipe/tasks/ios/vision/pose_landmarker/utils/sources/MPPPoseLandmarkerResult+Helpers.h"
|
||||||
|
|
||||||
|
#import "mediapipe/tasks/ios/components/containers/utils/sources/MPPLandmark+Helpers.h"
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
using LandmarkListProto = ::mediapipe::LandmarkList;
|
||||||
|
using NormalizedLandmarkListProto = ::mediapipe::NormalizedLandmarkList;
|
||||||
|
using ::mediapipe::Image;
|
||||||
|
using ::mediapipe::Packet;
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
@implementation MPPPoseLandmarkerResult (Helpers)
|
||||||
|
|
||||||
|
+ (MPPPoseLandmarkerResult *)emptyPoseLandmarkerResultWithTimestampInMilliseconds:
|
||||||
|
(NSInteger)timestampInMilliseconds {
|
||||||
|
return [[MPPPoseLandmarkerResult alloc] initWithLandmarks:@[]
|
||||||
|
worldLandmarks:@[]
|
||||||
|
segmentationMasks:@[]
|
||||||
|
timestampInMilliseconds:timestampInMilliseconds];
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (MPPPoseLandmarkerResult *)
|
||||||
|
poseLandmarkerResultWithLandmarksProto:
|
||||||
|
(const std::vector<NormalizedLandmarkListProto> &)landmarksProto
|
||||||
|
worldLandmarksProto:
|
||||||
|
(const std::vector<LandmarkListProto> &)worldLandmarksProto
|
||||||
|
segmentationMasks:(const std::vector<Image> *)segmentationMasks
|
||||||
|
timestampInMilliSeconds:(NSInteger)timestampInMilliseconds {
|
||||||
|
NSMutableArray<NSMutableArray<MPPNormalizedLandmark *> *> *multiplePoseLandmarks =
|
||||||
|
[NSMutableArray arrayWithCapacity:(NSUInteger)landmarksProto.size()];
|
||||||
|
|
||||||
|
for (const auto &landmarkListProto : landmarksProto) {
|
||||||
|
NSMutableArray<MPPNormalizedLandmark *> *landmarks =
|
||||||
|
[NSMutableArray arrayWithCapacity:(NSUInteger)landmarkListProto.landmark().size()];
|
||||||
|
for (const auto &normalizedLandmarkProto : landmarkListProto.landmark()) {
|
||||||
|
MPPNormalizedLandmark *normalizedLandmark =
|
||||||
|
[MPPNormalizedLandmark normalizedLandmarkWithProto:normalizedLandmarkProto];
|
||||||
|
[landmarks addObject:normalizedLandmark];
|
||||||
|
}
|
||||||
|
[multiplePoseLandmarks addObject:landmarks];
|
||||||
|
}
|
||||||
|
|
||||||
|
NSMutableArray<NSMutableArray<MPPLandmark *> *> *multiplePoseWorldLandmarks =
|
||||||
|
[NSMutableArray arrayWithCapacity:(NSUInteger)worldLandmarksProto.size()];
|
||||||
|
|
||||||
|
for (const auto &worldLandmarkListProto : worldLandmarksProto) {
|
||||||
|
NSMutableArray<MPPLandmark *> *worldLandmarks =
|
||||||
|
[NSMutableArray arrayWithCapacity:(NSUInteger)worldLandmarkListProto.landmark().size()];
|
||||||
|
for (const auto &landmarkProto : worldLandmarkListProto.landmark()) {
|
||||||
|
MPPLandmark *landmark = [MPPLandmark landmarkWithProto:landmarkProto];
|
||||||
|
[worldLandmarks addObject:landmark];
|
||||||
|
}
|
||||||
|
[multiplePoseWorldLandmarks addObject:worldLandmarks];
|
||||||
|
}
|
||||||
|
|
||||||
|
NSMutableArray<MPPMask *> *confidenceMasks =
|
||||||
|
[NSMutableArray arrayWithCapacity:(NSUInteger)segmentationMasks->size()];
|
||||||
|
|
||||||
|
for (const auto &segmentationMask : *segmentationMasks) {
|
||||||
|
[confidenceMasks addObject:[[MPPMask alloc] initWithFloat32Data:(float *)segmentationMask
|
||||||
|
.GetImageFrameSharedPtr()
|
||||||
|
.get()
|
||||||
|
->PixelData()
|
||||||
|
width:segmentationMask.width()
|
||||||
|
height:segmentationMask.height()
|
||||||
|
/** Always deep copy */
|
||||||
|
shouldCopy:YES]];
|
||||||
|
}
|
||||||
|
|
||||||
|
MPPPoseLandmarkerResult *poseLandmarkerResult =
|
||||||
|
[[MPPPoseLandmarkerResult alloc] initWithLandmarks:multiplePoseLandmarks
|
||||||
|
worldLandmarks:multiplePoseWorldLandmarks
|
||||||
|
segmentationMasks:confidenceMasks
|
||||||
|
timestampInMilliseconds:timestampInMilliseconds];
|
||||||
|
return poseLandmarkerResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (MPPPoseLandmarkerResult *)
|
||||||
|
poseLandmarkerResultWithLandmarksPacket:(const Packet &)landmarksPacket
|
||||||
|
worldLandmarksPacket:(const Packet &)worldLandmarksPacket
|
||||||
|
segmentationMasksPacket:(const Packet *)segmentationMasksPacket {
|
||||||
|
NSInteger timestampInMilliseconds =
|
||||||
|
(NSInteger)(landmarksPacket.Timestamp().Value() / kMicroSecondsPerMilliSecond);
|
||||||
|
|
||||||
|
if (landmarksPacket.IsEmpty()) {
|
||||||
|
return [MPPPoseLandmarkerResult
|
||||||
|
emptyPoseLandmarkerResultWithTimestampInMilliseconds:timestampInMilliseconds];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!landmarksPacket.ValidateAsType<std::vector<NormalizedLandmarkListProto>>().ok() ||
|
||||||
|
!worldLandmarksPacket.ValidateAsType<std::vector<LandmarkListProto>>().ok()) {
|
||||||
|
return [MPPPoseLandmarkerResult
|
||||||
|
emptyPoseLandmarkerResultWithTimestampInMilliseconds:timestampInMilliseconds];
|
||||||
|
}
|
||||||
|
|
||||||
|
const std::vector<Image> *segmentationMasks =
|
||||||
|
segmentationMasksPacket ? &(segmentationMasksPacket->Get<std::vector<Image>>()) : nullptr;
|
||||||
|
|
||||||
|
return [MPPPoseLandmarkerResult
|
||||||
|
poseLandmarkerResultWithLandmarksProto:landmarksPacket
|
||||||
|
.Get<std::vector<NormalizedLandmarkListProto>>()
|
||||||
|
worldLandmarksProto:worldLandmarksPacket
|
||||||
|
.Get<std::vector<LandmarkListProto>>()
|
||||||
|
segmentationMasks:segmentationMasks
|
||||||
|
timestampInMilliSeconds:timestampInMilliseconds];
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
Loading…
Reference in New Issue
Block a user