From faf7370a27717665eb5d12d71682bdae3ce5d06a Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Mon, 19 Nov 2012 19:29:48 -0500 Subject: [PATCH] GstPhotography: Add new enum values to match android's parameters https://bugzilla.gnome.org/show_bug.cgi?id=688486 --- gst-libs/gst/interfaces/photography.h | 46 +++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/photography.h index 77592f3fe9..e65c0d9467 100644 --- a/gst-libs/gst/interfaces/photography.h +++ b/gst-libs/gst/interfaces/photography.h @@ -181,6 +181,8 @@ typedef enum * @GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT: Mode for fluorescent lighting * @GST_PHOTOGRAPHY_WB_MODE_MANUAL: Disable automatic white balance adjustment * and keep current values. + * @GST_PHOTOGRAPHY_WB_MODE_WARM_FLUORESCENT: Mode for warm fluorescent lighting (Since 1.2) + * @GST_PHOTOGRAPHY_WB_MODE_SHADE: Mode for shade lighting (Since 1.2) * * Modes for white balance control. */ @@ -192,7 +194,9 @@ typedef enum GST_PHOTOGRAPHY_WB_MODE_SUNSET, GST_PHOTOGRAPHY_WB_MODE_TUNGSTEN, GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT, - GST_PHOTOGRAPHY_WB_MODE_MANUAL + GST_PHOTOGRAPHY_WB_MODE_MANUAL, + GST_PHOTOGRAPHY_WB_MODE_WARM_FLUORESCENT, + GST_PHOTOGRAPHY_WB_MODE_SHADE } GstPhotographyWhiteBalanceMode; /** @@ -209,6 +213,10 @@ typedef enum * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKY_BLUE: Sky blue * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRASS_GREEN: Grass green * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN: Skin whiten + * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_POSTERIZE: Posterize (Since 1.2) + * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_WHITEBOARD: Whiteboard (Since 1.2) + * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_BLACKBOARD: Blackboard (Since 1.2) + * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA: Aqua (Since 1.2) * * Modes for special color effects. */ @@ -225,7 +233,11 @@ typedef enum GST_PHOTOGRAPHY_COLOR_TONE_MODE_OUT_OF_FOCUS, GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKY_BLUE, GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRASS_GREEN, - GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN + GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN, + GST_PHOTOGRAPHY_COLOR_TONE_MODE_POSTERIZE, + GST_PHOTOGRAPHY_COLOR_TONE_MODE_WHITEBOARD, + GST_PHOTOGRAPHY_COLOR_TONE_MODE_BLACKBOARD, + GST_PHOTOGRAPHY_COLOR_TONE_MODE_AQUA } GstPhotographyColorToneMode; /** @@ -237,6 +249,23 @@ typedef enum * @GST_PHOTOGRAPHY_SCENE_MODE_SPORT: Mode for scene with fast motion * @GST_PHOTOGRAPHY_SCENE_MODE_NIGHT: Mode for night conditions * @GST_PHOTOGRAPHY_SCENE_MODE_AUTO: Choose scene mode automatically + * @GST_PHOTOGRAPHY_SCENE_MODE_ACTION: Take photos of fast moving + * objects (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_NIGHT_PORTRAIT: Take people pictures + * at night (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_THEATRE: Take photos in a theater (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_BEACH: Take pictures on the beach (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_SNOW: Take pictures on the snow (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_SUNSET: Take sunset photos (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_STEADY_PHOTO: Avoid blurry pictures + * (for example, due to hand shake) (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_FIREWORKS: For shooting firework + * displays (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_PARTY: Take indoor low-light shot (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_CANDLELIGHT: Capture the naturally warm color + * of scenes lit by candles (Since 1.2) + * @GST_PHOTOGRAPHY_SCENE_MODE_BARCODE: Applications are looking for + * a barcode (Since 1.2) * * Each mode contains preset #GstPhotography options in order to produce * good capturing result in certain scene. @@ -249,7 +278,18 @@ typedef enum GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE, GST_PHOTOGRAPHY_SCENE_MODE_SPORT, GST_PHOTOGRAPHY_SCENE_MODE_NIGHT, - GST_PHOTOGRAPHY_SCENE_MODE_AUTO + GST_PHOTOGRAPHY_SCENE_MODE_AUTO, + GST_PHOTOGRAPHY_SCENE_MODE_ACTION, + GST_PHOTOGRAPHY_SCENE_MODE_NIGHT_PORTRAIT, + GST_PHOTOGRAPHY_SCENE_MODE_THEATRE, + GST_PHOTOGRAPHY_SCENE_MODE_BEACH, + GST_PHOTOGRAPHY_SCENE_MODE_SNOW, + GST_PHOTOGRAPHY_SCENE_MODE_SUNSET, + GST_PHOTOGRAPHY_SCENE_MODE_STEADY_PHOTO, + GST_PHOTOGRAPHY_SCENE_MODE_FIREWORKS, + GST_PHOTOGRAPHY_SCENE_MODE_PARTY, + GST_PHOTOGRAPHY_SCENE_MODE_CANDLELIGHT, + GST_PHOTOGRAPHY_SCENE_MODE_BARCODE } GstPhotographySceneMode; /**