diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 11:34:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 11:34:25 -0700 |
| commit | 5483c50688ca737d9bc4e3f572e3c9fa4f845182 (patch) | |
| tree | abf6ec9d931f28f13620da6b6003b7822c40a459 | |
| parent | bad80e0dccdeaeea97991f7d092678ff0df1bc84 (diff) | |
| parent | cbe7c5441c9af004dae93cff09787e21771beda8 (diff) | |
| download | frameworks_base-5483c50688ca737d9bc4e3f572e3c9fa4f845182.zip frameworks_base-5483c50688ca737d9bc4e3f572e3c9fa4f845182.tar.gz frameworks_base-5483c50688ca737d9bc4e3f572e3c9fa4f845182.tar.bz2 | |
Merge change 9193
* changes:
Remove hardcoded maximum frame rate limit from the framework bug 1993400
| -rw-r--r-- | include/media/mediarecorder.h | 4 | ||||
| -rw-r--r-- | media/jni/android_media_MediaRecorder.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index ad27903..13316a9 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -93,10 +93,6 @@ enum video_encoder { VIDEO_ENCODER_LIST_END // must be the last - used to validate the video encoder type }; - -// Maximum frames per second is 24 -#define MEDIA_RECORDER_MAX_FRAME_RATE 24 - /* * The state machine of the media_recorder uses a set of different state names. * The mapping between the media_recorder and the pvauthorengine is shown below: diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 0273a5a..304f521 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -276,7 +276,7 @@ static void android_media_MediaRecorder_setVideoFrameRate(JNIEnv *env, jobject thiz, jint rate) { LOGV("setVideoFrameRate(%d)", rate); - if (rate <= 0 || rate > MEDIA_RECORDER_MAX_FRAME_RATE) { + if (rate <= 0) { jniThrowException(env, "java/lang/IllegalArgumentException", "invalid frame rate"); return; } |