diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2009-12-11 14:28:41 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2009-12-11 14:28:41 -0800 |
| commit | dc2bc8da3cdd97b79f9ec9dc8be6aa386dfb01d8 (patch) | |
| tree | 833037e1e17c1013b68c6eda8caa7f3b0c1debfd | |
| parent | d948d9b7bbdc46ada71bfc92931e6fd7601a6e8d (diff) | |
190.53190.53
| -rw-r--r-- | src/gtk+-2.x/ctkgvo.c | 10 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkgvo.h | 2 | ||||
| -rw-r--r-- | src/libXNVCtrl/NVCtrl.h | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/gtk+-2.x/ctkgvo.c b/src/gtk+-2.x/ctkgvo.c index 3709647..f8fdd0b 100644 --- a/src/gtk+-2.x/ctkgvo.c +++ b/src/gtk+-2.x/ctkgvo.c @@ -183,11 +183,15 @@ const GvioFormatName videoFormatNames[] = { { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_25_00_SMPTE372, "2048 x 1080p 25.00 Hz (SMPTE372)" }, { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_29_97_SMPTE372, "2048 x 1080p 29.97 Hz (SMPTE372)" }, { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_30_00_SMPTE372, "2048 x 1080p 30.00 Hz (SMPTE372)" }, + { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274, "1920 x 1080p 50.00 Hz (SMPTE274) 3G LEVEL A" }, + { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274, "1920 x 1080p 59.94 Hz (SMPTE274) 3G LEVEL A" }, + { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274, "1920 x 1080p 60.00 Hz (SMPTE274) 3G LEVEL A" }, + { -1, NULL }, }; -static GvoFormatDetails videoFormatDetails[] = { +static GvioFormatDetails videoFormatDetails[] = { { NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC, 0, 0, 0 }, { NV_CTRL_GVIO_VIDEO_FORMAT_576I_50_00_SMPTE259_PAL, 0, 0, 0 }, { NV_CTRL_GVIO_VIDEO_FORMAT_720P_23_98_SMPTE296, 0, 0, 0 }, @@ -226,6 +230,10 @@ static GvoFormatDetails videoFormatDetails[] = { { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_25_00_SMPTE372, 0, 0, 0 }, { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_29_97_SMPTE372, 0, 0, 0 }, { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_30_00_SMPTE372, 0, 0, 0 }, + { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274, 0, 0, 0 }, + { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274, 0, 0, 0 }, + { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274, 0, 0, 0 }, + { -1, -1, -1, -1 }, }; diff --git a/src/gtk+-2.x/ctkgvo.h b/src/gtk+-2.x/ctkgvo.h index f68ffcc..4117d09 100644 --- a/src/gtk+-2.x/ctkgvo.h +++ b/src/gtk+-2.x/ctkgvo.h @@ -121,7 +121,7 @@ typedef struct { int rate; int width; int height; -} GvoFormatDetails; +} GvioFormatDetails; diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h index a74fb42..284cb0b 100644 --- a/src/libXNVCtrl/NVCtrl.h +++ b/src/libXNVCtrl/NVCtrl.h @@ -1031,6 +1031,10 @@ #define NV_CTRL_GVIO_VIDEO_FORMAT_2048P_23_98_SMPTE372 36 #define NV_CTRL_GVIO_VIDEO_FORMAT_2048I_48_00_SMPTE372 37 #define NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372 38 +#define NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274 39 +#define NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274 40 +#define NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274 41 + /* * The following are deprecated; NV_CTRL_GVIO_REQUESTED_VIDEO_FORMAT and the |