Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5483c506 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 9193 

* changes:
  Remove hardcoded maximum frame rate limit from the framework bug 1993400
parents bad80e0d cbe7c544

include/media/mediarecorder.h

+0 −4
Original line number Diff line number Diff line
@@ -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:

media/jni/android_media_MediaRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }