commit a54d5fefd9ce4a3f72ffb9322304db7d11e9bfc0
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 16 22:03:12 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu Aug 16 22:03:12 2012 -0700
tree 87abb105b21ad1229870edf27b85bcb6da2c4113
parent 70e0f7bad87dd0f6ad9a54458265e7ad8dc6dff1
parent cd9383f390ebce77c88cd6acb1345fee5b0a497b

Merge "msm: vidc: Adds support to send frame rate to Video Hardware" into msm-3.4

drivers/media/video/msm_vidc/msm_venc.c

diff --git a/drivers/media/video/msm_vidc/msm_venc.c b/drivers/media/video/msm_vidc/msm_venc.c
index 282da64..a1d796f 100644
--- a/drivers/media/video/msm_vidc/msm_venc.c
+++ b/drivers/media/video/msm_vidc/msm_venc.c
@@ -26,9 +26,9 @@
 #define MAX_BIT_RATE 160000
 #define DEFAULT_BIT_RATE 64
 #define BIT_RATE_STEP 1
-#define MIN_FRAME_RATE 1
-#define MAX_FRAME_RATE 240
-#define DEFAULT_FRAME_RATE 30
+#define MIN_FRAME_RATE 65536
+#define MAX_FRAME_RATE 15728640
+#define DEFAULT_FRAME_RATE 1966080
 #define DEFAULT_IR_MBS 30
 #define MAX_SLICE_BYTE_SIZE 1024
 #define MIN_SLICE_BYTE_SIZE 1024