cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 348c42c01b into f15da632de

Browse Source
This commit is contained in:
mapleyuan 2020-11-05 12:21:05 +00:00 committed by GitHub
commit aa1e9a829e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediapipe/calculators/image/color_convert_calculator.cc
View File

@ -57,6 +57,8 @@ constexpr char kGrayOutTag[] = "GRAY_OUT";
// RGB -> RGBA // RGB -> RGBA
// RGBA -> BGRA // RGBA -> BGRA
// BGRA -> RGBA // BGRA -> RGBA
// RGBA -> GRAY
// //
// This calculator only supports a single input stream and output stream at a // This calculator only supports a single input stream and output stream at a
// time. If more than one input stream or output stream is present, the // time. If more than one input stream or output stream is present, the
@ -196,6 +198,12 @@ REGISTER_CALCULATOR(ColorConvertCalculator);
cv::COLOR_RGBA2BGRA, cc); cv::COLOR_RGBA2BGRA, cc);
} }
// RGBA -> GRAY
if (cc->Inputs().HasTag(kRgbaInTag) && cc->Outputs().HasTag(kGrayOutTag)) {
return ConvertAndOutput(kRgbaInTag, kGrayOutTag, ImageFormat::GRAY8,
cv::COLOR_RGBA2GRAY, cc);
}
return ::mediapipe::InvalidArgumentErrorBuilder(MEDIAPIPE_LOC) return ::mediapipe::InvalidArgumentErrorBuilder(MEDIAPIPE_LOC)
<< "Unsupported image format conversion."; << "Unsupported image format conversion.";
} }

8
mediapipe/calculators/util/detection_unique_id_calculator.cc
View File

@ -33,8 +33,8 @@ inline int GetNextDetectionId() { return ++detection_id; }
} // namespace } // namespace
// Assign a unique id to detections. // Assign a unique id to detections.
// Note that the calculator will consume the input vector of Detection or // Note that the calculator will consume or copy the input vector of Detection or
// DetectionList. So the input stream can not be connected to other calculators. // DetectionList.
// //
// Example config: // Example config:
// node { // node {
@ -76,7 +76,7 @@ REGISTER_CALCULATOR(DetectionUniqueIdCalculator);
if (cc->Inputs().HasTag(kDetectionListTag) && if (cc->Inputs().HasTag(kDetectionListTag) &&
!cc->Inputs().Tag(kDetectionListTag).IsEmpty()) { !cc->Inputs().Tag(kDetectionListTag).IsEmpty()) {
auto result = auto result =
cc->Inputs().Tag(kDetectionListTag).Value().Consume<DetectionList>(); cc->Inputs().Tag(kDetectionListTag).Value().ConsumeOrCopy<DetectionList>();
if (result.ok()) { if (result.ok()) {
auto detection_list = std::move(result).ValueOrDie(); auto detection_list = std::move(result).ValueOrDie();
for (Detection& detection : *detection_list->mutable_detection()) { for (Detection& detection : *detection_list->mutable_detection()) {
@ -93,7 +93,7 @@ REGISTER_CALCULATOR(DetectionUniqueIdCalculator);
auto result = cc->Inputs() auto result = cc->Inputs()
.Tag(kDetectionsTag) .Tag(kDetectionsTag)
.Value() .Value()
.Consume<std::vector<Detection>>(); .ConsumeOrCopy<std::vector<Detection>>();
if (result.ok()) { if (result.ok()) {
auto detections = std::move(result).ValueOrDie(); auto detections = std::move(result).ValueOrDie();
for (Detection& detection : *detections) { for (Detection& detection : *detections) {