diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 6 | ||||
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 4 | ||||
| -rw-r--r-- | include/ui/CameraParameters.h | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index a5a1bb8..be06e33 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -62,7 +62,8 @@ public: // AudioSink: abstraction layer for audio output class AudioSink : public RefBase { public: - typedef void (*AudioCallback)( + // Callback returns the number of bytes actually written to the buffer. + typedef size_t (*AudioCallback)( AudioSink *audioSink, void *buffer, size_t size, void *cookie); virtual ~AudioSink() {} @@ -77,8 +78,7 @@ public: virtual status_t getPosition(uint32_t *position) = 0; // If no callback is specified, use the "write" API below to submit - // audio data. Otherwise return a full buffer of audio data on each - // callback. + // audio data. virtual status_t open( uint32_t sampleRate, int channelCount, int format=AudioSystem::PCM_16_BIT, diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 843e051..8e5f05f 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -90,11 +90,11 @@ private: static void AudioCallback(int event, void *user, void *info); void AudioCallback(int event, void *info); - static void AudioSinkCallback( + static size_t AudioSinkCallback( MediaPlayerBase::AudioSink *audioSink, void *data, size_t size, void *me); - void fillBuffer(void *data, size_t size); + size_t fillBuffer(void *data, size_t size); int64_t getRealTimeUsLocked() const; diff --git a/include/ui/CameraParameters.h b/include/ui/CameraParameters.h index 2c29bfb..e328f33 100644 --- a/include/ui/CameraParameters.h +++ b/include/ui/CameraParameters.h @@ -187,6 +187,13 @@ public: // Vertical angle of view in degrees. // Example value: "42.5". Read only. static const char KEY_VERTICAL_VIEW_ANGLE[]; + // Exposure compensation. The value is multiplied by 100. -100 means -1 EV. + // 130 means +1.3 EV. + // Example value: "0" or "133". Read/write. + static const char KEY_EXPOSURE_COMPENSATION[]; + // Supported exposure compensation. + // Example value: "-100,-66,-33,0,33,66,100". Read only. + static const char KEY_SUPPORTED_EXPOSURE_COMPENSATION[]; // Values for white balance settings. |