diff options
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioRecord.h | 5 | ||||
| -rw-r--r-- | include/media/AudioSystem.h | 3 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/SkipCutBuffer.h | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 052064d..fb47448 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -60,7 +60,7 @@ public: size_t frameCount; // number of sample frames corresponding to size; // on input it is the number of frames available, // on output is the number of frames actually drained - // (currently ignored, but will make the primary field in future) + // (currently ignored but will make the primary field in future) size_t size; // input/output in bytes == frameCount * frameSize // FIXME this is redundant with respect to frameCount, @@ -446,7 +446,8 @@ private: // notification callback uint32_t mNotificationFramesAct; // actual number of frames between each // notification callback - bool mRefreshRemaining; // processAudioBuffer() should refresh next 2 + bool mRefreshRemaining; // processAudioBuffer() should refresh + // mRemainingFrames and mRetryOnPartialBuffer // These are private to processAudioBuffer(), and are not protected by a lock uint32_t mRemainingFrames; // number of frames to request in obtainBuffer() diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 225ef76..b96b8a1 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -155,7 +155,8 @@ public: class OutputDescriptor { public: OutputDescriptor() - : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channelMask(0), frameCount(0), latency(0) {} + : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channelMask(0), frameCount(0), latency(0) + {} uint32_t samplingRate; audio_format_t format; diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 22ad57e..f863e35 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -662,7 +662,6 @@ protected: size_t mReqFrameCount; // frame count to request the next time a new // IAudioTrack is needed - // constant after constructor or set() audio_format_t mFormat; // as requested by client, not forced to 16-bit audio_stream_type_t mStreamType; @@ -701,7 +700,8 @@ protected: uint32_t mNotificationFramesAct; // actual number of frames between each // notification callback, // at initial source sample rate - bool mRefreshRemaining; // processAudioBuffer() should refresh next 2 + bool mRefreshRemaining; // processAudioBuffer() should refresh + // mRemainingFrames and mRetryOnPartialBuffer // These are private to processAudioBuffer(), and are not protected by a lock uint32_t mRemainingFrames; // number of frames to request in obtainBuffer() diff --git a/include/media/stagefright/SkipCutBuffer.h b/include/media/stagefright/SkipCutBuffer.h index 2653b53..098aa69 100644 --- a/include/media/stagefright/SkipCutBuffer.h +++ b/include/media/stagefright/SkipCutBuffer.h @@ -47,6 +47,7 @@ class SkipCutBuffer: public RefBase { private: void write(const char *src, size_t num); size_t read(char *dst, size_t num); + int32_t mSkip; int32_t mFrontPadding; int32_t mBackPadding; int32_t mWriteHead; |