commit 6c6a7a886550e73bb1ec8930bc1169da7374bc98
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 30 17:57:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 30 17:57:55 2020 +0000
tree 8bcbacaf755bb33796c389ad8ac9f64e5c906235
parent 088c3181079e816fae8f53b53e26b80c100ad31b
parent 97af20390ca46d261d637fa6aeb1a49d4cc3f01b

Merge "Mediaserver memory increase after record"

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 7897959..84dfb50 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -125,6 +125,7 @@
 
     ALOGV("Constructor");
 
+    mMetricsItem = NULL;
     mAnalyticsDirty = false;
     reset();
 }
@@ -199,10 +200,12 @@
 void StagefrightRecorder::flushAndResetMetrics(bool reinitialize) {
     ALOGV("flushAndResetMetrics");
     // flush anything we have, maybe setup a new record
-    if (mAnalyticsDirty && mMetricsItem != NULL) {
-        updateMetrics();
-        if (mMetricsItem->count() > 0) {
-            mMetricsItem->selfrecord();
+    if (mMetricsItem != NULL) {
+        if (mAnalyticsDirty) {
+            updateMetrics();
+            if (mMetricsItem->count() > 0) {
+                mMetricsItem->selfrecord();
+            }
         }
         delete mMetricsItem;
         mMetricsItem = NULL;