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 /include/ndk/NdkMediaMuxer.h | |
| 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 'include/ndk/NdkMediaMuxer.h')
| -rw-r--r-- | include/ndk/NdkMediaMuxer.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/ndk/NdkMediaMuxer.h b/include/ndk/NdkMediaMuxer.h index deb150d..db183e9 100644 --- a/include/ndk/NdkMediaMuxer.h +++ b/include/ndk/NdkMediaMuxer.h @@ -30,8 +30,9 @@ #include <sys/types.h> -#include "NdkMediaFormat.h" #include "NdkMediaCodec.h" +#include "NdkMediaError.h" +#include "NdkMediaFormat.h" #ifdef __cplusplus extern "C" { @@ -53,19 +54,19 @@ AMediaMuxer* AMediaMuxer_new(int fd, OutputFormat format); /** * Delete a previously created media muxer */ -int AMediaMuxer_delete(AMediaMuxer*); +media_status_t AMediaMuxer_delete(AMediaMuxer*); -int AMediaMuxer_setLocation(AMediaMuxer*, float latitude, float longtitude); +media_status_t AMediaMuxer_setLocation(AMediaMuxer*, float latitude, float longtitude); -int AMediaMuxer_setOrientationHint(AMediaMuxer*, int degrees); +media_status_t AMediaMuxer_setOrientationHint(AMediaMuxer*, int degrees); ssize_t AMediaMuxer_addTrack(AMediaMuxer*, const AMediaFormat* format); -int AMediaMuxer_start(AMediaMuxer*); +media_status_t AMediaMuxer_start(AMediaMuxer*); -int AMediaMuxer_stop(AMediaMuxer*); +media_status_t AMediaMuxer_stop(AMediaMuxer*); -int AMediaMuxer_writeSampleData(AMediaMuxer *muxer, +media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer, size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info); #ifdef __cplusplus |