Moved frame buffer null check to utils

Author: priankakariat

tensorflow_lite_support/c/task/vision/image_classifier.cc

@@ -183,14 +183,8 @@ TfLiteClassificationResult* TfLiteImageClassifierClassifyWithRoi(
     return nullptr;
   }
 
-  if (frame_buffer == nullptr) {
-    ::tflite::support::CreateTfLiteSupportError(
-        kInvalidArgumentError, "Expected non null frame buffer.", error);
-    return nullptr;
-  }
-
   StatusOr<std::unique_ptr<FrameBufferCpp>> cpp_frame_buffer_status =
-      ::tflite::task::vision::CreateCppFrameBuffer(*frame_buffer);
+      ::tflite::task::vision::CreateCppFrameBuffer(frame_buffer);
   if (!cpp_frame_buffer_status.ok()) {
     tflite::support::CreateTfLiteSupportErrorWithStatus(
         cpp_frame_buffer_status.status(), error);

tensorflow_lite_support/c/task/vision/utils/BUILD

@@ -16,5 +16,6 @@ cc_library(
     deps = [
         "//tensorflow_lite_support/c/task/vision/core:frame_buffer",
         "//tensorflow_lite_support/cc/task/vision/utils:frame_buffer_common_utils",
+        "//tensorflow_lite_support/cc:common",
     ],
 )

tensorflow_lite_support/c/task/vision/utils/frame_buffer_cpp_c_utils.cc

@@ -15,23 +15,33 @@ limitations under the License.
 
 #include "tensorflow_lite_support/c/task/vision/utils/frame_buffer_cpp_c_utils.h"
 
+#include "external/com_google_absl/absl/strings/str_format.h"
+#include "tensorflow_lite_support/cc/common.h"
+
 namespace tflite {
 namespace task {
 namespace vision {
 
 namespace {
 using FrameBufferCpp = ::tflite::task::vision::FrameBuffer;
 using ::tflite::support::StatusOr;
+using ::tflite::support::TfLiteSupportStatus;
 }  // namespace
 
 StatusOr<std::unique_ptr<FrameBufferCpp>> CreateCppFrameBuffer(
-    const TfLiteFrameBuffer& frame_buffer) {
+    const TfLiteFrameBuffer* frame_buffer) {
+  if (frame_buffer == nullptr)
+    return CreateStatusWithPayload(
+        absl::StatusCode::kInvalidArgument,
+        absl::StrFormat("Expected non null frame buffer."),
+        TfLiteSupportStatus::kInvalidArgumentError);
+
   FrameBufferCpp::Format frame_buffer_format =
-      FrameBufferCpp::Format(frame_buffer.format);
+      FrameBufferCpp::Format(frame_buffer->format);
 
   return CreateFromRawBuffer(
-      frame_buffer.buffer,
-      {frame_buffer.dimension.width, frame_buffer.dimension.height},
+      frame_buffer->buffer,
+      {frame_buffer->dimension.width, frame_buffer->dimension.height},
       frame_buffer_format);
 }
 

tensorflow_lite_support/c/task/vision/utils/frame_buffer_cpp_c_utils.h

@@ -28,7 +28,7 @@ namespace task {
 namespace vision {
 
 tflite::support::StatusOr<std::unique_ptr<tflite::task::vision::FrameBuffer>>
-CreateCppFrameBuffer(const TfLiteFrameBuffer& frame_buffer);
+CreateCppFrameBuffer(const TfLiteFrameBuffer* frame_buffer);
 
 }  // namespace vision
 }  // namespace task