[Media Router] Add MediaSink subtypes

chrome/browser/media/router/mojo/media_router.mojom

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 module media_router.mojom;
 
 import "mojo/common/time.mojom";
 import "url/mojo/origin.mojom";
+import "url/mojo/url.mojom";
 
 // Represents an output sink to which media can be routed.
 struct MediaSink {
   enum IconType {
     CAST,
     CAST_AUDIO,
     CAST_AUDIO_GROUP,
     GENERIC,
     HANGOUT
   };
 
   // The sink identifier, e.g. "rs71w7mFzYLFlabir_qO4NHl6SUc."
   string sink_id;
   // The human-readable name, e.g. "Janet's Chromecast".
   string name;
   // Optional description of the sink.
   string? description;
   // Optional domain of the sink if this sink is associated with an identity.
   string? domain;
   // The type of icon to show in the UI for this media sink.
   IconType icon_type;
+  // This is currently only set by MediaRouter in OnSinksDiscovered().
+  MediaSinkExtraData? extra_data;
+};
+
+union MediaSinkExtraData {
+  DialMediaSink dial_media_sink;
+  CastMediaSink cast_media_sink;
+};
+
+// Mirror of net::IPAddress.

[dcheng, 2017/03/07 19:54:32]

Sorry, I clarify, I meant that this struct should be defined in //net in a new
mojom file: as long as it's outside the host resolver mojom, then I think that's
fine.

(I think I missed this in a previous review, so sorry for the trouble)

[zhaobin, 2017/03/10 01:42:27]

Done.

+struct IPAddress {
+  // IP address as a numeric value from most to least significant byte.
+  // Will be of length 4 for IPv4 addresses and 16 for IPv6.
+  array<uint8> address;
+};
+
+struct DialMediaSink {
+  IPAddress ip_address;
+
+  // Model name of the sink, if it represents a physical device.
+  string model_name;
+
+  // Used for DIAL launch
+  url.mojom.Url app_url;
+};
+
+struct CastMediaSink {
+  IPAddress ip_address;
+
+  // Model name of the sink, if it represents a physical device.
+  string model_name;
+
+  // A bit vector representing capabilities of the sink. Meaning of capacity
+  // value for each bit:
+  // NONE: 0,
+  // VIDEO_OUT: 1 << 0,
+  // VIDEO_IN: 1 << 1,
+  // AUDIO_OUT: 1 << 2,
+  // AUDIO_IN: 1 << 3,
+  // DEV_MODE: 1 << 4,
+  // MULTIZONE_GROUP: 1 << 5
+  uint8 capabilities;
+
+  // ID of Cast channel opened by Media Router. The ID is defined by the
+  // chrome.cast.channel API.
+  int32 cast_channel_id;
 };
 
 // Should be kept in sync with media_route.h.
 struct MediaRoute {
   // The ID of this media route, e.g. "r_PR1O_blkC9dsKp-tb1ti8qurOo".
   string media_route_id;
   // The ID of the media source being sent through this media route.
   // May be missing if route is not local.
   string? media_source;
   // The ID of sink that is rendering the media content.
@@ skipping 350 matching lines @@
 
   // Called when the a batch of messages arrives from the media sink for the
   // route given by |route_id|.
   // |StartListeningForRouteMessages| must be called first in order to receive
   // messages.
   // |route_id|: ID of route of the messages.
   // |messages|: A non-empty list of messages received.
   OnRouteMessagesReceived(string route_id,
                           array<RouteMessage> messages);
 };