Send audio-presentation metadata in access units
Audio presentation metadata is attached to the access units so that
each media buffer read() retreives it's associated audio
presentations information.
Bug: 120846068
Test: atest CtsMediaTestCases:MediaExtractorTest#testGetAudioPresentations
repeat 3..5 times
Change-Id: I47f4d0dd959537fe98aa757bfa762ff02aa86a35
diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index f697bd1..8296598 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -448,6 +448,16 @@
meta->setBuffer(AMEDIAFORMAT_KEY_MPEG_USER_DATA, mpegUserData);
}
+ const void *audioPresentationsPointer;
+ size_t audioPresentationsLength;
+ if (sampleMeta->findData(
+ kKeyAudioPresentationInfo, &dataType,
+ &audioPresentationsPointer, &audioPresentationsLength)) {
+ sp<ABuffer> audioPresentationsData = ABuffer::CreateAsCopy(
+ audioPresentationsPointer, audioPresentationsLength);
+ meta->setBuffer(AMEDIAFORMAT_KEY_AUDIO_PRESENTATION_INFO, audioPresentationsData);
+ }
+
return AMEDIA_OK;
}