diff options
| author | Chong Zhang <chz@google.com> | 2014-10-04 16:46:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 16:46:47 +0000 |
| commit | 09f9478131d7903404e173d4ddd9224294bb1a84 (patch) | |
| tree | 123a936c9ce8fb51f05ba66e415bfc32cb80254c /include | |
| parent | c0b02d0eed99e31fa160c4843fc016e9dfd00dc3 (diff) | |
| parent | bb2c8147452144a19f45bc2e58f1885cec40b8dc (diff) | |
| download | frameworks_av-09f9478131d7903404e173d4ddd9224294bb1a84.zip frameworks_av-09f9478131d7903404e173d4ddd9224294bb1a84.tar.gz frameworks_av-09f9478131d7903404e173d4ddd9224294bb1a84.tar.bz2 | |
am bb2c8147: am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev
* commit 'bb2c8147452144a19f45bc2e58f1885cec40b8dc':
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); |