commit a1d39ba72fd92df6b447939b1bbede5c56df17e6
author Guang Zhu <guangzhu@google.com> Fri Mar 02 04:33:02 2018 +0000
committer Guang Zhu <guangzhu@google.com> Fri Mar 02 04:33:02 2018 +0000
tree 54fff7206b48bd7123929128a4fc1e2b1d0a44d4
parent 062ffd042fcbd237f445d499bc8ea8c5baf61d98

Revert "NdkMediaExtractor: per-sample format metadata API"

This reverts commit 062ffd042fcbd237f445d499bc8ea8c5baf61d98.

Bug: 63934228
Bug: 74089496

Reason for revert: original change bypassed presubmit, causing mediaextractor crash, 

Change-Id: Iac4c49659dfa7415908d60da98a2285c583a1196

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index abb8fb0..d1e5d45 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -43,7 +43,6 @@
 #include <media/AudioResamplerPublic.h>
 #include <media/AVSyncSettings.h>
 #include <media/MediaCodecBuffer.h>
-#include <media/NdkMediaFormat.h>
 
 #include <media/stagefright/foundation/hexdump.h>
 #include <media/stagefright/foundation/ABuffer.h>
@@ -2685,7 +2684,7 @@
 void NuPlayer::sendSubtitleData(const sp<ABuffer> &buffer, int32_t baseIndex) {
     int32_t trackIndex;
     int64_t timeUs, durationUs;
-    CHECK(buffer->meta()->findInt32(AMEDIAFORMAT_KEY_TRACK_INDEX, &trackIndex));
+    CHECK(buffer->meta()->findInt32("trackIndex", &trackIndex));
     CHECK(buffer->meta()->findInt64("timeUs", &timeUs));
     CHECK(buffer->meta()->findInt64("durationUs", &durationUs));