video_common: XVID_VM_1080_60_P->XVID_VM_1920x1080_60_P.

Signed-off-by: Andrei-Liviu Simion <andrei.simion@xilinx.com>
This commit is contained in:
Andrei-Liviu Simion 2015-01-12 18:32:45 -08:00 committed by Nava kishore Manne
parent 969ae7b163
commit 4dac8016f3
2 changed files with 6 additions and 5 deletions

View file

@ -141,6 +141,7 @@ typedef enum {
XVID_VM_1920x1080_25_P, XVID_VM_1920x1080_25_P,
XVID_VM_1920x1080_30_P, XVID_VM_1920x1080_30_P,
XVID_VM_1920x1080_50_P, XVID_VM_1920x1080_50_P,
XVID_VM_1920x1080_60_P,
XVID_VM_1920x1200_60_P_RB, XVID_VM_1920x1200_60_P_RB,
XVID_VM_1920x1200_60_P, XVID_VM_1920x1200_60_P,
XVID_VM_1920x1200_75_P, XVID_VM_1920x1200_75_P,
@ -155,7 +156,6 @@ typedef enum {
XVID_VM_2560x1600_85_P, XVID_VM_2560x1600_85_P,
XVID_VM_2560x1600_120_P_RB, XVID_VM_2560x1600_120_P_RB,
XVID_VM_1080_60_P,
XVID_VM_UHD2_60_P, XVID_VM_UHD2_60_P,
XVID_VM_UHD_30_P, XVID_VM_UHD_30_P,
XVID_VM_UHD_60_P, XVID_VM_UHD_60_P,
@ -183,6 +183,7 @@ typedef enum {
XVID_VM_1080_25_P = XVID_VM_1920x1080_25_P, XVID_VM_1080_25_P = XVID_VM_1920x1080_25_P,
XVID_VM_1080_30_P = XVID_VM_1920x1080_30_P, XVID_VM_1080_30_P = XVID_VM_1920x1080_30_P,
XVID_VM_1080_50_P = XVID_VM_1920x1080_50_P, XVID_VM_1080_50_P = XVID_VM_1920x1080_50_P,
XVID_VM_1080_60_P = XVID_VM_1920x1080_60_P,
XVID_VM_WUXGA_60_P = XVID_VM_1920x1200_60_P XVID_VM_WUXGA_60_P = XVID_VM_1920x1200_60_P
} XVid_VideoMode; } XVid_VideoMode;

View file

@ -366,6 +366,10 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] =
103680, 103680,
{1920, 528, 44, 148, 2640, 1, {1920, 528, 44, 148, 2640, 1,
1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
{ XVID_VM_1080_60_P, "1920x1080@60Hz", XVID_FR_60HZ,
148500,
{1920, 88, 44, 148, 2200, 1,
1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
{ XVID_VM_1920x1200_60_P_RB, "1920x1200@60Hz (RB)", XVID_FR_60HZ, { XVID_VM_1920x1200_60_P_RB, "1920x1200@60Hz (RB)", XVID_FR_60HZ,
154000, 154000,
{1920, 48, 32, 80, 2080, 0, {1920, 48, 32, 80, 2080, 0,
@ -419,10 +423,6 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] =
{2560, 48, 32, 80, 2720, 0, {2560, 48, 32, 80, 2720, 0,
1600, 3, 6, 85, 1694, 0, 0, 0, 0, 1} }, 1600, 3, 6, 85, 1694, 0, 0, 0, 0, 1} },
{ XVID_VM_1080_60_P, "1920x1080@60Hz", XVID_FR_60HZ,
148500,
{1920, 88, 44, 148, 2200, 1,
1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} },
{ XVID_VM_UHD2_60_P, "UHD/2@60Hz", XVID_FR_60HZ, { XVID_VM_UHD2_60_P, "UHD/2@60Hz", XVID_FR_60HZ,
297000, 297000,
{1920, 88, 44, 148, 2200, 0, {1920, 88, 44, 148, 2200, 0,