Project import generated by Copybara.

GitOrigin-RevId: b2062656e5b3d33264e28ed0cbca31c4b93fe1bf

mediapipe/examples/desktop/autoflip/calculators/content_zooming_calculator.cc

@@ -324,6 +324,19 @@ void MakeStaticFeatures(const int top_border, const int bottom_border,
   int path_offset_y;
   MP_RETURN_IF_ERROR(path_solver_offset_->GetState(&path_offset_y));
 
+  // Prevent box from extending beyond the image after camera smoothing.
+  if (path_offset_y - ceil(path_height / 2.0) < 0) {
+    path_offset_y = ceil(path_height / 2.0);
+  } else if (path_offset_y + ceil(path_height / 2.0) > frame_height_) {
+    path_offset_y = frame_height_ - ceil(path_height / 2.0);
+  }
+  int path_width = path_height * target_aspect_;
+  if (path_offset_x - ceil(path_width / 2.0) < 0) {
+    path_offset_x = ceil(path_width / 2.0);
+  } else if (path_offset_x + ceil(path_width / 2.0) > frame_width_) {
+    path_offset_x = frame_width_ - ceil(path_width / 2.0);
+  }
+
   // Convert to top/bottom borders to remove.
   int path_top = path_offset_y - path_height / 2;
   int path_bottom = frame_height_ - (path_offset_y + path_height / 2);

mediapipe/examples/desktop/autoflip/calculators/content_zooming_calculator_test.cc

@@ -344,6 +344,28 @@ TEST(ContentZoomingCalculatorTest, ZoomTestPairSize) {
   CheckBorder(static_features, 1000, 1000, 495, 395);
 }
 
+TEST(ContentZoomingCalculatorTest, ZoomTestNearOutsideBorder) {
+  auto runner = ::absl::make_unique<CalculatorRunner>(
+      ParseTextProtoOrDie<CalculatorGraphConfig::Node>(kConfigD));
+  AddDetection(cv::Rect_<float>(.95, .95, .05, .05), 0, runner.get());
+  AddDetection(cv::Rect_<float>(.9, .9, .1, .1), 1000000, runner.get());
+  MP_ASSERT_OK(runner->Run());
+  CheckCropRect(972, 972, 55, 55, 0,
+                runner->Outputs().Tag("CROP_RECT").packets);
+  CheckCropRect(958, 958, 83, 83, 1,
+                runner->Outputs().Tag("CROP_RECT").packets);
+}
+
+TEST(ContentZoomingCalculatorTest, ZoomTestNearInsideBorder) {
+  auto runner = ::absl::make_unique<CalculatorRunner>(
+      ParseTextProtoOrDie<CalculatorGraphConfig::Node>(kConfigD));
+  AddDetection(cv::Rect_<float>(0, 0, .05, .05), 0, runner.get());
+  AddDetection(cv::Rect_<float>(0, 0, .1, .1), 1000000, runner.get());
+  MP_ASSERT_OK(runner->Run());
+  CheckCropRect(28, 28, 55, 55, 0, runner->Outputs().Tag("CROP_RECT").packets);
+  CheckCropRect(42, 42, 83, 83, 1, runner->Outputs().Tag("CROP_RECT").packets);
+}
+
 }  // namespace
 }  // namespace autoflip
 

mediapipe/examples/desktop/autoflip/quality/kinematic_path_solver.cc

@@ -10,6 +10,10 @@ namespace autoflip {
     current_time_ = time_us;
     initialized_ = true;
     current_velocity_deg_per_s_ = 0;
+    RET_CHECK_GT(pixels_per_degree_, 0)
+        << "pixels_per_degree must be larger than 0.";
+    RET_CHECK_GE(options_.min_motion_to_reframe(), options_.reframe_window())
+        << "Reframe window cannot exceed min_motion_to_reframe.";
     return ::mediapipe::OkStatus();
   }
 
