diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:46 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:46 -0700 |
| commit | 1179bc9b0e3d17c984e8f4ad38561c049dd102fa (patch) | |
| tree | 1fd069efb58601650c80f77da0e2dc7d93641068 /include | |
| parent | c048cae0367db6fbb4fe1127be5011910713d4ad (diff) | |
| download | frameworks_av-1179bc9b0e3d17c984e8f4ad38561c049dd102fa.zip frameworks_av-1179bc9b0e3d17c984e8f4ad38561c049dd102fa.tar.gz frameworks_av-1179bc9b0e3d17c984e8f4ad38561c049dd102fa.tar.bz2 | |
auto import from //branches/cupcake_rel/...@140373
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediarecorder.h | 3 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 78d7621..b9ea0c6 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -104,7 +104,8 @@ enum media_recorder_error_type { // enum media_recorder_info_type { MEDIA_RECORDER_INFO_UNKNOWN = 1, - MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800 + MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800, + MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801 }; // ---------------------------------------------------------------------------- diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 1991aa7..bda969c 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -64,7 +64,8 @@ struct audio_track_cblk_t uint16_t waitTimeMs; // Cumulated wait time // Padding ensuring that data buffer starts on a cache line boundary (32 bytes). // See AudioFlinger::TrackBase constructor - int32_t Padding[3]; + int32_t Padding[1]; + // Cache line boundary audio_track_cblk_t(); uint32_t stepUser(uint32_t frameCount); |