Apply suggestions from code review

Co-authored-by: Junrou Nishida <[email protected]>
homuler · Sep 23, 2022 · c374d61 · c374d61
1 parent d2d2ca5
commit c374d61
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/mediapipe_api/framework/formats/matrix_data.cc b/mediapipe_api/framework/formats/matrix_data.cc
@@ -6,33 +6,30 @@
 
 #include "mediapipe_api/framework/formats/matrix_data.h"
 
-MpReturnCode mp__MakeMatrixFramePacket__PKc_i(const char* matrix_data_serialized, int size, mediapipe::Packet** packet_out) {
-  TRY
-    mediapipe::Matrix matrix;
+inline mediapipe::MatrixData& ParseFromStringAsMatrixData(const char* serialized_matrix_data, int size) {
+  mediapipe::MatrixData matrix_data;
+  CHECK(matrix_data.ParseFromString(std::string(serialized_matrix_data, size)));
 
-    // convert matrix data from char into mediapipe::MatrixData
-    std::string content;
-    mediapipe::MatrixData matrix_data;
-    CHECK(matrix_data.ParseFromString(std::string(matrix_data_serialized, size)));
+  return matrix_data;
+}
+
+MpReturnCode mp__MakeMatrixPacket__PKc_i(const char* serialized_matrix_data, int size, mediapipe::Packet** packet_out) {
+  TRY
+    auto matrix_data = ParseFromStringAsMatrixData(serialized_matrix_data, size);
 
-    // fill matrix with data from matrix_data_serialized
+    mediapipe::Matrix matrix;
     mediapipe::MatrixFromMatrixDataProto(matrix_data, &matrix);
 
     *packet_out = new mediapipe::Packet{mediapipe::MakePacket<mediapipe::Matrix>(matrix)};
     RETURN_CODE(MpReturnCode::Success);
   CATCH_EXCEPTION
 }
 
-MpReturnCode mp__MakeMatrixPacket_At__PKc_i_Rt(const char* matrix_data_serialized, int size, mediapipe::Timestamp* timestamp, mediapipe::Packet** packet_out) {
+MpReturnCode mp__MakeMatrixPacket_At__PKc_i_Rt(const char* serialized_matrix_data, int size, mediapipe::Timestamp* timestamp, mediapipe::Packet** packet_out) {
   TRY
-    mediapipe::Matrix matrix;
+    auto matrix_data = ParseFromStringAsMatrixData(serialized_matrix_data, size);
 
-    // convert matrix data from char into mediapipe::MatrixData
-    std::string content;
-    mediapipe::MatrixData matrix_data;
-    CHECK(matrix_data.ParseFromString(std::string(matrix_data_serialized, size)));
-
-    // fill matrix with data from matrix_data_serialized
+    mediapipe::Matrix matrix;
     mediapipe::MatrixFromMatrixDataProto(matrix_data, &matrix);
 
     *packet_out = new mediapipe::Packet{mediapipe::MakePacket<mediapipe::Matrix>(matrix).At(*timestamp)};