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
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index d86b08d..e7c3deb 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -28,7 +28,6 @@
#include <media/MediaExtractor.h>
#include <media/MediaSource.h>
#include <media/IMediaExtractorService.h>
-#include <media/NdkMediaFormat.h>
#include <media/IMediaHTTPService.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
@@ -1234,7 +1233,7 @@
}
if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) {
- meta->setInt32(AMEDIAFORMAT_KEY_TRACK_INDEX, mSubtitleTrack.mIndex);
+ meta->setInt32("trackIndex", mSubtitleTrack.mIndex);
}
uint32_t dataType; // unused
@@ -1250,7 +1249,7 @@
if (mb->meta_data().findData(
kKeyMpegUserData, &dataType, &mpegUserDataPointer, &mpegUserDataLength)) {
sp<ABuffer> mpegUserData = ABuffer::CreateAsCopy(mpegUserDataPointer, mpegUserDataLength);
- meta->setBuffer(AMEDIAFORMAT_KEY_MPEG_USER_DATA, mpegUserData);
+ meta->setBuffer("mpegUserData", mpegUserData);
}
mb->release();