Debug log of drm errors

Accelize · Jan 20, 2021 · ff5b5bd · ff5b5bd
1 parent 9bc951b
commit ff5b5bd
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/source/drm_manager.cpp b/source/drm_manager.cpp
@@ -61,22 +61,16 @@ limitations under the License.
 #define TRY try {
 
 #define CATCH_AND_THROW                   \
-        logDrmCtrlError();                \
-        logDrmCtrlTrngStatus();           \
         sLogger->flush();                 \
     }                                     \
     catch( const std::exception &e ) {    \
-        logDrmCtrlError();                \
-        logDrmCtrlTrngStatus();           \
         Fatal( e.what() );                \
         sLogger->flush();                 \
         throw;                            \
     }
 
 #define CATCH                             \
     catch( const std::exception &e ) {    \
-        logDrmCtrlError();                \
-        logDrmCtrlTrngStatus();           \
         Fatal( e.what() );                \
         sLogger->flush();                 \
     }
@@ -988,6 +982,13 @@ class DRM_LOCAL DrmManager::Impl {
         }
     }
 
+    void uninitDrmInterface() {
+        if ( mDrmController ) {
+            mDrmController.reset( nullptr );
+            Debug( "DRM Controller SDK is uninitialized" );
+        }
+    }
+
     // Get DRM HDK version
     std::string getDrmCtrlVersion() const {
         std::string drmVersion;
@@ -2200,6 +2201,9 @@ class DRM_LOCAL DrmManager::Impl {
                 }
             } catch( ... ) {}
             unlockDrmToInstance();
+            logDrmCtrlError();
+            logDrmCtrlTrngStatus();
+            uninitDrmInterface();
             Debug( "Exiting Impl destructor" );
         CATCH_AND_THROW
     }