From cbe7c5441c9af004dae93cff09787e21771beda8 Mon Sep 17 00:00:00 2001 From: James Dong Date: Thu, 30 Jul 2009 11:16:11 -0700 Subject: [PATCH] Remove hardcoded maximum frame rate limit from the framework bug 1993400 --- include/media/mediarecorder.h | 4 ---- media/jni/android_media_MediaRecorder.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index ad27903be2bc0..13316a9339d30 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 0273a5aac06b5..304f521135c03 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; }