commit 660626784594f19956785e0fac0f3e4d6cc130d5
author Hangyu Kuang <hkuang@google.com> Thu Dec 03 19:30:25 2020 +0000
committer hkuang <hkuang@google.com> Thu Dec 03 13:35:44 2020 -0800
tree 33aa2b0dbe1ff515d14392b673e575361496720f
parent 196abe7f223f59abcbd9190cd46eea0e5745b75c

Revert "Log MediaExtractor entry point to MediaMetrics"

This reverts commit 17c72bb0966dd410c32ab0fd186408cb7f966515.

Reason for revert: b/174768641

Change-Id: Ic62927415db5fe0b428faf607c9e1d66bfaf8366

services/mediametrics/statsd_extractor.cpp

diff --git a/services/mediametrics/statsd_extractor.cpp b/services/mediametrics/statsd_extractor.cpp
index d14b804..16814d9 100644
--- a/services/mediametrics/statsd_extractor.cpp
+++ b/services/mediametrics/statsd_extractor.cpp
@@ -18,12 +18,19 @@
 #define LOG_TAG "statsd_extractor"
 #include <utils/Log.h>
 
+#include <dirent.h>
+#include <inttypes.h>
+#include <pthread.h>
+#include <pwd.h>
 #include <stdint.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <statslog.h>
 
-#include <media/stagefright/RemoteMediaExtractor.h>
 #include "MediaMetricsService.h"
 #include "frameworks/proto_logging/stats/enums/stats/mediametrics/mediametrics.pb.h"
 #include "iface_statsd.h"
@@ -50,53 +57,20 @@
 
     // android.media.mediaextractor.fmt         string
     std::string fmt;
-    if (item->getString(RemoteMediaExtractor::kExtractorFormat, &fmt)) {
+    if (item->getString("android.media.mediaextractor.fmt", &fmt)) {
         metrics_proto.set_format(std::move(fmt));
     }
     // android.media.mediaextractor.mime        string
     std::string mime;
-    if (item->getString(RemoteMediaExtractor::kExtractorMime, &mime)) {
+    if (item->getString("android.media.mediaextractor.mime", &mime)) {
         metrics_proto.set_mime(std::move(mime));
     }
     // android.media.mediaextractor.ntrk        int32
     int32_t ntrk = -1;
-    if (item->getInt32(RemoteMediaExtractor::kExtractorTracks, &ntrk)) {
+    if (item->getInt32("android.media.mediaextractor.ntrk", &ntrk)) {
         metrics_proto.set_tracks(ntrk);
     }
 
-    // android.media.mediaextractor.entry       int32
-    int32_t entry_point_int;
-    if (item->getInt32(RemoteMediaExtractor::kExtractorEntryPoint,
-            &entry_point_int)) {
-        using stats::mediametrics::ExtractorData;
-        ExtractorData::EntryPoint entry_point;
-        switch (static_cast<IMediaExtractor::EntryPoint>(entry_point_int)) {
-          case IMediaExtractor::EntryPoint::SDK:
-              entry_point =
-                  ExtractorData::EntryPoint::ExtractorData_EntryPoint_SDK;
-              break;
-          case IMediaExtractor::EntryPoint::NDK_WITH_JVM:
-              entry_point =
-                  ExtractorData::EntryPoint
-                      ::ExtractorData_EntryPoint_NDK_WITH_JVM;
-            break;
-          case IMediaExtractor::EntryPoint::NDK_NO_JVM:
-              entry_point =
-                  ExtractorData::EntryPoint
-                      ::ExtractorData_EntryPoint_NDK_NO_JVM;
-              break;
-          case IMediaExtractor::EntryPoint::OTHER:
-            entry_point =
-                  ExtractorData::EntryPoint
-                      ::ExtractorData_EntryPoint_OTHER;
-            break;
-          default:
-            entry_point =
-                  ExtractorData::EntryPoint::ExtractorData_EntryPoint_UNSET;
-        }
-        metrics_proto.set_entry_point(entry_point);
-    }
-
     std::string serialized;
     if (!metrics_proto.SerializeToString(&serialized)) {
         ALOGE("Failed to serialize extractor metrics");