diff options
| author | Robert Shih <robertshih@google.com> | 2013-11-15 01:18:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-15 01:18:56 +0000 |
| commit | b5099903c059dc913e0e592969c10d15fac0c14c (patch) | |
| tree | 3b483d46c7f73ac56109aef87a30e3747c3a63b1 /media/libmediaplayerservice/StagefrightRecorder.h | |
| parent | 27c70d391da6fde79d2e03fb767f9913555c1e9c (diff) | |
| parent | 4db37cedd4db8230f3ec6191d8d7ba2b0036886e (diff) | |
| download | frameworks_av-b5099903c059dc913e0e592969c10d15fac0c14c.zip frameworks_av-b5099903c059dc913e0e592969c10d15fac0c14c.tar.gz frameworks_av-b5099903c059dc913e0e592969c10d15fac0c14c.tar.bz2 | |
Merge "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate value mVideoBitRate; removed unused arguments after refactoring."
Diffstat (limited to 'media/libmediaplayerservice/StagefrightRecorder.h')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 31f09e0..bc43488 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -124,12 +124,7 @@ private: // frame buffers will be queued and dequeued sp<SurfaceMediaSource> mSurfaceMediaSource; - status_t setupMPEG4Recording( - int outputFd, - int32_t videoWidth, int32_t videoHeight, - int32_t videoBitRate, - int32_t *totalBitRate, - sp<MediaWriter> *mediaWriter); + status_t setupMPEG4Recording(int32_t *totalBitRate); void setupMPEG4MetaData(int64_t startTimeUs, int32_t totalBitRate, sp<MetaData> *meta); status_t startMPEG4Recording(); @@ -151,10 +146,7 @@ private: status_t setupSurfaceMediaSource(); status_t setupAudioEncoder(const sp<MediaWriter>& writer); - status_t setupVideoEncoder( - sp<MediaSource> cameraSource, - int32_t videoBitRate, - sp<MediaSource> *source); + status_t setupVideoEncoder(sp<MediaSource> cameraSource, sp<MediaSource> *source); // Encoding parameter handling utilities status_t setParameter(const String8 &key, const String8 &value); |