commit 6bdcc373ac7e633af04f180a96f0ed8df5d4b8b2
author Austin Schuh <austin.linux@gmail.com> Thu Jun 27 14:49:11 2024 -0700
committer Austin Schuh <austin.linux@gmail.com> Wed Jul 10 12:21:13 2024 -0700
tree 65ccbe993ae76d55506f89886895a5bf9a3ecb76
parent 93a83a2377a6785ebd40de83aa3953c3366134b1

Remove usage of CHECK_NOTNULL

We want to switch to absl logging instead of glog.  gtest and ceres are
going there, and we already have absl as a dependency.  ABSL doesn't
have CHECK_NOTNULL, and we can move things over in an easier to review
fashion.

Change-Id: Ifd9a11ec34a2357cec43f88dba015db9c28ed2cf
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

frc971/image_streamer/image_streamer.cc

diff --git a/frc971/image_streamer/image_streamer.cc b/frc971/image_streamer/image_streamer.cc
index 6c9a732..b89adc0 100644
--- a/frc971/image_streamer/image_streamer.cc
+++ b/frc971/image_streamer/image_streamer.cc
@@ -175,9 +175,10 @@
 
     GST_BUFFER_PTS(buffer) = image.monotonic_timestamp_ns();
 
-    GstCaps *caps = CHECK_NOTNULL(gst_caps_new_simple(
+    GstCaps *caps = gst_caps_new_simple(
         "video/x-raw", "width", G_TYPE_INT, image.cols(), "height", G_TYPE_INT,
-        image.rows(), "format", G_TYPE_STRING, "YUY2", nullptr));
+        image.rows(), "format", G_TYPE_STRING, "YUY2", nullptr);
+    CHECK(caps != nullptr);
 
     GstSample *sample = gst_sample_new(buffer, caps, nullptr, nullptr);
 
@@ -314,7 +315,8 @@
   }
 
   if (sender_.valid()) {
-    const GstCaps *caps = CHECK_NOTNULL(gst_sample_get_caps(sample));
+    const GstCaps *caps = gst_sample_get_caps(sample);
+    CHECK(caps != nullptr);
     CHECK_GT(gst_caps_get_size(caps), 0U);
     const GstStructure *str = gst_caps_get_structure(caps, 0);
 
@@ -324,7 +326,8 @@
     CHECK(gst_structure_get_int(str, "width", &width));
     CHECK(gst_structure_get_int(str, "height", &height));
 
-    GstBuffer *buffer = CHECK_NOTNULL(gst_sample_get_buffer(sample));
+    GstBuffer *buffer = gst_sample_get_buffer(sample);
+    CHECK(buffer != nullptr);
 
     const gsize size = gst_buffer_get_size(buffer);
 
@@ -410,7 +413,7 @@
   {
     GstObject *ice = nullptr;
     g_object_get(G_OBJECT(webrtcbin_), "ice-agent", &ice, nullptr);
-    CHECK_NOTNULL(ice);
+    CHECK(ice != nullptr);
 
     g_object_set(ice, "min-rtp-port", FLAGS_min_port, "max-rtp-port",
                  FLAGS_max_port, nullptr);
@@ -419,7 +422,7 @@
     {
       GstObject *nice = nullptr;
       g_object_get(ice, "agent", &nice, nullptr);
-      CHECK_NOTNULL(nice);
+      CHECK(nice != nullptr);
 
       g_object_set(nice, "upnp", false, nullptr);
       g_object_unref(nice);