commit d83d4f4a43616f38217591ba2d3f10d77fd4e748
author Robert Shih <robertshih@google.com> Sat Feb 24 19:02:46 2018 -0800
committer Robert Shih <robertshih@google.com> Mon Mar 05 20:36:13 2018 +0000
tree 8c4c462635c15290a3436b01dc2614caade4ff84
parent b95a5989190a427a7ea092dc18741af524009bdb

NdkMediaExtractor: per-sample format metadata API

Bug: 63934228
Test: MediaPlayer2Test
Change-Id: I8ac081ba91152b1bb2e7bb61bf6977f90bcb8e3c

media/libmedia/NdkWrapper.cpp

diff --git a/media/libmedia/NdkWrapper.cpp b/media/libmedia/NdkWrapper.cpp
index 5e47b48..3b1b413 100644
--- a/media/libmedia/NdkWrapper.cpp
+++ b/media/libmedia/NdkWrapper.cpp
@@ -111,6 +111,10 @@
 static status_t translateErrorCode(media_status_t err) {
     if (err == AMEDIA_OK) {
         return OK;
+    } else if (err == AMEDIA_ERROR_END_OF_STREAM) {
+        return ERROR_END_OF_STREAM;
+    } else if (err == AMEDIA_ERROR_IO) {
+        return ERROR_IO;
     } else if (err == AMEDIACODEC_INFO_TRY_AGAIN_LATER) {
         return -EAGAIN;
     }
@@ -1150,6 +1154,15 @@
     return AMediaExtractor_getSampleTime(mAMediaExtractor);
 }
 
+status_t AMediaExtractorWrapper::getSampleFormat(sp<AMediaFormatWrapper> &formatWrapper) {
+    if (mAMediaExtractor == NULL) {
+        return DEAD_OBJECT;
+    }
+    AMediaFormat *format = AMediaFormat_new();
+    formatWrapper = new AMediaFormatWrapper(format);
+    return translateErrorCode(AMediaExtractor_getSampleFormat(mAMediaExtractor, format));
+}
+
 int64_t AMediaExtractorWrapper::getCachedDuration() {
     if (mAMediaExtractor == NULL) {
         return -1;