commit 6b109422d7deb5a70f7d1c8e56295965bfd69e81
author Wonsik Kim <wonsik@google.com> Wed Mar 15 15:15:39 2017 -0700
committer Wonsik Kim <wonsik@google.com> Wed Mar 15 15:15:39 2017 -0700
tree 71baada132b2a668ca91eb26b2b99feab1aa5b3e
parent 606e71cfb90e9646230d37a52b1b43c62c85292c

ndk: AMediaMuxer_addTrack to translate error only for negative values

Bug: 36260305
Test: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.NativeDecoderTest
Change-Id: Ic2b6ec0b8d8a1a9a100eafd3175bdffd80ab4b8d

media/ndk/NdkMediaMuxer.cpp

diff --git a/media/ndk/NdkMediaMuxer.cpp b/media/ndk/NdkMediaMuxer.cpp
index b1b0362..bbf33cd 100644
--- a/media/ndk/NdkMediaMuxer.cpp
+++ b/media/ndk/NdkMediaMuxer.cpp
@@ -81,7 +81,8 @@
 ssize_t AMediaMuxer_addTrack(AMediaMuxer *muxer, const AMediaFormat *format) {
     sp<AMessage> msg;
     AMediaFormat_getFormat(format, &msg);
-    return translate_error(muxer->mImpl->addTrack(msg));
+    ssize_t ret = muxer->mImpl->addTrack(msg);
+    return (ret >= 0) ? ret : translate_error(ret);
 }
 
 EXPORT