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

Support 3-channel RGB images for Mac Python

Browse Source 
PiperOrigin-RevId: 577240413
This commit is contained in:
Sebastian Schmidt 2023-10-27 10:32:11 -07:00 committed by Copybara-Service
parent eaf0807849
commit d73ef24406
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mediapipe/python/pybind/image.cc
View File

@ -244,12 +244,26 @@ void ImageSubmodule(pybind11::module* module) {
image.def_static( image.def_static(
"create_from_file", "create_from_file",
[](const std::string& file_name) { [](const std::string& file_name) {
unsigned char* image_data = nullptr;
int width; int width;
int height; int height;
int channels; int channels;
auto* image_data =
stbi_load(file_name.c_str(), &width, &height, &channels, #if TARGET_OS_OSX && !MEDIAPIPE_DISABLE_GPU
/*desired_channels=*/0); // Our ObjC layer does not support 3-channel images, so we read the
// number of channels first and request RGBA if needed.
if (stbi_info(file_name.c_str(), &width, &height, &channels)) {
if (channels == 3) {
channels = 4;
}
int unused;
image_data =
stbi_load(file_name.c_str(), &width, &height, &unused, channels);
}
#else
image_data = stbi_load(file_name.c_str(), &width, &height, &channels,
/*desired_channels=*/0);
#endif // TARGET_OS_OSX && !MEDIAPIPE_DISABLE_GPU
if (image_data == nullptr) { if (image_data == nullptr) {
throw RaisePyError(PyExc_RuntimeError, throw RaisePyError(PyExc_RuntimeError,
absl::StrFormat("Image decoding failed (%s): %s", absl::StrFormat("Image decoding failed (%s): %s",
@ -263,11 +277,13 @@ void ImageSubmodule(pybind11::module* module) {
ImageFormat::GRAY8, width, height, width, image_data, ImageFormat::GRAY8, width, height, width, image_data,
stbi_image_free); stbi_image_free);
break; break;
#if !TARGET_OS_OSX || MEDIAPIPE_DISABLE_GPU
case 3: case 3:
image_frame = std::make_shared<ImageFrame>( image_frame = std::make_shared<ImageFrame>(
ImageFormat::SRGB, width, height, 3 * width, image_data, ImageFormat::SRGB, width, height, 3 * width, image_data,
stbi_image_free); stbi_image_free);
break; break;
#endif // !TARGET_OS_OSX || MEDIAPIPE_DISABLE_GPU
case 4: case 4:
image_frame = std::make_shared<ImageFrame>( image_frame = std::make_shared<ImageFrame>(
ImageFormat::SRGBA, width, height, 4 * width, image_data, ImageFormat::SRGBA, width, height, 4 * width, image_data,