Revert "[media] Move Metadata into fuchsia.media."
This reverts commit e9797233a302400cecd50add09157d76ad8e289f.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> [media] Move Metadata into fuchsia.media.
>
> This type can be shared by fuchsia.mediaplayer and
> fuchsia.media.session.
>
> TEST: CQ
> Change-Id: Iea7d28b19e8b71565bb01366acf26bbc813f2c1b
TBR=dalesat@google.com,mpuryear@google.com,turnage@google.com
Change-Id: I2f3955d85a2f0df38db3df0da00723f5783c73bb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
diff --git a/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc b/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc
index 72ae556..c6fed4a 100644
--- a/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc
+++ b/bin/mediaplayer/ffmpeg/ffmpeg_demux.cc
@@ -29,12 +29,12 @@
namespace {
const std::unordered_map<std::string, std::string> kMetadataLabelMap{
- {"TITLE", fuchsia::media::METADATA_LABEL_TITLE},
- {"ARTIST", fuchsia::media::METADATA_LABEL_ARTIST},
- {"ALBUM", fuchsia::media::METADATA_LABEL_ALBUM},
- {"PUBLISHER", fuchsia::media::METADATA_LABEL_PUBLISHER},
- {"GENRE", fuchsia::media::METADATA_LABEL_GENRE},
- {"COMPOSER", fuchsia::media::METADATA_LABEL_COMPOSER},
+ {"TITLE", fuchsia::mediaplayer::METADATA_LABEL_TITLE},
+ {"ARTIST", fuchsia::mediaplayer::METADATA_LABEL_ARTIST},
+ {"ALBUM", fuchsia::mediaplayer::METADATA_LABEL_ALBUM},
+ {"PUBLISHER", fuchsia::mediaplayer::METADATA_LABEL_PUBLISHER},
+ {"GENRE", fuchsia::mediaplayer::METADATA_LABEL_GENRE},
+ {"COMPOSER", fuchsia::mediaplayer::METADATA_LABEL_COMPOSER},
};
const std::string kMetadataUnknownPropertyPrefix = "ffmpeg.";
diff --git a/bin/mediaplayer/fidl/fidl_type_conversions.cc b/bin/mediaplayer/fidl/fidl_type_conversions.cc
index 8a9d7df..7215ce6 100644
--- a/bin/mediaplayer/fidl/fidl_type_conversions.cc
+++ b/bin/mediaplayer/fidl/fidl_type_conversions.cc
@@ -453,12 +453,12 @@
return nullptr;
}
-fuchsia::media::Metadata
-TypeConverter<fuchsia::media::Metadata, media_player::Metadata>::Convert(
+fuchsia::mediaplayer::Metadata
+TypeConverter<fuchsia::mediaplayer::Metadata, media_player::Metadata>::Convert(
const media_player::Metadata& input) {
- fuchsia::media::Metadata result;
+ fuchsia::mediaplayer::Metadata result;
for (auto& pair : input) {
- fuchsia::media::Property property;
+ fuchsia::mediaplayer::Property property;
property.label = pair.first;
property.value = pair.second;
result.properties->push_back(property);
@@ -468,8 +468,8 @@
}
media_player::Metadata
-TypeConverter<media_player::Metadata, fuchsia::media::Metadata>::Convert(
- const fuchsia::media::Metadata& input) {
+TypeConverter<media_player::Metadata, fuchsia::mediaplayer::Metadata>::Convert(
+ const fuchsia::mediaplayer::Metadata& input) {
media_player::Metadata result(input.properties->size());
for (auto& property : *input.properties) {
result.emplace(property.label, property.value);
diff --git a/bin/mediaplayer/fidl/fidl_type_conversions.h b/bin/mediaplayer/fidl/fidl_type_conversions.h
index 7b966a9..8257ad7 100644
--- a/bin/mediaplayer/fidl/fidl_type_conversions.h
+++ b/bin/mediaplayer/fidl/fidl_type_conversions.h
@@ -107,15 +107,15 @@
};
template <>
-struct TypeConverter<fuchsia::media::Metadata, media_player::Metadata> {
- static fuchsia::media::Metadata Convert(
+struct TypeConverter<fuchsia::mediaplayer::Metadata, media_player::Metadata> {
+ static fuchsia::mediaplayer::Metadata Convert(
const media_player::Metadata& input);
};
template <>
-struct TypeConverter<media_player::Metadata, fuchsia::media::Metadata> {
+struct TypeConverter<media_player::Metadata, fuchsia::mediaplayer::Metadata> {
static media_player::Metadata Convert(
- const fuchsia::media::Metadata& input);
+ const fuchsia::mediaplayer::Metadata& input);
};
template <>
diff --git a/bin/mediaplayer/player_impl.cc b/bin/mediaplayer/player_impl.cc
index b9aafc9..62e891b 100644
--- a/bin/mediaplayer/player_impl.cc
+++ b/bin/mediaplayer/player_impl.cc
@@ -567,7 +567,7 @@
void PlayerImpl::CreateStreamSource(
int64_t duration_ns, bool can_pause, bool can_seek,
- std::unique_ptr<fuchsia::media::Metadata> metadata,
+ std::unique_ptr<fuchsia::mediaplayer::Metadata> metadata,
::fidl::InterfaceRequest<fuchsia::mediaplayer::StreamSource>
source_request) {
FXL_DCHECK(source_request);
@@ -664,7 +664,7 @@
auto metadata = core_.metadata();
status_.metadata =
metadata ? fidl::MakeOptional(
- fxl::To<fuchsia::media::Metadata>(*metadata))
+ fxl::To<fuchsia::mediaplayer::Metadata>(*metadata))
: nullptr;
if (video_renderer_) {
diff --git a/bin/mediaplayer/player_impl.h b/bin/mediaplayer/player_impl.h
index 511760e..8bc82cc 100644
--- a/bin/mediaplayer/player_impl.h
+++ b/bin/mediaplayer/player_impl.h
@@ -80,7 +80,7 @@
void CreateStreamSource(
int64_t duration_ns, bool can_pause, bool can_seek,
- std::unique_ptr<fuchsia::media::Metadata> metadata,
+ std::unique_ptr<fuchsia::mediaplayer::Metadata> metadata,
::fidl::InterfaceRequest<fuchsia::mediaplayer::StreamSource>
source_request) override;
diff --git a/bin/mediaplayer/source_impl.cc b/bin/mediaplayer/source_impl.cc
index 422cf55..d240252 100644
--- a/bin/mediaplayer/source_impl.cc
+++ b/bin/mediaplayer/source_impl.cc
@@ -125,7 +125,7 @@
auto metadata = source_segment_->metadata();
status_.metadata =
metadata ? fidl::MakeOptional(
- fxl::To<fuchsia::media::Metadata>(*metadata))
+ fxl::To<fuchsia::mediaplayer::Metadata>(*metadata))
: nullptr;
status_.problem = SafeClone(source_segment_->problem());
@@ -185,7 +185,7 @@
// static
std::unique_ptr<StreamSourceImpl> StreamSourceImpl::Create(
int64_t duration_ns, bool can_pause, bool can_seek,
- std::unique_ptr<fuchsia::media::Metadata> metadata, Graph* graph,
+ std::unique_ptr<fuchsia::mediaplayer::Metadata> metadata, Graph* graph,
fidl::InterfaceRequest<fuchsia::mediaplayer::StreamSource> request,
fit::closure connection_failure_callback) {
FXL_DCHECK(graph);
@@ -197,7 +197,7 @@
StreamSourceImpl::StreamSourceImpl(
int64_t duration_ns, bool can_pause, bool can_seek,
- std::unique_ptr<fuchsia::media::Metadata> metadata, Graph* graph,
+ std::unique_ptr<fuchsia::mediaplayer::Metadata> metadata, Graph* graph,
fidl::InterfaceRequest<fuchsia::mediaplayer::StreamSource> request,
fit::closure connection_failure_callback)
: SourceImpl(graph, std::move(connection_failure_callback)),
diff --git a/bin/mediaplayer/source_impl.h b/bin/mediaplayer/source_impl.h
index 5dbd541..a337f29 100644
--- a/bin/mediaplayer/source_impl.h
+++ b/bin/mediaplayer/source_impl.h
@@ -116,13 +116,13 @@
// to signal that its connection has failed.
static std::unique_ptr<StreamSourceImpl> Create(
int64_t duration_ns, bool can_pause, bool can_seek,
- std::unique_ptr<fuchsia::media::Metadata> metadata, Graph* graph,
+ std::unique_ptr<fuchsia::mediaplayer::Metadata> metadata, Graph* graph,
fidl::InterfaceRequest<fuchsia::mediaplayer::StreamSource> request,
fit::closure connection_failure_callback);
StreamSourceImpl(
int64_t duration_ns, bool can_pause, bool can_seek,
- std::unique_ptr<fuchsia::media::Metadata> metadata, Graph* graph,
+ std::unique_ptr<fuchsia::mediaplayer::Metadata> metadata, Graph* graph,
fidl::InterfaceRequest<fuchsia::mediaplayer::StreamSource> request,
fit::closure connection_failure_callback);
diff --git a/bin/mediaplayer/test/mediaplayer_test_util_view.h b/bin/mediaplayer/test/mediaplayer_test_util_view.h
index b835aec..f409732 100644
--- a/bin/mediaplayer/test/mediaplayer_test_util_view.h
+++ b/bin/mediaplayer/test/mediaplayer_test_util_view.h
@@ -88,7 +88,7 @@
State state_ = State::kPaused;
media::TimelineFunction timeline_function_;
int64_t duration_ns_ = 0;
- fuchsia::media::MetadataPtr metadata_;
+ fuchsia::mediaplayer::MetadataPtr metadata_;
fuchsia::math::RectF content_rect_;
fuchsia::math::RectF controls_rect_;
bool problem_shown_ = false;
diff --git a/examples/mediaplayer/audio_player/audio_player.cc b/examples/mediaplayer/audio_player/audio_player.cc
index 860cabe..c8f2999 100644
--- a/examples/mediaplayer/audio_player/audio_player.cc
+++ b/examples/mediaplayer/audio_player/audio_player.cc
@@ -81,22 +81,22 @@
FXL_LOG(INFO) << "duration " << std::fixed << std::setprecision(1)
<< double(status.duration_ns) / 1000000000.0 << " seconds";
MaybeLogMetadataProperty(*status.metadata,
- fuchsia::media::METADATA_LABEL_TITLE,
+ fuchsia::mediaplayer::METADATA_LABEL_TITLE,
"title ");
MaybeLogMetadataProperty(*status.metadata,
- fuchsia::media::METADATA_LABEL_ARTIST,
+ fuchsia::mediaplayer::METADATA_LABEL_ARTIST,
"artist ");
MaybeLogMetadataProperty(*status.metadata,
- fuchsia::media::METADATA_LABEL_ALBUM,
+ fuchsia::mediaplayer::METADATA_LABEL_ALBUM,
"album ");
MaybeLogMetadataProperty(*status.metadata,
- fuchsia::media::METADATA_LABEL_PUBLISHER,
+ fuchsia::mediaplayer::METADATA_LABEL_PUBLISHER,
"publisher ");
MaybeLogMetadataProperty(*status.metadata,
- fuchsia::media::METADATA_LABEL_GENRE,
+ fuchsia::mediaplayer::METADATA_LABEL_GENRE,
"genre ");
MaybeLogMetadataProperty(*status.metadata,
- fuchsia::media::METADATA_LABEL_COMPOSER,
+ fuchsia::mediaplayer::METADATA_LABEL_COMPOSER,
"composer ");
metadata_shown_ = true;
}
@@ -135,7 +135,7 @@
}
void AudioPlayer::MaybeLogMetadataProperty(
- const fuchsia::media::Metadata& metadata,
+ const fuchsia::mediaplayer::Metadata& metadata,
const std::string& property_label, const std::string& prefix) {
for (auto& property : *metadata.properties) {
if (property.label == property_label) {
diff --git a/examples/mediaplayer/audio_player/audio_player.h b/examples/mediaplayer/audio_player/audio_player.h
index 00780c6..d479085 100644
--- a/examples/mediaplayer/audio_player/audio_player.h
+++ b/examples/mediaplayer/audio_player/audio_player.h
@@ -28,7 +28,7 @@
void HandleStatusChanged(const fuchsia::mediaplayer::PlayerStatus& status);
// Logs a metadata property, if it exists.
- void MaybeLogMetadataProperty(const fuchsia::media::Metadata& metadata,
+ void MaybeLogMetadataProperty(const fuchsia::mediaplayer::Metadata& metadata,
const std::string& property_label,
const std::string& prefix);
diff --git a/public/fidl/fuchsia.media/BUILD.gn b/public/fidl/fuchsia.media/BUILD.gn
index 74dec49..ff2e41b 100644
--- a/public/fidl/fuchsia.media/BUILD.gn
+++ b/public/fidl/fuchsia.media/BUILD.gn
@@ -13,7 +13,6 @@
"audio_device_enumerator.fidl",
"audio_renderer.fidl",
"gain_control.fidl",
- "metadata.fidl",
"stream.fidl",
"stream_type.fidl",
]
diff --git a/public/fidl/fuchsia.media/metadata.fidl b/public/fidl/fuchsia.media/metadata.fidl
deleted file mode 100644
index 1b08ffc..0000000
--- a/public/fidl/fuchsia.media/metadata.fidl
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2018 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-library fuchsia.media;
-
-// Describes media.
-struct Metadata {
- vector<Property> properties;
-};
-
-struct Property {
- string label;
- string value;
-};
-
-const string METADATA_LABEL_TITLE = "fuchsia.media.title";
-const string METADATA_LABEL_ARTIST = "fuchsia.media.artist";
-const string METADATA_LABEL_ALBUM = "fuchsia.media.album";
-const string METADATA_LABEL_PUBLISHER = "fuchsia.media.publisher";
-const string METADATA_LABEL_GENRE = "fuchsia.media.genre";
-const string METADATA_LABEL_COMPOSER = "fuchsia.media.composer";
diff --git a/public/fidl/fuchsia.mediaplayer/BUILD.gn b/public/fidl/fuchsia.mediaplayer/BUILD.gn
index 29ca13f..c56c1a3 100644
--- a/public/fidl/fuchsia.mediaplayer/BUILD.gn
+++ b/public/fidl/fuchsia.mediaplayer/BUILD.gn
@@ -6,6 +6,7 @@
fidl("fuchsia.mediaplayer") {
sources = [
+ "metadata.fidl",
"player.fidl",
"problem.fidl",
"seeking_reader.fidl",
diff --git a/public/fidl/fuchsia.mediaplayer/metadata.fidl b/public/fidl/fuchsia.mediaplayer/metadata.fidl
new file mode 100644
index 0000000..9eca6fd
--- /dev/null
+++ b/public/fidl/fuchsia.mediaplayer/metadata.fidl
@@ -0,0 +1,22 @@
+// Copyright 2018 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+library fuchsia.mediaplayer;
+
+// Describes media.
+struct Metadata {
+ vector<Property> properties;
+};
+
+struct Property {
+ string label;
+ string value;
+};
+
+const string METADATA_LABEL_TITLE = "fuchsia.mediaplayer.title";
+const string METADATA_LABEL_ARTIST = "fuchsia.mediaplayer.artist";
+const string METADATA_LABEL_ALBUM = "fuchsia.mediaplayer.album";
+const string METADATA_LABEL_PUBLISHER = "fuchsia.mediaplayer.publisher";
+const string METADATA_LABEL_GENRE = "fuchsia.mediaplayer.genre";
+const string METADATA_LABEL_COMPOSER = "fuchsia.mediaplayer.composer";
diff --git a/public/fidl/fuchsia.mediaplayer/player.fidl b/public/fidl/fuchsia.mediaplayer/player.fidl
index 64b5035..e6d914f 100644
--- a/public/fidl/fuchsia.mediaplayer/player.fidl
+++ b/public/fidl/fuchsia.mediaplayer/player.fidl
@@ -87,7 +87,7 @@
bool ready;
// Describes the media.
- fuchsia.media.Metadata? metadata;
+ Metadata? metadata;
// Indicates a problem preventing intended operation.
Problem? problem;
diff --git a/public/fidl/fuchsia.mediaplayer/source_manager.fidl b/public/fidl/fuchsia.mediaplayer/source_manager.fidl
index 598ca80..c2fd94d 100644
--- a/public/fidl/fuchsia.mediaplayer/source_manager.fidl
+++ b/public/fidl/fuchsia.mediaplayer/source_manager.fidl
@@ -29,7 +29,7 @@
// the player, in the PlayerStatus as well. can_pause and can_seek, when
// false, constrain the capabilities of the player.
CreateStreamSource(int64 duration_ns, bool can_pause, bool can_seek,
- fuchsia.media.Metadata? metadata,
+ Metadata? metadata,
request<StreamSource> source_request);
// Sets the source for this player to use. If source is null, the player
@@ -117,7 +117,7 @@
bool ready;
// Describes the media.
- fuchsia.media.Metadata? metadata;
+ Metadata? metadata;
// Indicates a problem preventing intended operation.
Problem? problem;
