commit 2a6618db7f417cdf798fdc2f72f6853966dc7548
author Marco Nelissen <marcone@google.com> Mon Oct 22 12:58:07 2018 -0700
committer Marco Nelissen <marcone@google.com> Mon Oct 22 13:33:21 2018 -0700
tree 577dbd0e8b965aee99edb28a4eca1f4192215f07
parent 4d026f5583e1f61726b8d24569433a6b072ebf6e

Return correct error codes from extractors

Fixes playback of short files
Bug: 118072995
Bug: 118161523
Bug: 111407253
Test: manual

Change-Id: Ie9e1707c7525ab72ace8cf9d4428df1df1205b9e

media/libmedia/NdkMediaErrorPriv.cpp

diff --git a/media/libmedia/NdkMediaErrorPriv.cpp b/media/libmedia/NdkMediaErrorPriv.cpp
index d061f5a..ba3b919 100644
--- a/media/libmedia/NdkMediaErrorPriv.cpp
+++ b/media/libmedia/NdkMediaErrorPriv.cpp
@@ -29,6 +29,12 @@
         return AMEDIA_ERROR_END_OF_STREAM;
     } else if (err == ERROR_IO) {
         return AMEDIA_ERROR_IO;
+    } else if (err == ERROR_MALFORMED) {
+        return AMEDIA_ERROR_MALFORMED;
+    } else if (err == INVALID_OPERATION) {
+        return AMEDIA_ERROR_INVALID_OPERATION;
+    } else if (err == UNKNOWN_ERROR) {
+        return AMEDIA_ERROR_UNKNOWN;
     }
 
     ALOGE("sf error code: %d", err);
@@ -45,6 +51,12 @@
         return ERROR_IO;
     } else if (err == AMEDIA_ERROR_WOULD_BLOCK) {
         return WOULD_BLOCK;
+    } else if (err == AMEDIA_ERROR_MALFORMED) {
+        return ERROR_MALFORMED;
+    } else if (err == AMEDIA_ERROR_INVALID_OPERATION) {
+        return INVALID_OPERATION;
+    } else if (err == AMEDIA_ERROR_UNKNOWN) {
+        return UNKNOWN_ERROR;
     }
 
     ALOGE("ndk error code: %d", err);