diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-15 14:17:25 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-05-15 14:41:20 -0700 |
| commit | e419d7cd5c62b4b5866a45d59c5770bb470193c1 (patch) | |
| tree | eaabdbe6d72e7be1ceb0b1907784083db848c674 /include/ndk/NdkMediaMuxer.h | |
| parent | 3425fd5a55dd31e261d2f2a9590c762d6d0a6b79 (diff) | |
| download | frameworks_av-e419d7cd5c62b4b5866a45d59c5770bb470193c1.zip frameworks_av-e419d7cd5c62b4b5866a45d59c5770bb470193c1.tar.gz frameworks_av-e419d7cd5c62b4b5866a45d59c5770bb470193c1.tar.bz2 | |
Unify error/status codes
Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
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 |