diff options
author | Marco Nelissen <marcone@google.com> | 2014-05-15 21:58:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:58:36 +0000 |
commit | 5362ba070797c52a18d3cb5558cd41d1a72c74c5 (patch) | |
tree | fddfcdb07fcc5499c3b026fe4c42b217fef21c7a /media/ndk/NdkMediaMuxer.cpp | |
parent | 16a25c150c49c730d206167012a24cbd9eb3a082 (diff) | |
parent | e419d7cd5c62b4b5866a45d59c5770bb470193c1 (diff) | |
download | frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.zip frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.gz frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.bz2 |
Merge "Unify error/status codes"
Diffstat (limited to 'media/ndk/NdkMediaMuxer.cpp')
-rw-r--r-- | media/ndk/NdkMediaMuxer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media/ndk/NdkMediaMuxer.cpp b/media/ndk/NdkMediaMuxer.cpp index aa78740..19b9fc4 100644 --- a/media/ndk/NdkMediaMuxer.cpp +++ b/media/ndk/NdkMediaMuxer.cpp @@ -37,12 +37,12 @@ using namespace android; -static int translate_error(status_t err) { +static media_status_t translate_error(status_t err) { if (err == OK) { - return OK; + return AMEDIA_OK; } ALOGE("sf error code: %d", err); - return -1000; + return AMEDIA_ERROR_UNKNOWN; } struct AMediaMuxer { @@ -61,19 +61,19 @@ AMediaMuxer* AMediaMuxer_new(int fd, OutputFormat format) { } EXPORT -int AMediaMuxer_delete(AMediaMuxer *muxer) { +media_status_t AMediaMuxer_delete(AMediaMuxer *muxer) { ALOGV("dtor"); delete muxer; - return OK; + return AMEDIA_OK; } EXPORT -int AMediaMuxer_setLocation(AMediaMuxer *muxer, float latitude, float longtitude) { +media_status_t AMediaMuxer_setLocation(AMediaMuxer *muxer, float latitude, float longtitude) { return translate_error(muxer->mImpl->setLocation(latitude * 10000, longtitude * 10000)); } EXPORT -int AMediaMuxer_setOrientationHint(AMediaMuxer *muxer, int degrees) { +media_status_t AMediaMuxer_setOrientationHint(AMediaMuxer *muxer, int degrees) { return translate_error(muxer->mImpl->setOrientationHint(degrees)); } @@ -85,17 +85,17 @@ ssize_t AMediaMuxer_addTrack(AMediaMuxer *muxer, const AMediaFormat *format) { } EXPORT -int AMediaMuxer_start(AMediaMuxer *muxer) { +media_status_t AMediaMuxer_start(AMediaMuxer *muxer) { return translate_error(muxer->mImpl->start()); } EXPORT -int AMediaMuxer_stop(AMediaMuxer *muxer) { +media_status_t AMediaMuxer_stop(AMediaMuxer *muxer) { return translate_error(muxer->mImpl->stop()); } EXPORT -int AMediaMuxer_writeSampleData(AMediaMuxer *muxer, +media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer, size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info) { sp<ABuffer> buf = new ABuffer((void*)(data + info.offset), info.size); return translate_error( |