diff options
| author | Chong Zhang <chz@google.com> | 2014-11-13 23:53:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 23:53:34 +0000 |
| commit | 08961d0b57f33e0486db2ff135f0f7fa4b1a8c58 (patch) | |
| tree | 19eff16ab736ee29034f5f68043a5cf07c5fde78 /include | |
| parent | 285dc585019e3c710985edc5e3f55cb934c6512c (diff) | |
| parent | 97e6ca1a0be83e420ab238d9a1c31d3112126646 (diff) | |
| download | frameworks_av-08961d0b57f33e0486db2ff135f0f7fa4b1a8c58.zip frameworks_av-08961d0b57f33e0486db2ff135f0f7fa4b1a8c58.tar.gz frameworks_av-08961d0b57f33e0486db2ff135f0f7fa4b1a8c58.tar.bz2 | |
am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev
* commit '97e6ca1a0be83e420ab238d9a1c31d3112126646':
Stagefright: use MediaCodec in async mode for recording
audio policy: move intializations to onFirstRef()
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecSource.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h index 3629c8b..0970b2b 100644 --- a/include/media/stagefright/MediaCodecSource.h +++ b/include/media/stagefright/MediaCodecSource.h @@ -85,8 +85,6 @@ private: status_t initEncoder(); void releaseEncoder(); status_t feedEncoderInputBuffers(); - void scheduleDoMoreWork(); - status_t doMoreWork(int32_t numInput, int32_t numOutput); void suspend(); void resume(int64_t skipFramesBeforeUs = -1ll); void signalEOS(status_t err = ERROR_END_OF_STREAM); @@ -108,8 +106,6 @@ private: bool mDoMoreWorkPending; sp<AMessage> mEncoderActivityNotify; sp<IGraphicBufferProducer> mGraphicBufferProducer; - Vector<sp<ABuffer> > mEncoderInputBuffers; - Vector<sp<ABuffer> > mEncoderOutputBuffers; List<MediaBuffer *> mInputBufferQueue; List<size_t> mAvailEncoderInputIndices; List<int64_t> mDecodingTimeQueue; // decoding time (us) for video |