diff options
| author | Chong Zhang <chz@google.com> | 2014-10-04 16:40:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 16:40:33 +0000 |
| commit | bb2c8147452144a19f45bc2e58f1885cec40b8dc (patch) | |
| tree | 8d2a1c83da101086ef1467db9f39383bbf4fa50e /include | |
| parent | b4f9e04210fc76ea468cb4fb3c2b20d91b56ce50 (diff) | |
| parent | dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3 (diff) | |
| download | frameworks_av-bb2c8147452144a19f45bc2e58f1885cec40b8dc.zip frameworks_av-bb2c8147452144a19f45bc2e58f1885cec40b8dc.tar.gz frameworks_av-bb2c8147452144a19f45bc2e58f1885cec40b8dc.tar.bz2 | |
am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev
* commit 'dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3':
MediaRecorder: only dequeue available buffers from MediaCodec
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h index e1b2830..3629c8b 100644 --- a/include/media/stagefright/MediaCodecSource.h +++ b/include/media/stagefright/MediaCodecSource.h @@ -86,7 +86,7 @@ private: void releaseEncoder(); status_t feedEncoderInputBuffers(); void scheduleDoMoreWork(); - status_t doMoreWork(); + 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); |