Created
February 12, 2013 12:54
-
-
Save dpolishuk/4762668 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/SecHdmi/SecHdmi.cpp b/SecHdmi/SecHdmi.cpp | |
index 6b03db7..b0a5397 100755 | |
--- a/SecHdmi/SecHdmi.cpp | |
+++ b/SecHdmi/SecHdmi.cpp | |
@@ -597,17 +597,17 @@ bool SecHdmi::connect(void) | |
mHdmiOutputMode = HDMI_OUTPUT_MODE_YCBCR; | |
if(resolution) { // 1080P default value | |
- mHdmiResolutionValue = 1080960; | |
- mHdmiPresetId = V4L2_DV_1080P60; | |
- mHdmiStdId = V4L2_STD_1080P_60; | |
+ mHdmiResolutionValue = 1080950; | |
+ mHdmiPresetId = V4L2_DV_1080P50; | |
+ mHdmiStdId = V4L2_STD_1080P_50; | |
mDisplayWidth = 1920; | |
mDisplayHeight = 1080; | |
mCompositeStd = COMPOSITE_STD_NTSC_M; | |
} | |
else { // 720P default value | |
- mHdmiResolutionValue = 720960; | |
- mHdmiPresetId = V4L2_DV_720P60; | |
- mHdmiStdId = V4L2_STD_720P_60; | |
+ mHdmiResolutionValue = 720950; | |
+ mHdmiPresetId = V4L2_DV_720P50; | |
+ mHdmiStdId = V4L2_STD_720P_50; | |
mDisplayWidth = 1280; | |
mDisplayHeight = 720; | |
mCompositeStd = COMPOSITE_STD_NTSC_M; | |
diff --git a/SecHdmi/SecHdmiCommon.h b/SecHdmi/SecHdmiCommon.h | |
index 6f4f3c3..9aebfc6 100644 | |
--- a/SecHdmi/SecHdmiCommon.h | |
+++ b/SecHdmi/SecHdmiCommon.h | |
@@ -63,25 +63,25 @@ | |
#if defined(STD_NTSC_M) | |
#define DEFAULT_OUPUT_MODE (COMPOSITE_OUTPUT_MODE) | |
- #define DEFAULT_HDMI_RESOLUTION_VALUE (1080960) // 1080P_60 | |
- #define DEFAULT_HDMI_PRESET_ID (V4L2_DV_1080P60) | |
- #define DEFAULT_HDMI_STD_ID (V4L2_STD_1080P_60) | |
+ #define DEFAULT_HDMI_RESOLUTION_VALUE (1080950) // 1080P_60 | |
+ #define DEFAULT_HDMI_PRESET_ID (V4L2_DV_1080P50) | |
+ #define DEFAULT_HDMI_STD_ID (V4L2_STD_1080P_50) | |
#define DEFALULT_DISPLAY_WIDTH (720) | |
#define DEFALULT_DISPLAY_HEIGHT (480) | |
#define DEFAULT_COMPOSITE_STD (COMPOSITE_STD_NTSC_M) | |
#elif (STD_1080P) | |
#define DEFAULT_OUPUT_MODE (HDMI_OUTPUT_MODE_RGB) | |
- #define DEFAULT_HDMI_RESOLUTION_VALUE (1080960) // 1080P_60 | |
- #define DEFAULT_HDMI_PRESET_ID (V4L2_DV_1080P60) | |
- #define DEFAULT_HDMI_STD_ID (V4L2_STD_1080P_60) | |
+ #define DEFAULT_HDMI_RESOLUTION_VALUE (1080950) // 1080P_60 | |
+ #define DEFAULT_HDMI_PRESET_ID (V4L2_DV_1080P50) | |
+ #define DEFAULT_HDMI_STD_ID (V4L2_STD_1080P_50) | |
#define DEFALULT_DISPLAY_WIDTH (1920) | |
#define DEFALULT_DISPLAY_HEIGHT (1080) | |
#define DEFAULT_COMPOSITE_STD (COMPOSITE_STD_NTSC_M) | |
#elif defined(STD_720P) | |
#define DEFAULT_OUPUT_MODE (HDMI_OUTPUT_MODE_YCBCR) | |
- #define DEFAULT_HDMI_RESOLUTION_VALUE (720960) // 720P_60 | |
- #define DEFAULT_HDMI_PRESET_ID (V4L2_DV_720P60) | |
- #define DEFAULT_HDMI_STD_ID (V4L2_STD_720P_60) | |
+ #define DEFAULT_HDMI_RESOLUTION_VALUE (720950) // 720P_60 | |
+ #define DEFAULT_HDMI_PRESET_ID (V4L2_DV_720P50) | |
+ #define DEFAULT_HDMI_STD_ID (V4L2_STD_720P_50) | |
#define DEFALULT_DISPLAY_WIDTH (1280) | |
#define DEFALULT_DISPLAY_HEIGHT (720) | |
#define DEFAULT_COMPOSITE_STD (COMPOSITE_STD_NTSC_M) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/SecHWC.cpp b/SecHWC.cpp | |
index 386a5c6..f2addbf 100644 | |
--- a/SecHWC.cpp | |
+++ b/SecHWC.cpp | |
@@ -795,7 +795,7 @@ static int hwc_set(hwc_composer_device_t *dev, | |
if ((src_img.usage & GRALLOC_USAGE_PRIVATE_SBS_LR) || | |
(src_img.usage & GRALLOC_USAGE_PRIVATE_SBS_RL)) | |
- mHdmiClient->setHdmiResolution(7209601); // V4L2_STD_TVOUT_720P_60_SBS_HALF | |
+ mHdmiClient->setHdmiResolution(7209501); // V4L2_STD_TVOUT_720P_60_SBS_HALF | |
else if ((src_img.usage & GRALLOC_USAGE_PRIVATE_TB_LR) || | |
(src_img.usage & GRALLOC_USAGE_PRIVATE_TB_RL)) | |
mHdmiClient->setHdmiResolution(1080924); // V4L2_STD_TVOUT_1080P_24_TB | |
diff --git a/SecHWCUtils.cpp b/SecHWCUtils.cpp | |
index 3cce7a3..62252dc 100644 | |
--- a/SecHWCUtils.cpp | |
+++ b/SecHWCUtils.cpp | |
@@ -40,7 +40,7 @@ | |
#ifdef CHECK_FPS | |
#include <sys/time.h> | |
#include <unistd.h> | |
-#define CHK_FRAME_CNT 30 | |
+#define CHK_FRAME_CNT 25 | |
void check_fps() | |
{ | |
diff --git a/SecHWCUtils.h b/SecHWCUtils.h | |
index 02af0d5..d7419f7 100644 | |
--- a/SecHWCUtils.h | |
+++ b/SecHWCUtils.h | |
@@ -62,7 +62,7 @@ | |
#ifdef SKIP_DUMMY_UI_LAY_DRAWING | |
#define GL_WA_OVLY_ALL | |
-#define THRES_FOR_SWAP (30 * 60) /* 60sec in Frames. 30fps * 60 = 1800 */ | |
+#define THRES_FOR_SWAP (25 * 60) /* 60sec in Frames. 30fps * 60 = 1800 */ | |
#endif | |
#define NUM_OF_DUMMY_WIN (4) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment