Merge pull request #94 from AxisCommunications/raii-capture

Follow RAII in Capture class

src/acap_runtime.cpp

@@ -118,11 +118,7 @@ int RunServer(const string& address,
     builder.RegisterService(&parameter);
 
     // Register video capture service
-    Capture capture;
-    if (!capture.Init(_verbose)) {
-        syslog(LOG_ERR, "Could not initialize VideoCapture service");
-        return EXIT_FAILURE;
-    }
+    Capture capture{_verbose};
     builder.RegisterService(&capture);
 
     Inference inference{_verbose, chipId, models, &capture};

src/video_capture.cpp

@@ -38,16 +38,13 @@ using namespace videocapture::v1;
 namespace acap_runtime {
 
 // Initialize the capture service
-bool Capture::Init(const bool verbose) {
-    this->_verbose = verbose;
+Capture::Capture(const bool verbose) : _verbose(verbose) {
     TRACELOG << "Init" << endl;
 
     if (pthread_mutex_init(&_mutex, NULL) != 0) {
         ERRORLOG << "Init mutex failed" << endl;
-        return false;
+        throw runtime_error("Could not initialize VideoCapture service");
     }
-
-    return true;
 }
 
 // Create a new stream

src/video_capture.h

@@ -50,7 +50,7 @@ class Capture final : public videocapture::v1::VideoCapture::Service {
     using Status = grpc::Status;
     using StatusCode = grpc::StatusCode;
 
-    bool Init(const bool verbose);
+    Capture(bool verbose);
 
     Status NewStream(ServerContext* context,
                      const NewStreamRequest* request,

test/inference_unittest.cc

@@ -39,7 +39,7 @@ const uint64_t cpuChipId = 2;
 const uint64_t tpuChipId = 4;
 const uint64_t dlpuChipId = 12;
 const char* sharedFile = "/test.bmp";
-Capture capture;
+Capture capture{true};
 
 void PredictModel1(Inference& inference,
                    string modelName,