@@ -22,6 +26,14 @@ namespace autoflip {
   if (abs(delta_degs) < options_.min_motion_to_reframe()) {
     position = current_position_px_;
     delta_degs = 0;
+  } else if (delta_degs > 0) {
+    // Apply new position, less the reframe window size.
+    position = position - pixels_per_degree_ * options_.reframe_window();
+    delta_degs = (position - current_position_px_) / pixels_per_degree_;
+  } else {
+    // Apply new position, plus the reframe window size.
+    position = position + pixels_per_degree_ * options_.reframe_window();
+    delta_degs = (position - current_position_px_) / pixels_per_degree_;
   }
 
   // Time and position updates.

mediapipe/examples/desktop/autoflip/quality/kinematic_path_solver.proto

@@ -10,4 +10,9 @@ message KinematicOptions {
   optional double max_velocity = 2 [default = 18];
   // Min motion (in degrees) to react in pixels.
   optional float min_motion_to_reframe = 3 [default = 1.8];
+  // When motion exceeds min_motion_to_reframe, move within this distance of the
+  // camera from the starting direction.  Setting this value non-zero reduces
+  // total reframe distance on average.  Value cannot exceed
+  // min_motion_to_reframe value.
+  optional float reframe_window = 4 [default = 0];
 }

mediapipe/examples/desktop/autoflip/quality/kinematic_path_solver_test.cc

@@ -27,6 +27,12 @@ namespace mediapipe {
 namespace autoflip {
 namespace {
 
+TEST(KinematicPathSolverTest, FailZeroPixelsPerDegree) {
+  KinematicOptions options;
+  KinematicPathSolver solver(options, 0, 1000, 0);
+  EXPECT_FALSE(solver.AddObservation(500, kMicroSecInSec * 0).ok());
+}
+
 TEST(KinematicPathSolverTest, FailNotInitializedState) {
   KinematicOptions options;
   KinematicPathSolver solver(options, 0, 1000, 1000.0 / kWidthFieldOfView);
@@ -109,6 +115,38 @@ TEST(KinematicPathSolverTest, PassEnoughMotionSmallImg) {
   EXPECT_EQ(state, 410);
 }
 
+TEST(KinematicPathSolverTest, FailReframeWindowSetting) {
+  KinematicOptions options;
+  // Set min motion to 1deg
+  options.set_min_motion_to_reframe(1.0);
+  options.set_update_rate(1);
+  options.set_max_velocity(1000);
+  // Set reframe window size to .75 for test.
+  options.set_reframe_window(1.1);
+  // Set degrees / pixel to 16.6
+  KinematicPathSolver solver(options, 0, 1000, 1000.0 / kWidthFieldOfView);
+  ASSERT_FALSE(solver.AddObservation(500, kMicroSecInSec * 0).ok());
+}
+
+TEST(KinematicPathSolverTest, PassReframeWindow) {
+  KinematicOptions options;
+  // Set min motion to 1deg
+  options.set_min_motion_to_reframe(1.0);
+  options.set_update_rate(1);
+  options.set_max_velocity(1000);
+  // Set reframe window size to .75 for test.
+  options.set_reframe_window(0.75);
+  // Set degrees / pixel to 16.6
+  KinematicPathSolver solver(options, 0, 1000, 1000.0 / kWidthFieldOfView);
+  int state;
+  MP_ASSERT_OK(solver.AddObservation(500, kMicroSecInSec * 0));
+  // Move target by 20px / 16.6 = 1.2deg
+  MP_ASSERT_OK(solver.AddObservation(520, kMicroSecInSec * 1));
+  MP_ASSERT_OK(solver.GetState(&state));
+  // Expect cam to move 1.2-.75 deg, * 16.6 = 7.47px + 500 =
+  EXPECT_EQ(state, 507);
+}
+
 TEST(KinematicPathSolverTest, PassUpdateRate) {
   KinematicOptions options;
   options.set_min_motion_to_reframe(1.0);

mediapipe/examples/desktop/youtube8m/generate_input_sequence_example.py

@@ -30,7 +30,7 @@ SECONDS_TO_MICROSECONDS = 1000000
 
 
 def bytes23(string):
-  """Creates a bytes string in either Python 2 or  3."""
+  """Creates a bytes string in either Python 2 or 3."""
   if sys.version_info >= (3, 0):
     return bytes(string, 'utf8')
   else: