commit f56e1e4b658e9a40dfb5b20a1c8c58ea376f0921
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 30 19:29:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 30 19:29:27 2020 +0000
tree bf0de9d37816737b4e95c52ddc0f33e9c4876aee
parent 5359f835e83ec80eb640686ba0d636bf71669b4f
parent 7417392140376f33b0d57a7aac18dc99c45e791f

Merge "Mediaserver memory increase after record" am: 6c6a7a8865 am: 2963fb1ddd am: 7417392140

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1512711

Change-Id: Ic3bfdf1ee32c0ef186de3befbaffb38c22ee9381

media/libmediaplayerservice/StagefrightRecorder.cpp

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 3e7ee50..b2f6407 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -134,6 +134,7 @@
 
     ALOGV("Constructor");
 
+    mMetricsItem = NULL;
     mAnalyticsDirty = false;
     reset();
 }
@@ -208,10 +209,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;