Merge "Remove codec aggregation/summarization" into oc-mr1-dev
diff --git a/services/mediaanalytics/MetricsSummarizerCodec.cpp b/services/mediaanalytics/MetricsSummarizerCodec.cpp
index 921dd63..6af3c9a 100644
--- a/services/mediaanalytics/MetricsSummarizerCodec.cpp
+++ b/services/mediaanalytics/MetricsSummarizerCodec.cpp
@@ -36,31 +36,10 @@
namespace android {
-static const char *codec_ignorable[] = {
- "android.media.mediacodec.bytesin",
- 0
-};
-
MetricsSummarizerCodec::MetricsSummarizerCodec(const char *key)
: MetricsSummarizer(key)
{
ALOGV("MetricsSummarizerCodec::MetricsSummarizerCodec");
- setIgnorables(codec_ignorable);
-
}
-void MetricsSummarizerCodec::mergeRecord(MediaAnalyticsItem &summation, MediaAnalyticsItem &item) {
-
- ALOGV("MetricsSummarizerCodec::mergeRecord()");
-
- int64_t bytesin = 0;
- if (item.getInt64("android.media.mediacodec.bytesin", &bytesin)) {
- ALOGV("found bytesin of %" PRId64, bytesin);
- }
- if (bytesin >= 0) {
- minMaxVar64(summation,"android.media.mediacodec.bytesin", bytesin);
- }
-}
-
-
} // namespace android
diff --git a/services/mediaanalytics/MetricsSummarizerCodec.h b/services/mediaanalytics/MetricsSummarizerCodec.h
index 872a16c..c01196f 100644
--- a/services/mediaanalytics/MetricsSummarizerCodec.h
+++ b/services/mediaanalytics/MetricsSummarizerCodec.h
@@ -38,8 +38,6 @@
MetricsSummarizerCodec(const char *key);
virtual ~MetricsSummarizerCodec() {};
- virtual void mergeRecord(MediaAnalyticsItem &have, MediaAnalyticsItem &incoming);
-
};
// ----------------------------------------------------------------------------