Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(857)

Unified Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2387303002: Image Capture Linux/CrOs, implement brightness, contrast, saturation and sharpness (Closed)
Patch Set: Explicitly initialize to empty the new fields in the Android implementation and rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
index 784334be956b0e7fbadad2610f946178fd1ddd4e..e7c3f2924242af535dc71ef34535d198c228abde 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
@@ -186,6 +186,18 @@ ScriptPromise ImageCapture::setOptions(ScriptState* scriptState,
settings->has_color_temperature = photoSettings.hasColorTemperature();
if (settings->has_color_temperature)
settings->color_temperature = photoSettings.colorTemperature();
+ settings->has_brightness = photoSettings.hasBrightness();
+ if (settings->has_brightness)
+ settings->brightness = photoSettings.brightness();
+ settings->has_contrast = photoSettings.hasContrast();
+ if (settings->has_contrast)
+ settings->contrast = photoSettings.contrast();
+ settings->has_saturation = photoSettings.hasSaturation();
+ if (settings->has_saturation)
+ settings->saturation = photoSettings.saturation();
+ settings->has_sharpness = photoSettings.hasSharpness();
+ if (settings->has_sharpness)
+ settings->sharpness = photoSettings.sharpness();
m_service->SetOptions(m_streamTrack->component()->source()->id(),
std::move(settings),
@@ -298,6 +310,18 @@ void ImageCapture::onCapabilities(
MediaSettingsRange::create(capabilities->color_temperature->max,
capabilities->color_temperature->min,
capabilities->color_temperature->current);
+ MediaSettingsRange* brightness = MediaSettingsRange::create(
+ capabilities->brightness->max, capabilities->brightness->min,
+ capabilities->brightness->current);
+ MediaSettingsRange* contrast = MediaSettingsRange::create(
+ capabilities->contrast->max, capabilities->contrast->min,
+ capabilities->contrast->current);
+ MediaSettingsRange* saturation = MediaSettingsRange::create(
+ capabilities->saturation->max, capabilities->saturation->min,
+ capabilities->saturation->current);
+ MediaSettingsRange* sharpness = MediaSettingsRange::create(
+ capabilities->sharpness->max, capabilities->sharpness->min,
+ capabilities->sharpness->current);
PhotoCapabilities* caps = PhotoCapabilities::create();
caps->setIso(iso);
caps->setImageHeight(height);
@@ -310,6 +334,10 @@ void ImageCapture::onCapabilities(
caps->setFillLightMode(capabilities->fill_light_mode);
caps->setRedEyeReduction(capabilities->red_eye_reduction);
caps->setColorTemperature(colorTemperature);
+ caps->setBrightness(brightness);
+ caps->setContrast(contrast);
+ caps->setSaturation(saturation);
+ caps->setSharpness(sharpness);
resolver->resolve(caps);
}
m_serviceRequests.remove(resolver);

Powered by Google App Engine
This is Rietveld 408576698