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

Unified Diff: chrome/utility/media_galleries/media_metadata_parser.cc

Issue 1773233002: Media Galleries Partial Deprecation: Remove image metadata & libexif. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove another test Created 4 years, 9 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: chrome/utility/media_galleries/media_metadata_parser.cc
diff --git a/chrome/utility/media_galleries/media_metadata_parser.cc b/chrome/utility/media_galleries/media_metadata_parser.cc
index 3d6e733149318678911d4d85634434a97dde97e3..d5df856295a2977644cf74eaff4cc06b134be03f 100644
--- a/chrome/utility/media_galleries/media_metadata_parser.cc
+++ b/chrome/utility/media_galleries/media_metadata_parser.cc
@@ -12,7 +12,6 @@
#include "base/strings/string_util.h"
#include "base/task_runner_util.h"
#include "base/threading/thread.h"
-#include "chrome/utility/media_galleries/image_metadata_extractor.h"
#include "media/base/audio_video_metadata_extractor.h"
#include "media/base/data_source.h"
#include "net/base/mime_sniffer.h"
@@ -36,17 +35,6 @@ void SetIntScopedPtr(int value, scoped_ptr<int>* destination) {
destination->reset(new int(value));
}
-void SetDoubleScopedPtr(double value, scoped_ptr<double>* destination) {
- DCHECK(destination);
- if (value >= 0)
- destination->reset(new double(value));
-}
-
-void SetBoolScopedPtr(bool value, scoped_ptr<bool>* destination) {
- DCHECK(destination);
- destination->reset(new bool(value));
-}
-
// This runs on |media_thread_|, as the underlying FFmpeg operation is
// blocking, and the utility thread must not be blocked, so the media file
// bytes can be sent from the browser process to the utility process.
@@ -124,38 +112,6 @@ void FinishParseAudioVideoMetadata(
callback.Run(*metadata, *attached_images);
}
-void FinishParseImageMetadata(
- ImageMetadataExtractor* extractor, const std::string& mime_type,
- MediaMetadataParser::MetadataCallback callback, bool extract_success) {
- DCHECK(extractor);
- MediaMetadataParser::MediaMetadata metadata;
- metadata.mime_type = mime_type;
-
- if (!extract_success) {
- callback.Run(metadata, std::vector<AttachedImage>());
- return;
- }
-
- SetIntScopedPtr(extractor->height(), &metadata.height);
- SetIntScopedPtr(extractor->width(), &metadata.width);
-
- SetIntScopedPtr(extractor->rotation(), &metadata.rotation);
-
- SetDoubleScopedPtr(extractor->x_resolution(), &metadata.x_resolution);
- SetDoubleScopedPtr(extractor->y_resolution(), &metadata.y_resolution);
- SetBoolScopedPtr(extractor->flash_fired(), &metadata.flash_fired);
- SetStringScopedPtr(extractor->camera_make(), &metadata.camera_make);
- SetStringScopedPtr(extractor->camera_model(), &metadata.camera_model);
- SetDoubleScopedPtr(extractor->exposure_time_sec(),
- &metadata.exposure_time_seconds);
-
- SetDoubleScopedPtr(extractor->f_number(), &metadata.f_number);
- SetDoubleScopedPtr(extractor->focal_length_mm(), &metadata.focal_length_mm);
- SetDoubleScopedPtr(extractor->iso_equivalent(), &metadata.iso_equivalent);
-
- callback.Run(metadata, std::vector<AttachedImage>());
-}
-
} // namespace
MediaMetadataParser::MediaMetadataParser(media::DataSource* source,
@@ -186,15 +142,6 @@ void MediaMetadataParser::Start(const MetadataCallback& callback) {
return;
}
- if (base::StartsWith(mime_type_, "image/", base::CompareCase::SENSITIVE)) {
- ImageMetadataExtractor* extractor = new ImageMetadataExtractor;
- extractor->Extract(
- source_,
- base::Bind(&FinishParseImageMetadata, base::Owned(extractor),
- mime_type_, callback));
- return;
- }
-
callback.Run(MediaMetadata(), std::vector<AttachedImage>());
}

Powered by Google App Engine
This is Rietveld 408576698