diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-02-03 14:15:59 -0800 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2015-02-09 11:04:40 -0800 |
| commit | c9f122d8f32ba6928ac9087448025fa3bed1553d (patch) | |
| tree | ccd01e1cf02b8f1768f13233152aa57c0359346b /media | |
| parent | aafc11b3d8564b078e98007bb27a3a41b4f535ee (diff) | |
| download | frameworks_av-c9f122d8f32ba6928ac9087448025fa3bed1553d.zip frameworks_av-c9f122d8f32ba6928ac9087448025fa3bed1553d.tar.gz frameworks_av-c9f122d8f32ba6928ac9087448025fa3bed1553d.tar.bz2 | |
StageFrightRecorder: update setVideoFrameRate sanity check
Allow high speed recording fps to be up to 1000fps
Change-Id: I975d11b8a9abbd50ce6982fb46f4a4a3a035e475
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 5c16920..2551040 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -206,7 +206,7 @@ status_t StagefrightRecorder::setVideoSize(int width, int height) { status_t StagefrightRecorder::setVideoFrameRate(int frames_per_second) { ALOGV("setVideoFrameRate: %d", frames_per_second); if ((frames_per_second <= 0 && frames_per_second != -1) || - frames_per_second > 120) { + frames_per_second > kMaxHighSpeedFps) { ALOGE("Invalid video frame rate: %d", frames_per_second); return BAD_VALUE; } diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index a6eba39..b5a49d3 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -126,6 +126,8 @@ private: sp<IGraphicBufferProducer> mGraphicBufferProducer; sp<ALooper> mLooper; + static const int kMaxHighSpeedFps = 1000; + status_t prepareInternal(); status_t setupMPEG4orWEBMRecording(); void setupMPEG4orWEBMMetaData(sp<MetaData> *meta); |