Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer Now that we have MediaTimelineConsumer, MediaConsumer should really be MediaPacketConsumer and MediaProducer should really be MediaPacketProducer. We're about to overhaul both packet interfaces, so now is a good time to get this fixed. This CL also removes the pull producer, which isn't used currently. It may come back in the future. R=kulakowski@chromium.org Review URL: https://codereview.chromium.org/2097953002 .
diff --git a/examples/audio_play_test/play_tone.cc b/examples/audio_play_test/play_tone.cc index 6db542e..9b4f1c5 100644 --- a/examples/audio_play_test/play_tone.cc +++ b/examples/audio_play_test/play_tone.cc
@@ -141,8 +141,8 @@ media_type->encoding = MediaType::kAudioEncodingLpcm; media_renderer_->SetMediaType(media_type.Pass()); - MediaConsumerPtr pipe; - media_renderer_->GetConsumer(GetProxy(&pipe)); + MediaPacketConsumerPtr pipe; + media_renderer_->GetPacketConsumer(GetProxy(&pipe)); // Now that the configuration request is in-flight and we our media pipe // proxy, pass its interface to our circular buffer helper, set up our
diff --git a/examples/audio_play_test/play_wav.cc b/examples/audio_play_test/play_wav.cc index c2506a4..f9daaad 100644 --- a/examples/audio_play_test/play_wav.cc +++ b/examples/audio_play_test/play_wav.cc
@@ -60,7 +60,7 @@ private: using AudioPipePtr = std::unique_ptr<CircularBufferMediaPipeAdapter>; using AudioPacket = CircularBufferMediaPipeAdapter::MappedPacket; - using PacketCbk = MediaConsumer::SendPacketCallback; + using PacketCbk = MediaPacketConsumer::SendPacketCallback; // TODO(johngro): endianness! struct PACKED RIFFChunkHeader { @@ -103,7 +103,7 @@ bool ReadAndValidateDATAHeader(); void OnNeedsData(MediaResult res); - void OnPlayoutComplete(MediaConsumer::SendResult res); + void OnPlayoutComplete(MediaPacketConsumer::SendResult res); void OnConnectionError(const std::string& connection_name); void PostShutdown(); void Shutdown(); @@ -175,9 +175,10 @@ OnConnectionError("url_loader"); }); - playout_complete_cbk_ = PacketCbk([this](MediaConsumer::SendResult res) { - this->OnPlayoutComplete(res); - }); + playout_complete_cbk_ = + PacketCbk([this](MediaPacketConsumer::SendResult res) { + this->OnPlayoutComplete(res); + }); URLRequestPtr req(URLRequest::New()); req->url = TEST_FILE; @@ -282,8 +283,8 @@ // Configure the track based on the WAV header information. media_renderer_->SetMediaType(media_type.Pass()); - MediaConsumerPtr media_pipe; - media_renderer_->GetConsumer(GetProxy(&media_pipe)); + MediaPacketConsumerPtr media_pipe; + media_renderer_->GetPacketConsumer(GetProxy(&media_pipe)); // Grab the timeline consumer interface for our audio renderer. MediaTimelineControlPointPtr timeline_control_point; @@ -508,7 +509,7 @@ } } -void PlayWAVApp::OnPlayoutComplete(MediaConsumer::SendResult res) { +void PlayWAVApp::OnPlayoutComplete(MediaPacketConsumer::SendResult res) { MOJO_DCHECK(!audio_pipe_->GetPending()); audio_pipe_ = nullptr; PostShutdown();
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_demux.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_demux.mojom.dart index 8601854..56e9e7d 100644 --- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_demux.mojom.dart +++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_demux.mojom.dart
@@ -128,28 +128,28 @@ } -class _MediaDemuxGetProducerParams extends bindings.Struct { +class _MediaDemuxGetPacketProducerParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; int streamIndex = 0; - media_transport_mojom.MediaProducerInterfaceRequest producer = null; + media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer = null; - _MediaDemuxGetProducerParams() : super(kVersions.last.size); + _MediaDemuxGetPacketProducerParams() : super(kVersions.last.size); - _MediaDemuxGetProducerParams.init( + _MediaDemuxGetPacketProducerParams.init( int this.streamIndex, - media_transport_mojom.MediaProducerInterfaceRequest this.producer + media_transport_mojom.MediaPacketProducerInterfaceRequest this.packetProducer ) : super(kVersions.last.size); - static _MediaDemuxGetProducerParams deserialize(bindings.Message message) => + static _MediaDemuxGetPacketProducerParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaDemuxGetProducerParams decode(bindings.Decoder decoder0) { + static _MediaDemuxGetPacketProducerParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaDemuxGetProducerParams result = new _MediaDemuxGetProducerParams(); + _MediaDemuxGetPacketProducerParams result = new _MediaDemuxGetPacketProducerParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { @@ -158,20 +158,20 @@ } if (mainDataHeader.version >= 0) { - result.producer = decoder0.decodeInterfaceRequest(12, false, media_transport_mojom.MediaProducerStub.newFromEndpoint); + result.packetProducer = decoder0.decodeInterfaceRequest(12, false, media_transport_mojom.MediaPacketProducerStub.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaDemuxGetProducerParams"; + const String structName = "_MediaDemuxGetPacketProducerParams"; String fieldName; try { fieldName = "streamIndex"; encoder0.encodeUint32(streamIndex, 8); - fieldName = "producer"; - encoder0.encodeInterfaceRequest(producer, 12, false); + fieldName = "packetProducer"; + encoder0.encodeInterfaceRequest(packetProducer, 12, false); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -179,9 +179,9 @@ } String toString() { - return "_MediaDemuxGetProducerParams(" + return "_MediaDemuxGetPacketProducerParams(" "streamIndex: $streamIndex" ", " - "producer: $producer" ")"; + "packetProducer: $packetProducer" ")"; } Map toJson() { @@ -592,7 +592,7 @@ } const int _mediaDemuxMethodDescribeName = 0; -const int _mediaDemuxMethodGetProducerName = 1; +const int _mediaDemuxMethodGetPacketProducerName = 1; const int _mediaDemuxMethodGetMetadataName = 2; const int _mediaDemuxMethodPrimeName = 3; const int _mediaDemuxMethodFlushName = 4; @@ -635,7 +635,7 @@ return p; } void describe(void callback(List<media_types_mojom.MediaType> streamTypes)); - void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer); + void getPacketProducer(int streamIndex, media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer); void getMetadata(int versionLastSeen,void callback(int version, media_metadata_mojom.MediaMetadata metadata)); void prime(void callback()); void flush(void callback()); @@ -790,20 +790,20 @@ bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); } - void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer) { + void getPacketProducer(int streamIndex, media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer) { if (impl != null) { - impl.getProducer(streamIndex, producer); + impl.getPacketProducer(streamIndex, packetProducer); return; } if (!ctrl.isBound) { ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaDemuxGetProducerParams(); + var params = new _MediaDemuxGetPacketProducerParams(); params.streamIndex = streamIndex; - params.producer = producer; + params.packetProducer = packetProducer; ctrl.sendMessage(params, - _mediaDemuxMethodGetProducerName); + _mediaDemuxMethodGetPacketProducerName); } void getMetadata(int versionLastSeen,void callback(int version, media_metadata_mojom.MediaMetadata metadata)) { if (impl != null) { @@ -999,10 +999,10 @@ case _mediaDemuxMethodDescribeName: _impl.describe(_mediaDemuxDescribeResponseParamsResponder(message.header.requestId)); break; - case _mediaDemuxMethodGetProducerName: - var params = _MediaDemuxGetProducerParams.deserialize( + case _mediaDemuxMethodGetPacketProducerName: + var params = _MediaDemuxGetPacketProducerParams.deserialize( message.payload); - _impl.getProducer(params.streamIndex, params.producer); + _impl.getPacketProducer(params.streamIndex, params.packetProducer); break; case _mediaDemuxMethodGetMetadataName: var params = _MediaDemuxGetMetadataParams.deserialize( @@ -1080,8 +1080,8 @@ void describe(void callback(List<media_types_mojom.MediaType> streamTypes)) { return impl.describe(callback); } - void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer) { - return impl.getProducer(streamIndex, producer); + void getPacketProducer(int streamIndex, media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer) { + return impl.getPacketProducer(streamIndex, packetProducer); } void getMetadata(int versionLastSeen,void callback(int version, media_metadata_mojom.MediaMetadata metadata)) { return impl.getMetadata(versionLastSeen,callback);
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_renderer.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_renderer.mojom.dart index 8de3e51..b457073 100644 --- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_renderer.mojom.dart +++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_renderer.mojom.dart
@@ -184,42 +184,42 @@ } -class _MediaRendererGetConsumerParams extends bindings.Struct { +class _MediaRendererGetPacketConsumerParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; - media_transport_mojom.MediaConsumerInterfaceRequest consumer = null; + media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer = null; - _MediaRendererGetConsumerParams() : super(kVersions.last.size); + _MediaRendererGetPacketConsumerParams() : super(kVersions.last.size); - _MediaRendererGetConsumerParams.init( - media_transport_mojom.MediaConsumerInterfaceRequest this.consumer + _MediaRendererGetPacketConsumerParams.init( + media_transport_mojom.MediaPacketConsumerInterfaceRequest this.packetConsumer ) : super(kVersions.last.size); - static _MediaRendererGetConsumerParams deserialize(bindings.Message message) => + static _MediaRendererGetPacketConsumerParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaRendererGetConsumerParams decode(bindings.Decoder decoder0) { + static _MediaRendererGetPacketConsumerParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaRendererGetConsumerParams result = new _MediaRendererGetConsumerParams(); + _MediaRendererGetPacketConsumerParams result = new _MediaRendererGetPacketConsumerParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { - result.consumer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaConsumerStub.newFromEndpoint); + result.packetConsumer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaPacketConsumerStub.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaRendererGetConsumerParams"; + const String structName = "_MediaRendererGetPacketConsumerParams"; String fieldName; try { - fieldName = "consumer"; - encoder0.encodeInterfaceRequest(consumer, 8, false); + fieldName = "packetConsumer"; + encoder0.encodeInterfaceRequest(packetConsumer, 8, false); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -227,8 +227,8 @@ } String toString() { - return "_MediaRendererGetConsumerParams(" - "consumer: $consumer" ")"; + return "_MediaRendererGetPacketConsumerParams(" + "packetConsumer: $packetConsumer" ")"; } Map toJson() { @@ -293,7 +293,7 @@ const int _mediaRendererMethodGetSupportedMediaTypesName = 0; const int _mediaRendererMethodSetMediaTypeName = 1; -const int _mediaRendererMethodGetConsumerName = 2; +const int _mediaRendererMethodGetPacketConsumerName = 2; const int _mediaRendererMethodGetTimelineControlPointName = 3; class _MediaRendererServiceDescription implements service_describer.ServiceDescription { @@ -334,7 +334,7 @@ } void getSupportedMediaTypes(void callback(List<media_types_mojom.MediaTypeSet> supportedMediaTypes)); void setMediaType(media_types_mojom.MediaType mediaType); - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer); + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer); void getTimelineControlPoint(timeline_controller_mojom.MediaTimelineControlPointInterfaceRequest timelineControlPoint); } @@ -467,19 +467,19 @@ ctrl.sendMessage(params, _mediaRendererMethodSetMediaTypeName); } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer) { + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer) { if (impl != null) { - impl.getConsumer(consumer); + impl.getPacketConsumer(packetConsumer); return; } if (!ctrl.isBound) { ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaRendererGetConsumerParams(); - params.consumer = consumer; + var params = new _MediaRendererGetPacketConsumerParams(); + params.packetConsumer = packetConsumer; ctrl.sendMessage(params, - _mediaRendererMethodGetConsumerName); + _mediaRendererMethodGetPacketConsumerName); } void getTimelineControlPoint(timeline_controller_mojom.MediaTimelineControlPointInterfaceRequest timelineControlPoint) { if (impl != null) { @@ -550,10 +550,10 @@ message.payload); _impl.setMediaType(params.mediaType); break; - case _mediaRendererMethodGetConsumerName: - var params = _MediaRendererGetConsumerParams.deserialize( + case _mediaRendererMethodGetPacketConsumerName: + var params = _MediaRendererGetPacketConsumerParams.deserialize( message.payload); - _impl.getConsumer(params.consumer); + _impl.getPacketConsumer(params.packetConsumer); break; case _mediaRendererMethodGetTimelineControlPointName: var params = _MediaRendererGetTimelineControlPointParams.deserialize( @@ -623,8 +623,8 @@ void setMediaType(media_types_mojom.MediaType mediaType) { return impl.setMediaType(mediaType); } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer) { - return impl.getConsumer(consumer); + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer) { + return impl.getPacketConsumer(packetConsumer); } void getTimelineControlPoint(timeline_controller_mojom.MediaTimelineControlPointInterfaceRequest timelineControlPoint) { return impl.getTimelineControlPoint(timelineControlPoint);
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart index e14c4b0..c6ecf98 100644 --- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart +++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart
@@ -11,42 +11,42 @@ -class _MediaSinkGetConsumerParams extends bindings.Struct { +class _MediaSinkGetPacketConsumerParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; - media_transport_mojom.MediaConsumerInterfaceRequest consumer = null; + media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer = null; - _MediaSinkGetConsumerParams() : super(kVersions.last.size); + _MediaSinkGetPacketConsumerParams() : super(kVersions.last.size); - _MediaSinkGetConsumerParams.init( - media_transport_mojom.MediaConsumerInterfaceRequest this.consumer + _MediaSinkGetPacketConsumerParams.init( + media_transport_mojom.MediaPacketConsumerInterfaceRequest this.packetConsumer ) : super(kVersions.last.size); - static _MediaSinkGetConsumerParams deserialize(bindings.Message message) => + static _MediaSinkGetPacketConsumerParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaSinkGetConsumerParams decode(bindings.Decoder decoder0) { + static _MediaSinkGetPacketConsumerParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaSinkGetConsumerParams result = new _MediaSinkGetConsumerParams(); + _MediaSinkGetPacketConsumerParams result = new _MediaSinkGetPacketConsumerParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { - result.consumer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaConsumerStub.newFromEndpoint); + result.packetConsumer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaPacketConsumerStub.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaSinkGetConsumerParams"; + const String structName = "_MediaSinkGetPacketConsumerParams"; String fieldName; try { - fieldName = "consumer"; - encoder0.encodeInterfaceRequest(consumer, 8, false); + fieldName = "packetConsumer"; + encoder0.encodeInterfaceRequest(packetConsumer, 8, false); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -54,8 +54,8 @@ } String toString() { - return "_MediaSinkGetConsumerParams(" - "consumer: $consumer" ")"; + return "_MediaSinkGetPacketConsumerParams(" + "packetConsumer: $packetConsumer" ")"; } Map toJson() { @@ -118,7 +118,7 @@ } } -const int _mediaSinkMethodGetConsumerName = 0; +const int _mediaSinkMethodGetPacketConsumerName = 0; const int _mediaSinkMethodGetTimelineControlPointName = 1; class _MediaSinkServiceDescription implements service_describer.ServiceDescription { @@ -157,7 +157,7 @@ s.connectToService(url, p, name); return p; } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer); + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer); void getTimelineControlPoint(timeline_controller_mojom.MediaTimelineControlPointInterfaceRequest timelineControlPoint); } @@ -244,19 +244,19 @@ } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer) { + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer) { if (impl != null) { - impl.getConsumer(consumer); + impl.getPacketConsumer(packetConsumer); return; } if (!ctrl.isBound) { ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaSinkGetConsumerParams(); - params.consumer = consumer; + var params = new _MediaSinkGetPacketConsumerParams(); + params.packetConsumer = packetConsumer; ctrl.sendMessage(params, - _mediaSinkMethodGetConsumerName); + _mediaSinkMethodGetPacketConsumerName); } void getTimelineControlPoint(timeline_controller_mojom.MediaTimelineControlPointInterfaceRequest timelineControlPoint) { if (impl != null) { @@ -307,10 +307,10 @@ throw new core.MojoApiError("$this has no implementation set"); } switch (message.header.type) { - case _mediaSinkMethodGetConsumerName: - var params = _MediaSinkGetConsumerParams.deserialize( + case _mediaSinkMethodGetPacketConsumerName: + var params = _MediaSinkGetPacketConsumerParams.deserialize( message.payload); - _impl.getConsumer(params.consumer); + _impl.getPacketConsumer(params.packetConsumer); break; case _mediaSinkMethodGetTimelineControlPointName: var params = _MediaSinkGetTimelineControlPointParams.deserialize( @@ -374,8 +374,8 @@ } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer) { - return impl.getConsumer(consumer); + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer) { + return impl.getPacketConsumer(packetConsumer); } void getTimelineControlPoint(timeline_controller_mojom.MediaTimelineControlPointInterfaceRequest timelineControlPoint) { return impl.getTimelineControlPoint(timelineControlPoint);
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_source.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_source.mojom.dart index add31da..44372cb 100644 --- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_source.mojom.dart +++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_source.mojom.dart
@@ -261,28 +261,28 @@ } -class _MediaSourceGetProducerParams extends bindings.Struct { +class _MediaSourceGetPacketProducerParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; int streamIndex = 0; - media_transport_mojom.MediaProducerInterfaceRequest producer = null; + media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer = null; - _MediaSourceGetProducerParams() : super(kVersions.last.size); + _MediaSourceGetPacketProducerParams() : super(kVersions.last.size); - _MediaSourceGetProducerParams.init( + _MediaSourceGetPacketProducerParams.init( int this.streamIndex, - media_transport_mojom.MediaProducerInterfaceRequest this.producer + media_transport_mojom.MediaPacketProducerInterfaceRequest this.packetProducer ) : super(kVersions.last.size); - static _MediaSourceGetProducerParams deserialize(bindings.Message message) => + static _MediaSourceGetPacketProducerParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaSourceGetProducerParams decode(bindings.Decoder decoder0) { + static _MediaSourceGetPacketProducerParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaSourceGetProducerParams result = new _MediaSourceGetProducerParams(); + _MediaSourceGetPacketProducerParams result = new _MediaSourceGetPacketProducerParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { @@ -291,20 +291,20 @@ } if (mainDataHeader.version >= 0) { - result.producer = decoder0.decodeInterfaceRequest(12, false, media_transport_mojom.MediaProducerStub.newFromEndpoint); + result.packetProducer = decoder0.decodeInterfaceRequest(12, false, media_transport_mojom.MediaPacketProducerStub.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaSourceGetProducerParams"; + const String structName = "_MediaSourceGetPacketProducerParams"; String fieldName; try { fieldName = "streamIndex"; encoder0.encodeUint32(streamIndex, 8); - fieldName = "producer"; - encoder0.encodeInterfaceRequest(producer, 12, false); + fieldName = "packetProducer"; + encoder0.encodeInterfaceRequest(packetProducer, 12, false); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -312,72 +312,9 @@ } String toString() { - return "_MediaSourceGetProducerParams(" + return "_MediaSourceGetPacketProducerParams(" "streamIndex: $streamIndex" ", " - "producer: $producer" ")"; - } - - Map toJson() { - throw new bindings.MojoCodecError( - 'Object containing handles cannot be encoded to JSON.'); - } -} - - -class _MediaSourceGetPullModeProducerParams extends bindings.Struct { - static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(16, 0) - ]; - int streamIndex = 0; - media_transport_mojom.MediaPullModeProducerInterfaceRequest producer = null; - - _MediaSourceGetPullModeProducerParams() : super(kVersions.last.size); - - _MediaSourceGetPullModeProducerParams.init( - int this.streamIndex, - media_transport_mojom.MediaPullModeProducerInterfaceRequest this.producer - ) : super(kVersions.last.size); - - static _MediaSourceGetPullModeProducerParams deserialize(bindings.Message message) => - bindings.Struct.deserialize(decode, message); - - static _MediaSourceGetPullModeProducerParams decode(bindings.Decoder decoder0) { - if (decoder0 == null) { - return null; - } - _MediaSourceGetPullModeProducerParams result = new _MediaSourceGetPullModeProducerParams(); - - var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - if (mainDataHeader.version >= 0) { - - result.streamIndex = decoder0.decodeUint32(8); - } - if (mainDataHeader.version >= 0) { - - result.producer = decoder0.decodeInterfaceRequest(12, false, media_transport_mojom.MediaPullModeProducerStub.newFromEndpoint); - } - return result; - } - - void encode(bindings.Encoder encoder) { - var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaSourceGetPullModeProducerParams"; - String fieldName; - try { - fieldName = "streamIndex"; - encoder0.encodeUint32(streamIndex, 8); - fieldName = "producer"; - encoder0.encodeInterfaceRequest(producer, 12, false); - } on bindings.MojoCodecError catch(e) { - bindings.Struct.fixErrorMessage(e, fieldName, structName); - rethrow; - } - } - - String toString() { - return "_MediaSourceGetPullModeProducerParams(" - "streamIndex: $streamIndex" ", " - "producer: $producer" ")"; + "packetProducer: $packetProducer" ")"; } Map toJson() { @@ -878,13 +815,12 @@ } const int _mediaSourceMethodGetStreamsName = 0; -const int _mediaSourceMethodGetProducerName = 1; -const int _mediaSourceMethodGetPullModeProducerName = 2; -const int _mediaSourceMethodGetStatusName = 3; -const int _mediaSourceMethodPrepareName = 4; -const int _mediaSourceMethodPrimeName = 5; -const int _mediaSourceMethodFlushName = 6; -const int _mediaSourceMethodSeekName = 7; +const int _mediaSourceMethodGetPacketProducerName = 1; +const int _mediaSourceMethodGetStatusName = 2; +const int _mediaSourceMethodPrepareName = 3; +const int _mediaSourceMethodPrimeName = 4; +const int _mediaSourceMethodFlushName = 5; +const int _mediaSourceMethodSeekName = 6; class _MediaSourceServiceDescription implements service_describer.ServiceDescription { void getTopLevelInterface(Function responder) { @@ -923,8 +859,7 @@ return p; } void getStreams(void callback(List<MediaSourceStreamDescriptor> streams)); - void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer); - void getPullModeProducer(int streamIndex, media_transport_mojom.MediaPullModeProducerInterfaceRequest producer); + void getPacketProducer(int streamIndex, media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer); void getStatus(int versionLastSeen,void callback(int version, MediaSourceStatus status)); void prepare(void callback()); void prime(void callback()); @@ -1088,35 +1023,20 @@ bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); } - void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer) { + void getPacketProducer(int streamIndex, media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer) { if (impl != null) { - impl.getProducer(streamIndex, producer); + impl.getPacketProducer(streamIndex, packetProducer); return; } if (!ctrl.isBound) { ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaSourceGetProducerParams(); + var params = new _MediaSourceGetPacketProducerParams(); params.streamIndex = streamIndex; - params.producer = producer; + params.packetProducer = packetProducer; ctrl.sendMessage(params, - _mediaSourceMethodGetProducerName); - } - void getPullModeProducer(int streamIndex, media_transport_mojom.MediaPullModeProducerInterfaceRequest producer) { - if (impl != null) { - impl.getPullModeProducer(streamIndex, producer); - return; - } - if (!ctrl.isBound) { - ctrl.proxyError("The Proxy is closed."); - return; - } - var params = new _MediaSourceGetPullModeProducerParams(); - params.streamIndex = streamIndex; - params.producer = producer; - ctrl.sendMessage(params, - _mediaSourceMethodGetPullModeProducerName); + _mediaSourceMethodGetPacketProducerName); } void getStatus(int versionLastSeen,void callback(int version, MediaSourceStatus status)) { if (impl != null) { @@ -1347,15 +1267,10 @@ case _mediaSourceMethodGetStreamsName: _impl.getStreams(_mediaSourceGetStreamsResponseParamsResponder(message.header.requestId)); break; - case _mediaSourceMethodGetProducerName: - var params = _MediaSourceGetProducerParams.deserialize( + case _mediaSourceMethodGetPacketProducerName: + var params = _MediaSourceGetPacketProducerParams.deserialize( message.payload); - _impl.getProducer(params.streamIndex, params.producer); - break; - case _mediaSourceMethodGetPullModeProducerName: - var params = _MediaSourceGetPullModeProducerParams.deserialize( - message.payload); - _impl.getPullModeProducer(params.streamIndex, params.producer); + _impl.getPacketProducer(params.streamIndex, params.packetProducer); break; case _mediaSourceMethodGetStatusName: var params = _MediaSourceGetStatusParams.deserialize( @@ -1436,11 +1351,8 @@ void getStreams(void callback(List<MediaSourceStreamDescriptor> streams)) { return impl.getStreams(callback); } - void getProducer(int streamIndex, media_transport_mojom.MediaProducerInterfaceRequest producer) { - return impl.getProducer(streamIndex, producer); - } - void getPullModeProducer(int streamIndex, media_transport_mojom.MediaPullModeProducerInterfaceRequest producer) { - return impl.getPullModeProducer(streamIndex, producer); + void getPacketProducer(int streamIndex, media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer) { + return impl.getPacketProducer(streamIndex, packetProducer); } void getStatus(int versionLastSeen,void callback(int version, MediaSourceStatus status)) { return impl.getStatus(versionLastSeen,callback);
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_transport.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_transport.mojom.dart index 5b98925..f36bb89 100644 --- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_transport.mojom.dart +++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_transport.mojom.dart
@@ -179,38 +179,38 @@ } -class _MediaProducerConnectParams extends bindings.Struct { +class _MediaPacketProducerConnectParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; - MediaConsumerInterface consumer = null; + MediaPacketConsumerInterface consumer = null; - _MediaProducerConnectParams() : super(kVersions.last.size); + _MediaPacketProducerConnectParams() : super(kVersions.last.size); - _MediaProducerConnectParams.init( - MediaConsumerInterface this.consumer + _MediaPacketProducerConnectParams.init( + MediaPacketConsumerInterface this.consumer ) : super(kVersions.last.size); - static _MediaProducerConnectParams deserialize(bindings.Message message) => + static _MediaPacketProducerConnectParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaProducerConnectParams decode(bindings.Decoder decoder0) { + static _MediaPacketProducerConnectParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaProducerConnectParams result = new _MediaProducerConnectParams(); + _MediaPacketProducerConnectParams result = new _MediaPacketProducerConnectParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { - result.consumer = decoder0.decodeServiceInterface(8, false, MediaConsumerProxy.newFromEndpoint); + result.consumer = decoder0.decodeServiceInterface(8, false, MediaPacketConsumerProxy.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaProducerConnectParams"; + const String structName = "_MediaPacketProducerConnectParams"; String fieldName; try { fieldName = "consumer"; @@ -222,7 +222,7 @@ } String toString() { - return "_MediaProducerConnectParams(" + return "_MediaPacketProducerConnectParams(" "consumer: $consumer" ")"; } @@ -233,24 +233,24 @@ } -class MediaProducerConnectResponseParams extends bindings.Struct { +class MediaPacketProducerConnectResponseParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(8, 0) ]; - MediaProducerConnectResponseParams() : super(kVersions.last.size); + MediaPacketProducerConnectResponseParams() : super(kVersions.last.size); - MediaProducerConnectResponseParams.init( + MediaPacketProducerConnectResponseParams.init( ) : super(kVersions.last.size); - static MediaProducerConnectResponseParams deserialize(bindings.Message message) => + static MediaPacketProducerConnectResponseParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static MediaProducerConnectResponseParams decode(bindings.Decoder decoder0) { + static MediaPacketProducerConnectResponseParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - MediaProducerConnectResponseParams result = new MediaProducerConnectResponseParams(); + MediaPacketProducerConnectResponseParams result = new MediaPacketProducerConnectResponseParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); return result; @@ -258,7 +258,7 @@ void encode(bindings.Encoder encoder) { encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaProducerConnectResponseParams"; + const String structName = "MediaPacketProducerConnectResponseParams"; String fieldName; try { } on bindings.MojoCodecError catch(e) { @@ -268,7 +268,7 @@ } String toString() { - return "MediaProducerConnectResponseParams("")"; + return "MediaPacketProducerConnectResponseParams("")"; } Map toJson() { @@ -278,24 +278,24 @@ } -class _MediaProducerDisconnectParams extends bindings.Struct { +class _MediaPacketProducerDisconnectParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(8, 0) ]; - _MediaProducerDisconnectParams() : super(kVersions.last.size); + _MediaPacketProducerDisconnectParams() : super(kVersions.last.size); - _MediaProducerDisconnectParams.init( + _MediaPacketProducerDisconnectParams.init( ) : super(kVersions.last.size); - static _MediaProducerDisconnectParams deserialize(bindings.Message message) => + static _MediaPacketProducerDisconnectParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaProducerDisconnectParams decode(bindings.Decoder decoder0) { + static _MediaPacketProducerDisconnectParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaProducerDisconnectParams result = new _MediaProducerDisconnectParams(); + _MediaPacketProducerDisconnectParams result = new _MediaPacketProducerDisconnectParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); return result; @@ -303,7 +303,7 @@ void encode(bindings.Encoder encoder) { encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaProducerDisconnectParams"; + const String structName = "_MediaPacketProducerDisconnectParams"; String fieldName; try { } on bindings.MojoCodecError catch(e) { @@ -313,7 +313,7 @@ } String toString() { - return "_MediaProducerDisconnectParams("")"; + return "_MediaPacketProducerDisconnectParams("")"; } Map toJson() { @@ -323,71 +323,26 @@ } -class _MediaPullModeProducerGetBufferParams extends bindings.Struct { - static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(8, 0) - ]; - - _MediaPullModeProducerGetBufferParams() : super(kVersions.last.size); - - _MediaPullModeProducerGetBufferParams.init( - ) : super(kVersions.last.size); - - static _MediaPullModeProducerGetBufferParams deserialize(bindings.Message message) => - bindings.Struct.deserialize(decode, message); - - static _MediaPullModeProducerGetBufferParams decode(bindings.Decoder decoder0) { - if (decoder0 == null) { - return null; - } - _MediaPullModeProducerGetBufferParams result = new _MediaPullModeProducerGetBufferParams(); - - var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - return result; - } - - void encode(bindings.Encoder encoder) { - encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaPullModeProducerGetBufferParams"; - String fieldName; - try { - } on bindings.MojoCodecError catch(e) { - bindings.Struct.fixErrorMessage(e, fieldName, structName); - rethrow; - } - } - - String toString() { - return "_MediaPullModeProducerGetBufferParams("")"; - } - - Map toJson() { - Map map = new Map(); - return map; - } -} - - -class MediaPullModeProducerGetBufferResponseParams extends bindings.Struct { +class _MediaPacketConsumerSetBufferParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; core.MojoSharedBuffer buffer = null; - MediaPullModeProducerGetBufferResponseParams() : super(kVersions.last.size); + _MediaPacketConsumerSetBufferParams() : super(kVersions.last.size); - MediaPullModeProducerGetBufferResponseParams.init( + _MediaPacketConsumerSetBufferParams.init( core.MojoSharedBuffer this.buffer ) : super(kVersions.last.size); - static MediaPullModeProducerGetBufferResponseParams deserialize(bindings.Message message) => + static _MediaPacketConsumerSetBufferParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static MediaPullModeProducerGetBufferResponseParams decode(bindings.Decoder decoder0) { + static _MediaPacketConsumerSetBufferParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - MediaPullModeProducerGetBufferResponseParams result = new MediaPullModeProducerGetBufferResponseParams(); + _MediaPacketConsumerSetBufferParams result = new _MediaPacketConsumerSetBufferParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { @@ -399,7 +354,7 @@ void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaPullModeProducerGetBufferResponseParams"; + const String structName = "_MediaPacketConsumerSetBufferParams"; String fieldName; try { fieldName = "buffer"; @@ -411,7 +366,7 @@ } String toString() { - return "MediaPullModeProducerGetBufferResponseParams(" + return "_MediaPacketConsumerSetBufferParams(" "buffer: $buffer" ")"; } @@ -422,43 +377,34 @@ } -class _MediaPullModeProducerPullPacketParams extends bindings.Struct { +class MediaPacketConsumerSetBufferResponseParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(16, 0) + const bindings.StructDataHeader(8, 0) ]; - MediaPacket toRelease = null; - _MediaPullModeProducerPullPacketParams() : super(kVersions.last.size); + MediaPacketConsumerSetBufferResponseParams() : super(kVersions.last.size); - _MediaPullModeProducerPullPacketParams.init( - MediaPacket this.toRelease + MediaPacketConsumerSetBufferResponseParams.init( ) : super(kVersions.last.size); - static _MediaPullModeProducerPullPacketParams deserialize(bindings.Message message) => + static MediaPacketConsumerSetBufferResponseParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaPullModeProducerPullPacketParams decode(bindings.Decoder decoder0) { + static MediaPacketConsumerSetBufferResponseParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaPullModeProducerPullPacketParams result = new _MediaPullModeProducerPullPacketParams(); + MediaPacketConsumerSetBufferResponseParams result = new MediaPacketConsumerSetBufferResponseParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - if (mainDataHeader.version >= 0) { - - var decoder1 = decoder0.decodePointer(8, true); - result.toRelease = MediaPacket.decode(decoder1); - } return result; } void encode(bindings.Encoder encoder) { - var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaPullModeProducerPullPacketParams"; + encoder.getStructEncoderAtOffset(kVersions.last); + const String structName = "MediaPacketConsumerSetBufferResponseParams"; String fieldName; try { - fieldName = "toRelease"; - encoder0.encodeStruct(toRelease, 8, true); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -466,38 +412,36 @@ } String toString() { - return "_MediaPullModeProducerPullPacketParams(" - "toRelease: $toRelease" ")"; + return "MediaPacketConsumerSetBufferResponseParams("")"; } Map toJson() { Map map = new Map(); - map["toRelease"] = toRelease; return map; } } -class MediaPullModeProducerPullPacketResponseParams extends bindings.Struct { +class _MediaPacketConsumerSendPacketParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; MediaPacket packet = null; - MediaPullModeProducerPullPacketResponseParams() : super(kVersions.last.size); + _MediaPacketConsumerSendPacketParams() : super(kVersions.last.size); - MediaPullModeProducerPullPacketResponseParams.init( + _MediaPacketConsumerSendPacketParams.init( MediaPacket this.packet ) : super(kVersions.last.size); - static MediaPullModeProducerPullPacketResponseParams deserialize(bindings.Message message) => + static _MediaPacketConsumerSendPacketParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static MediaPullModeProducerPullPacketResponseParams decode(bindings.Decoder decoder0) { + static _MediaPacketConsumerSendPacketParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - MediaPullModeProducerPullPacketResponseParams result = new MediaPullModeProducerPullPacketResponseParams(); + _MediaPacketConsumerSendPacketParams result = new _MediaPacketConsumerSendPacketParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { @@ -510,7 +454,7 @@ void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaPullModeProducerPullPacketResponseParams"; + const String structName = "_MediaPacketConsumerSendPacketParams"; String fieldName; try { fieldName = "packet"; @@ -522,7 +466,7 @@ } String toString() { - return "MediaPullModeProducerPullPacketResponseParams(" + return "_MediaPacketConsumerSendPacketParams(" "packet: $packet" ")"; } @@ -534,245 +478,34 @@ } -class _MediaPullModeProducerReleasePacketParams extends bindings.Struct { +class MediaPacketConsumerSendPacketResponseParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; - MediaPacket toRelease = null; + MediaPacketConsumerSendResult result = null; - _MediaPullModeProducerReleasePacketParams() : super(kVersions.last.size); + MediaPacketConsumerSendPacketResponseParams() : super(kVersions.last.size); - _MediaPullModeProducerReleasePacketParams.init( - MediaPacket this.toRelease + MediaPacketConsumerSendPacketResponseParams.init( + MediaPacketConsumerSendResult this.result ) : super(kVersions.last.size); - static _MediaPullModeProducerReleasePacketParams deserialize(bindings.Message message) => + static MediaPacketConsumerSendPacketResponseParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaPullModeProducerReleasePacketParams decode(bindings.Decoder decoder0) { + static MediaPacketConsumerSendPacketResponseParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaPullModeProducerReleasePacketParams result = new _MediaPullModeProducerReleasePacketParams(); + MediaPacketConsumerSendPacketResponseParams result = new MediaPacketConsumerSendPacketResponseParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { - var decoder1 = decoder0.decodePointer(8, false); - result.toRelease = MediaPacket.decode(decoder1); - } - return result; - } - - void encode(bindings.Encoder encoder) { - var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaPullModeProducerReleasePacketParams"; - String fieldName; - try { - fieldName = "toRelease"; - encoder0.encodeStruct(toRelease, 8, false); - } on bindings.MojoCodecError catch(e) { - bindings.Struct.fixErrorMessage(e, fieldName, structName); - rethrow; - } - } - - String toString() { - return "_MediaPullModeProducerReleasePacketParams(" - "toRelease: $toRelease" ")"; - } - - Map toJson() { - Map map = new Map(); - map["toRelease"] = toRelease; - return map; - } -} - - -class _MediaConsumerSetBufferParams extends bindings.Struct { - static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(16, 0) - ]; - core.MojoSharedBuffer buffer = null; - - _MediaConsumerSetBufferParams() : super(kVersions.last.size); - - _MediaConsumerSetBufferParams.init( - core.MojoSharedBuffer this.buffer - ) : super(kVersions.last.size); - - static _MediaConsumerSetBufferParams deserialize(bindings.Message message) => - bindings.Struct.deserialize(decode, message); - - static _MediaConsumerSetBufferParams decode(bindings.Decoder decoder0) { - if (decoder0 == null) { - return null; - } - _MediaConsumerSetBufferParams result = new _MediaConsumerSetBufferParams(); - - var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - if (mainDataHeader.version >= 0) { - - result.buffer = decoder0.decodeSharedBufferHandle(8, false); - } - return result; - } - - void encode(bindings.Encoder encoder) { - var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaConsumerSetBufferParams"; - String fieldName; - try { - fieldName = "buffer"; - encoder0.encodeSharedBufferHandle(buffer, 8, false); - } on bindings.MojoCodecError catch(e) { - bindings.Struct.fixErrorMessage(e, fieldName, structName); - rethrow; - } - } - - String toString() { - return "_MediaConsumerSetBufferParams(" - "buffer: $buffer" ")"; - } - - Map toJson() { - throw new bindings.MojoCodecError( - 'Object containing handles cannot be encoded to JSON.'); - } -} - - -class MediaConsumerSetBufferResponseParams extends bindings.Struct { - static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(8, 0) - ]; - - MediaConsumerSetBufferResponseParams() : super(kVersions.last.size); - - MediaConsumerSetBufferResponseParams.init( - ) : super(kVersions.last.size); - - static MediaConsumerSetBufferResponseParams deserialize(bindings.Message message) => - bindings.Struct.deserialize(decode, message); - - static MediaConsumerSetBufferResponseParams decode(bindings.Decoder decoder0) { - if (decoder0 == null) { - return null; - } - MediaConsumerSetBufferResponseParams result = new MediaConsumerSetBufferResponseParams(); - - var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - return result; - } - - void encode(bindings.Encoder encoder) { - encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaConsumerSetBufferResponseParams"; - String fieldName; - try { - } on bindings.MojoCodecError catch(e) { - bindings.Struct.fixErrorMessage(e, fieldName, structName); - rethrow; - } - } - - String toString() { - return "MediaConsumerSetBufferResponseParams("")"; - } - - Map toJson() { - Map map = new Map(); - return map; - } -} - - -class _MediaConsumerSendPacketParams extends bindings.Struct { - static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(16, 0) - ]; - MediaPacket packet = null; - - _MediaConsumerSendPacketParams() : super(kVersions.last.size); - - _MediaConsumerSendPacketParams.init( - MediaPacket this.packet - ) : super(kVersions.last.size); - - static _MediaConsumerSendPacketParams deserialize(bindings.Message message) => - bindings.Struct.deserialize(decode, message); - - static _MediaConsumerSendPacketParams decode(bindings.Decoder decoder0) { - if (decoder0 == null) { - return null; - } - _MediaConsumerSendPacketParams result = new _MediaConsumerSendPacketParams(); - - var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - if (mainDataHeader.version >= 0) { - - var decoder1 = decoder0.decodePointer(8, false); - result.packet = MediaPacket.decode(decoder1); - } - return result; - } - - void encode(bindings.Encoder encoder) { - var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaConsumerSendPacketParams"; - String fieldName; - try { - fieldName = "packet"; - encoder0.encodeStruct(packet, 8, false); - } on bindings.MojoCodecError catch(e) { - bindings.Struct.fixErrorMessage(e, fieldName, structName); - rethrow; - } - } - - String toString() { - return "_MediaConsumerSendPacketParams(" - "packet: $packet" ")"; - } - - Map toJson() { - Map map = new Map(); - map["packet"] = packet; - return map; - } -} - - -class MediaConsumerSendPacketResponseParams extends bindings.Struct { - static const List<bindings.StructDataHeader> kVersions = const [ - const bindings.StructDataHeader(16, 0) - ]; - MediaConsumerSendResult result = null; - - MediaConsumerSendPacketResponseParams() : super(kVersions.last.size); - - MediaConsumerSendPacketResponseParams.init( - MediaConsumerSendResult this.result - ) : super(kVersions.last.size); - - static MediaConsumerSendPacketResponseParams deserialize(bindings.Message message) => - bindings.Struct.deserialize(decode, message); - - static MediaConsumerSendPacketResponseParams decode(bindings.Decoder decoder0) { - if (decoder0 == null) { - return null; - } - MediaConsumerSendPacketResponseParams result = new MediaConsumerSendPacketResponseParams(); - - var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); - if (mainDataHeader.version >= 0) { - - result.result = MediaConsumerSendResult.decode(decoder0, 8); + result.result = MediaPacketConsumerSendResult.decode(decoder0, 8); if (result.result == null) { throw new bindings.MojoCodecError( - 'Trying to decode null union for non-nullable MediaConsumerSendResult.'); + 'Trying to decode null union for non-nullable MediaPacketConsumerSendResult.'); } } return result; @@ -780,7 +513,7 @@ void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaConsumerSendPacketResponseParams"; + const String structName = "MediaPacketConsumerSendPacketResponseParams"; String fieldName; try { fieldName = "result"; @@ -792,7 +525,7 @@ } String toString() { - return "MediaConsumerSendPacketResponseParams(" + return "MediaPacketConsumerSendPacketResponseParams(" "result: $result" ")"; } @@ -804,24 +537,24 @@ } -class _MediaConsumerPrimeParams extends bindings.Struct { +class _MediaPacketConsumerPrimeParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(8, 0) ]; - _MediaConsumerPrimeParams() : super(kVersions.last.size); + _MediaPacketConsumerPrimeParams() : super(kVersions.last.size); - _MediaConsumerPrimeParams.init( + _MediaPacketConsumerPrimeParams.init( ) : super(kVersions.last.size); - static _MediaConsumerPrimeParams deserialize(bindings.Message message) => + static _MediaPacketConsumerPrimeParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaConsumerPrimeParams decode(bindings.Decoder decoder0) { + static _MediaPacketConsumerPrimeParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaConsumerPrimeParams result = new _MediaConsumerPrimeParams(); + _MediaPacketConsumerPrimeParams result = new _MediaPacketConsumerPrimeParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); return result; @@ -829,7 +562,7 @@ void encode(bindings.Encoder encoder) { encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaConsumerPrimeParams"; + const String structName = "_MediaPacketConsumerPrimeParams"; String fieldName; try { } on bindings.MojoCodecError catch(e) { @@ -839,7 +572,7 @@ } String toString() { - return "_MediaConsumerPrimeParams("")"; + return "_MediaPacketConsumerPrimeParams("")"; } Map toJson() { @@ -849,24 +582,24 @@ } -class MediaConsumerPrimeResponseParams extends bindings.Struct { +class MediaPacketConsumerPrimeResponseParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(8, 0) ]; - MediaConsumerPrimeResponseParams() : super(kVersions.last.size); + MediaPacketConsumerPrimeResponseParams() : super(kVersions.last.size); - MediaConsumerPrimeResponseParams.init( + MediaPacketConsumerPrimeResponseParams.init( ) : super(kVersions.last.size); - static MediaConsumerPrimeResponseParams deserialize(bindings.Message message) => + static MediaPacketConsumerPrimeResponseParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static MediaConsumerPrimeResponseParams decode(bindings.Decoder decoder0) { + static MediaPacketConsumerPrimeResponseParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - MediaConsumerPrimeResponseParams result = new MediaConsumerPrimeResponseParams(); + MediaPacketConsumerPrimeResponseParams result = new MediaPacketConsumerPrimeResponseParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); return result; @@ -874,7 +607,7 @@ void encode(bindings.Encoder encoder) { encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaConsumerPrimeResponseParams"; + const String structName = "MediaPacketConsumerPrimeResponseParams"; String fieldName; try { } on bindings.MojoCodecError catch(e) { @@ -884,7 +617,7 @@ } String toString() { - return "MediaConsumerPrimeResponseParams("")"; + return "MediaPacketConsumerPrimeResponseParams("")"; } Map toJson() { @@ -894,24 +627,24 @@ } -class _MediaConsumerFlushParams extends bindings.Struct { +class _MediaPacketConsumerFlushParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(8, 0) ]; - _MediaConsumerFlushParams() : super(kVersions.last.size); + _MediaPacketConsumerFlushParams() : super(kVersions.last.size); - _MediaConsumerFlushParams.init( + _MediaPacketConsumerFlushParams.init( ) : super(kVersions.last.size); - static _MediaConsumerFlushParams deserialize(bindings.Message message) => + static _MediaPacketConsumerFlushParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaConsumerFlushParams decode(bindings.Decoder decoder0) { + static _MediaPacketConsumerFlushParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaConsumerFlushParams result = new _MediaConsumerFlushParams(); + _MediaPacketConsumerFlushParams result = new _MediaPacketConsumerFlushParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); return result; @@ -919,7 +652,7 @@ void encode(bindings.Encoder encoder) { encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaConsumerFlushParams"; + const String structName = "_MediaPacketConsumerFlushParams"; String fieldName; try { } on bindings.MojoCodecError catch(e) { @@ -929,7 +662,7 @@ } String toString() { - return "_MediaConsumerFlushParams("")"; + return "_MediaPacketConsumerFlushParams("")"; } Map toJson() { @@ -939,24 +672,24 @@ } -class MediaConsumerFlushResponseParams extends bindings.Struct { +class MediaPacketConsumerFlushResponseParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(8, 0) ]; - MediaConsumerFlushResponseParams() : super(kVersions.last.size); + MediaPacketConsumerFlushResponseParams() : super(kVersions.last.size); - MediaConsumerFlushResponseParams.init( + MediaPacketConsumerFlushResponseParams.init( ) : super(kVersions.last.size); - static MediaConsumerFlushResponseParams deserialize(bindings.Message message) => + static MediaPacketConsumerFlushResponseParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static MediaConsumerFlushResponseParams decode(bindings.Decoder decoder0) { + static MediaPacketConsumerFlushResponseParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - MediaConsumerFlushResponseParams result = new MediaConsumerFlushResponseParams(); + MediaPacketConsumerFlushResponseParams result = new MediaPacketConsumerFlushResponseParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); return result; @@ -964,7 +697,7 @@ void encode(bindings.Encoder encoder) { encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "MediaConsumerFlushResponseParams"; + const String structName = "MediaPacketConsumerFlushResponseParams"; String fieldName; try { } on bindings.MojoCodecError catch(e) { @@ -974,7 +707,7 @@ } String toString() { - return "MediaConsumerFlushResponseParams("")"; + return "MediaPacketConsumerFlushResponseParams("")"; } Map toJson() { @@ -983,10 +716,10 @@ } } -const int _mediaProducerMethodConnectName = 0; -const int _mediaProducerMethodDisconnectName = 1; +const int _mediaPacketProducerMethodConnectName = 0; +const int _mediaPacketProducerMethodDisconnectName = 1; -class _MediaProducerServiceDescription implements service_describer.ServiceDescription { +class _MediaPacketProducerServiceDescription implements service_describer.ServiceDescription { void getTopLevelInterface(Function responder) { responder(null); } @@ -1000,21 +733,21 @@ } } -abstract class MediaProducer { +abstract class MediaPacketProducer { static const String serviceName = null; static service_describer.ServiceDescription _cachedServiceDescription; static service_describer.ServiceDescription get serviceDescription { if (_cachedServiceDescription == null) { - _cachedServiceDescription = new _MediaProducerServiceDescription(); + _cachedServiceDescription = new _MediaPacketProducerServiceDescription(); } return _cachedServiceDescription; } - static MediaProducerProxy connectToService( + static MediaPacketProducerProxy connectToService( bindings.ServiceConnector s, String url, [String serviceName]) { - MediaProducerProxy p = new MediaProducerProxy.unbound(); - String name = serviceName ?? MediaProducer.serviceName; + MediaPacketProducerProxy p = new MediaPacketProducerProxy.unbound(); + String name = serviceName ?? MediaPacketProducer.serviceName; if ((name == null) || name.isEmpty) { throw new core.MojoApiError( "If an interface has no ServiceName, then one must be provided."); @@ -1022,54 +755,54 @@ s.connectToService(url, p, name); return p; } - void connect(MediaConsumerInterface consumer,void callback()); + void connect(MediaPacketConsumerInterface consumer,void callback()); void disconnect(); } -abstract class MediaProducerInterface - implements bindings.MojoInterface<MediaProducer>, - MediaProducer { - factory MediaProducerInterface([MediaProducer impl]) => - new MediaProducerStub.unbound(impl); +abstract class MediaPacketProducerInterface + implements bindings.MojoInterface<MediaPacketProducer>, + MediaPacketProducer { + factory MediaPacketProducerInterface([MediaPacketProducer impl]) => + new MediaPacketProducerStub.unbound(impl); - factory MediaProducerInterface.fromEndpoint( + factory MediaPacketProducerInterface.fromEndpoint( core.MojoMessagePipeEndpoint endpoint, - [MediaProducer impl]) => - new MediaProducerStub.fromEndpoint(endpoint, impl); + [MediaPacketProducer impl]) => + new MediaPacketProducerStub.fromEndpoint(endpoint, impl); - factory MediaProducerInterface.fromMock( - MediaProducer mock) => - new MediaProducerProxy.fromMock(mock); + factory MediaPacketProducerInterface.fromMock( + MediaPacketProducer mock) => + new MediaPacketProducerProxy.fromMock(mock); } -abstract class MediaProducerInterfaceRequest - implements bindings.MojoInterface<MediaProducer>, - MediaProducer { - factory MediaProducerInterfaceRequest() => - new MediaProducerProxy.unbound(); +abstract class MediaPacketProducerInterfaceRequest + implements bindings.MojoInterface<MediaPacketProducer>, + MediaPacketProducer { + factory MediaPacketProducerInterfaceRequest() => + new MediaPacketProducerProxy.unbound(); } -class _MediaProducerProxyControl +class _MediaPacketProducerProxyControl extends bindings.ProxyMessageHandler - implements bindings.ProxyControl<MediaProducer> { - MediaProducer impl; + implements bindings.ProxyControl<MediaPacketProducer> { + MediaPacketProducer impl; - _MediaProducerProxyControl.fromEndpoint( + _MediaPacketProducerProxyControl.fromEndpoint( core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint); - _MediaProducerProxyControl.fromHandle( + _MediaPacketProducerProxyControl.fromHandle( core.MojoHandle handle) : super.fromHandle(handle); - _MediaProducerProxyControl.unbound() : super.unbound(); + _MediaPacketProducerProxyControl.unbound() : super.unbound(); - String get serviceName => MediaProducer.serviceName; + String get serviceName => MediaPacketProducer.serviceName; void handleResponse(bindings.ServiceMessage message) { switch (message.header.type) { - case _mediaProducerMethodConnectName: + case _mediaPacketProducerMethodConnectName: Function callback = getCallback(message); if (callback != null) { - var r = MediaProducerConnectResponseParams.deserialize( + var r = MediaPacketProducerConnectResponseParams.deserialize( message.payload); callback(); } @@ -1084,45 +817,45 @@ @override String toString() { var superString = super.toString(); - return "_MediaProducerProxyControl($superString)"; + return "_MediaPacketProducerProxyControl($superString)"; } } -class MediaProducerProxy - extends bindings.Proxy<MediaProducer> - implements MediaProducer, - MediaProducerInterface, - MediaProducerInterfaceRequest { - MediaProducerProxy.fromEndpoint( +class MediaPacketProducerProxy + extends bindings.Proxy<MediaPacketProducer> + implements MediaPacketProducer, + MediaPacketProducerInterface, + MediaPacketProducerInterfaceRequest { + MediaPacketProducerProxy.fromEndpoint( core.MojoMessagePipeEndpoint endpoint) - : super(new _MediaProducerProxyControl.fromEndpoint(endpoint)); + : super(new _MediaPacketProducerProxyControl.fromEndpoint(endpoint)); - MediaProducerProxy.fromHandle(core.MojoHandle handle) - : super(new _MediaProducerProxyControl.fromHandle(handle)); + MediaPacketProducerProxy.fromHandle(core.MojoHandle handle) + : super(new _MediaPacketProducerProxyControl.fromHandle(handle)); - MediaProducerProxy.unbound() - : super(new _MediaProducerProxyControl.unbound()); + MediaPacketProducerProxy.unbound() + : super(new _MediaPacketProducerProxyControl.unbound()); - factory MediaProducerProxy.fromMock(MediaProducer mock) { - MediaProducerProxy newMockedProxy = - new MediaProducerProxy.unbound(); + factory MediaPacketProducerProxy.fromMock(MediaPacketProducer mock) { + MediaPacketProducerProxy newMockedProxy = + new MediaPacketProducerProxy.unbound(); newMockedProxy.impl = mock; return newMockedProxy; } - static MediaProducerProxy newFromEndpoint( + static MediaPacketProducerProxy newFromEndpoint( core.MojoMessagePipeEndpoint endpoint) { - assert(endpoint.setDescription("For MediaProducerProxy")); - return new MediaProducerProxy.fromEndpoint(endpoint); + assert(endpoint.setDescription("For MediaPacketProducerProxy")); + return new MediaPacketProducerProxy.fromEndpoint(endpoint); } - void connect(MediaConsumerInterface consumer,void callback()) { + void connect(MediaPacketConsumerInterface consumer,void callback()) { if (impl != null) { impl.connect(consumer,callback ?? bindings.DoNothingFunction.fn); return; } - var params = new _MediaProducerConnectParams(); + var params = new _MediaPacketProducerConnectParams(); params.consumer = consumer; Function zonedCallback; if ((callback == null) || identical(Zone.current, Zone.ROOT)) { @@ -1137,7 +870,7 @@ } ctrl.sendMessageWithRequestId( params, - _mediaProducerMethodConnectName, + _mediaPacketProducerMethodConnectName, -1, bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); @@ -1151,41 +884,41 @@ ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaProducerDisconnectParams(); + var params = new _MediaPacketProducerDisconnectParams(); ctrl.sendMessage(params, - _mediaProducerMethodDisconnectName); + _mediaPacketProducerMethodDisconnectName); } } -class _MediaProducerStubControl +class _MediaPacketProducerStubControl extends bindings.StubMessageHandler - implements bindings.StubControl<MediaProducer> { - MediaProducer _impl; + implements bindings.StubControl<MediaPacketProducer> { + MediaPacketProducer _impl; - _MediaProducerStubControl.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, [MediaProducer impl]) + _MediaPacketProducerStubControl.fromEndpoint( + core.MojoMessagePipeEndpoint endpoint, [MediaPacketProducer impl]) : super.fromEndpoint(endpoint, autoBegin: impl != null) { _impl = impl; } - _MediaProducerStubControl.fromHandle( - core.MojoHandle handle, [MediaProducer impl]) + _MediaPacketProducerStubControl.fromHandle( + core.MojoHandle handle, [MediaPacketProducer impl]) : super.fromHandle(handle, autoBegin: impl != null) { _impl = impl; } - _MediaProducerStubControl.unbound([this._impl]) : super.unbound(); + _MediaPacketProducerStubControl.unbound([this._impl]) : super.unbound(); - String get serviceName => MediaProducer.serviceName; + String get serviceName => MediaPacketProducer.serviceName; - Function _mediaProducerConnectResponseParamsResponder( + Function _mediaPacketProducerConnectResponseParamsResponder( int requestId) { return () { - var result = new MediaProducerConnectResponseParams(); + var result = new MediaPacketProducerConnectResponseParams(); sendResponse(buildResponseWithId( result, - _mediaProducerMethodConnectName, + _mediaPacketProducerMethodConnectName, requestId, bindings.MessageHeader.kMessageIsResponse)); }; @@ -1201,12 +934,12 @@ throw new core.MojoApiError("$this has no implementation set"); } switch (message.header.type) { - case _mediaProducerMethodConnectName: - var params = _MediaProducerConnectParams.deserialize( + case _mediaPacketProducerMethodConnectName: + var params = _MediaPacketProducerConnectParams.deserialize( message.payload); - _impl.connect(params.consumer, _mediaProducerConnectResponseParamsResponder(message.header.requestId)); + _impl.connect(params.consumer, _mediaPacketProducerConnectResponseParamsResponder(message.header.requestId)); break; - case _mediaProducerMethodDisconnectName: + case _mediaPacketProducerMethodDisconnectName: _impl.disconnect(); break; default: @@ -1215,8 +948,8 @@ } } - MediaProducer get impl => _impl; - set impl(MediaProducer d) { + MediaPacketProducer get impl => _impl; + set impl(MediaPacketProducer d) { if (d == null) { throw new core.MojoApiError("$this: Cannot set a null implementation"); } @@ -1237,36 +970,36 @@ @override String toString() { var superString = super.toString(); - return "_MediaProducerStubControl($superString)"; + return "_MediaPacketProducerStubControl($superString)"; } int get version => 0; } -class MediaProducerStub - extends bindings.Stub<MediaProducer> - implements MediaProducer, - MediaProducerInterface, - MediaProducerInterfaceRequest { - MediaProducerStub.unbound([MediaProducer impl]) - : super(new _MediaProducerStubControl.unbound(impl)); +class MediaPacketProducerStub + extends bindings.Stub<MediaPacketProducer> + implements MediaPacketProducer, + MediaPacketProducerInterface, + MediaPacketProducerInterfaceRequest { + MediaPacketProducerStub.unbound([MediaPacketProducer impl]) + : super(new _MediaPacketProducerStubControl.unbound(impl)); - MediaProducerStub.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, [MediaProducer impl]) - : super(new _MediaProducerStubControl.fromEndpoint(endpoint, impl)); + MediaPacketProducerStub.fromEndpoint( + core.MojoMessagePipeEndpoint endpoint, [MediaPacketProducer impl]) + : super(new _MediaPacketProducerStubControl.fromEndpoint(endpoint, impl)); - MediaProducerStub.fromHandle( - core.MojoHandle handle, [MediaProducer impl]) - : super(new _MediaProducerStubControl.fromHandle(handle, impl)); + MediaPacketProducerStub.fromHandle( + core.MojoHandle handle, [MediaPacketProducer impl]) + : super(new _MediaPacketProducerStubControl.fromHandle(handle, impl)); - static MediaProducerStub newFromEndpoint( + static MediaPacketProducerStub newFromEndpoint( core.MojoMessagePipeEndpoint endpoint) { - assert(endpoint.setDescription("For MediaProducerStub")); - return new MediaProducerStub.fromEndpoint(endpoint); + assert(endpoint.setDescription("For MediaPacketProducerStub")); + return new MediaPacketProducerStub.fromEndpoint(endpoint); } - void connect(MediaConsumerInterface consumer,void callback()) { + void connect(MediaPacketConsumerInterface consumer,void callback()) { return impl.connect(consumer,callback); } void disconnect() { @@ -1274,392 +1007,45 @@ } } -const int _mediaPullModeProducerMethodGetBufferName = 0; -const int _mediaPullModeProducerMethodPullPacketName = 1; -const int _mediaPullModeProducerMethodReleasePacketName = 2; - -class _MediaPullModeProducerServiceDescription implements service_describer.ServiceDescription { - void getTopLevelInterface(Function responder) { - responder(null); - } - - void getTypeDefinition(String typeKey, Function responder) { - responder(null); - } - - void getAllTypeDefinitions(Function responder) { - responder(null); - } -} - -abstract class MediaPullModeProducer { - static const String serviceName = null; - - static service_describer.ServiceDescription _cachedServiceDescription; - static service_describer.ServiceDescription get serviceDescription { - if (_cachedServiceDescription == null) { - _cachedServiceDescription = new _MediaPullModeProducerServiceDescription(); - } - return _cachedServiceDescription; - } - - static MediaPullModeProducerProxy connectToService( - bindings.ServiceConnector s, String url, [String serviceName]) { - MediaPullModeProducerProxy p = new MediaPullModeProducerProxy.unbound(); - String name = serviceName ?? MediaPullModeProducer.serviceName; - if ((name == null) || name.isEmpty) { - throw new core.MojoApiError( - "If an interface has no ServiceName, then one must be provided."); - } - s.connectToService(url, p, name); - return p; - } - void getBuffer(void callback(core.MojoSharedBuffer buffer)); - void pullPacket(MediaPacket toRelease,void callback(MediaPacket packet)); - void releasePacket(MediaPacket toRelease); -} - -abstract class MediaPullModeProducerInterface - implements bindings.MojoInterface<MediaPullModeProducer>, - MediaPullModeProducer { - factory MediaPullModeProducerInterface([MediaPullModeProducer impl]) => - new MediaPullModeProducerStub.unbound(impl); - - factory MediaPullModeProducerInterface.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, - [MediaPullModeProducer impl]) => - new MediaPullModeProducerStub.fromEndpoint(endpoint, impl); - - factory MediaPullModeProducerInterface.fromMock( - MediaPullModeProducer mock) => - new MediaPullModeProducerProxy.fromMock(mock); -} - -abstract class MediaPullModeProducerInterfaceRequest - implements bindings.MojoInterface<MediaPullModeProducer>, - MediaPullModeProducer { - factory MediaPullModeProducerInterfaceRequest() => - new MediaPullModeProducerProxy.unbound(); -} - -class _MediaPullModeProducerProxyControl - extends bindings.ProxyMessageHandler - implements bindings.ProxyControl<MediaPullModeProducer> { - MediaPullModeProducer impl; - - _MediaPullModeProducerProxyControl.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint); - - _MediaPullModeProducerProxyControl.fromHandle( - core.MojoHandle handle) : super.fromHandle(handle); - - _MediaPullModeProducerProxyControl.unbound() : super.unbound(); - - String get serviceName => MediaPullModeProducer.serviceName; - - void handleResponse(bindings.ServiceMessage message) { - switch (message.header.type) { - case _mediaPullModeProducerMethodGetBufferName: - Function callback = getCallback(message); - if (callback != null) { - var r = MediaPullModeProducerGetBufferResponseParams.deserialize( - message.payload); - callback(r.buffer ); - } - break; - case _mediaPullModeProducerMethodPullPacketName: - Function callback = getCallback(message); - if (callback != null) { - var r = MediaPullModeProducerPullPacketResponseParams.deserialize( - message.payload); - callback(r.packet ); - } - break; - default: - proxyError("Unexpected message type: ${message.header.type}"); - close(immediate: true); - break; - } - } - - @override - String toString() { - var superString = super.toString(); - return "_MediaPullModeProducerProxyControl($superString)"; - } -} - -class MediaPullModeProducerProxy - extends bindings.Proxy<MediaPullModeProducer> - implements MediaPullModeProducer, - MediaPullModeProducerInterface, - MediaPullModeProducerInterfaceRequest { - MediaPullModeProducerProxy.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint) - : super(new _MediaPullModeProducerProxyControl.fromEndpoint(endpoint)); - - MediaPullModeProducerProxy.fromHandle(core.MojoHandle handle) - : super(new _MediaPullModeProducerProxyControl.fromHandle(handle)); - - MediaPullModeProducerProxy.unbound() - : super(new _MediaPullModeProducerProxyControl.unbound()); - - factory MediaPullModeProducerProxy.fromMock(MediaPullModeProducer mock) { - MediaPullModeProducerProxy newMockedProxy = - new MediaPullModeProducerProxy.unbound(); - newMockedProxy.impl = mock; - return newMockedProxy; - } - - static MediaPullModeProducerProxy newFromEndpoint( - core.MojoMessagePipeEndpoint endpoint) { - assert(endpoint.setDescription("For MediaPullModeProducerProxy")); - return new MediaPullModeProducerProxy.fromEndpoint(endpoint); - } - - - void getBuffer(void callback(core.MojoSharedBuffer buffer)) { - if (impl != null) { - impl.getBuffer(callback ?? bindings.DoNothingFunction.fn); - return; - } - var params = new _MediaPullModeProducerGetBufferParams(); - Function zonedCallback; - if ((callback == null) || identical(Zone.current, Zone.ROOT)) { - zonedCallback = callback; - } else { - Zone z = Zone.current; - zonedCallback = ((core.MojoSharedBuffer buffer) { - z.bindCallback(() { - callback(buffer); - })(); - }); - } - ctrl.sendMessageWithRequestId( - params, - _mediaPullModeProducerMethodGetBufferName, - -1, - bindings.MessageHeader.kMessageExpectsResponse, - zonedCallback); - } - void pullPacket(MediaPacket toRelease,void callback(MediaPacket packet)) { - if (impl != null) { - impl.pullPacket(toRelease,callback ?? bindings.DoNothingFunction.fn); - return; - } - var params = new _MediaPullModeProducerPullPacketParams(); - params.toRelease = toRelease; - Function zonedCallback; - if ((callback == null) || identical(Zone.current, Zone.ROOT)) { - zonedCallback = callback; - } else { - Zone z = Zone.current; - zonedCallback = ((MediaPacket packet) { - z.bindCallback(() { - callback(packet); - })(); - }); - } - ctrl.sendMessageWithRequestId( - params, - _mediaPullModeProducerMethodPullPacketName, - -1, - bindings.MessageHeader.kMessageExpectsResponse, - zonedCallback); - } - void releasePacket(MediaPacket toRelease) { - if (impl != null) { - impl.releasePacket(toRelease); - return; - } - if (!ctrl.isBound) { - ctrl.proxyError("The Proxy is closed."); - return; - } - var params = new _MediaPullModeProducerReleasePacketParams(); - params.toRelease = toRelease; - ctrl.sendMessage(params, - _mediaPullModeProducerMethodReleasePacketName); - } -} - -class _MediaPullModeProducerStubControl - extends bindings.StubMessageHandler - implements bindings.StubControl<MediaPullModeProducer> { - MediaPullModeProducer _impl; - - _MediaPullModeProducerStubControl.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, [MediaPullModeProducer impl]) - : super.fromEndpoint(endpoint, autoBegin: impl != null) { - _impl = impl; - } - - _MediaPullModeProducerStubControl.fromHandle( - core.MojoHandle handle, [MediaPullModeProducer impl]) - : super.fromHandle(handle, autoBegin: impl != null) { - _impl = impl; - } - - _MediaPullModeProducerStubControl.unbound([this._impl]) : super.unbound(); - - String get serviceName => MediaPullModeProducer.serviceName; - - - Function _mediaPullModeProducerGetBufferResponseParamsResponder( - int requestId) { - return (core.MojoSharedBuffer buffer) { - var result = new MediaPullModeProducerGetBufferResponseParams(); - result.buffer = buffer; - sendResponse(buildResponseWithId( - result, - _mediaPullModeProducerMethodGetBufferName, - requestId, - bindings.MessageHeader.kMessageIsResponse)); - }; - } - Function _mediaPullModeProducerPullPacketResponseParamsResponder( - int requestId) { - return (MediaPacket packet) { - var result = new MediaPullModeProducerPullPacketResponseParams(); - result.packet = packet; - sendResponse(buildResponseWithId( - result, - _mediaPullModeProducerMethodPullPacketName, - requestId, - bindings.MessageHeader.kMessageIsResponse)); - }; - } - - void handleMessage(bindings.ServiceMessage message) { - if (bindings.ControlMessageHandler.isControlMessage(message)) { - bindings.ControlMessageHandler.handleMessage( - this, 0, message); - return; - } - if (_impl == null) { - throw new core.MojoApiError("$this has no implementation set"); - } - switch (message.header.type) { - case _mediaPullModeProducerMethodGetBufferName: - _impl.getBuffer(_mediaPullModeProducerGetBufferResponseParamsResponder(message.header.requestId)); - break; - case _mediaPullModeProducerMethodPullPacketName: - var params = _MediaPullModeProducerPullPacketParams.deserialize( - message.payload); - _impl.pullPacket(params.toRelease, _mediaPullModeProducerPullPacketResponseParamsResponder(message.header.requestId)); - break; - case _mediaPullModeProducerMethodReleasePacketName: - var params = _MediaPullModeProducerReleasePacketParams.deserialize( - message.payload); - _impl.releasePacket(params.toRelease); - break; - default: - throw new bindings.MojoCodecError("Unexpected message name"); - break; - } - } - - MediaPullModeProducer get impl => _impl; - set impl(MediaPullModeProducer d) { - if (d == null) { - throw new core.MojoApiError("$this: Cannot set a null implementation"); - } - if (isBound && (_impl == null)) { - beginHandlingEvents(); - } - _impl = d; - } - - @override - void bind(core.MojoMessagePipeEndpoint endpoint) { - super.bind(endpoint); - if (!isOpen && (_impl != null)) { - beginHandlingEvents(); - } - } - - @override - String toString() { - var superString = super.toString(); - return "_MediaPullModeProducerStubControl($superString)"; - } - - int get version => 0; -} - -class MediaPullModeProducerStub - extends bindings.Stub<MediaPullModeProducer> - implements MediaPullModeProducer, - MediaPullModeProducerInterface, - MediaPullModeProducerInterfaceRequest { - MediaPullModeProducerStub.unbound([MediaPullModeProducer impl]) - : super(new _MediaPullModeProducerStubControl.unbound(impl)); - - MediaPullModeProducerStub.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, [MediaPullModeProducer impl]) - : super(new _MediaPullModeProducerStubControl.fromEndpoint(endpoint, impl)); - - MediaPullModeProducerStub.fromHandle( - core.MojoHandle handle, [MediaPullModeProducer impl]) - : super(new _MediaPullModeProducerStubControl.fromHandle(handle, impl)); - - static MediaPullModeProducerStub newFromEndpoint( - core.MojoMessagePipeEndpoint endpoint) { - assert(endpoint.setDescription("For MediaPullModeProducerStub")); - return new MediaPullModeProducerStub.fromEndpoint(endpoint); - } - - - void getBuffer(void callback(core.MojoSharedBuffer buffer)) { - return impl.getBuffer(callback); - } - void pullPacket(MediaPacket toRelease,void callback(MediaPacket packet)) { - return impl.pullPacket(toRelease,callback); - } - void releasePacket(MediaPacket toRelease) { - return impl.releasePacket(toRelease); - } -} - -const int _mediaConsumerMethodSetBufferName = 0; -const int _mediaConsumerMethodSendPacketName = 1; -const int _mediaConsumerMethodPrimeName = 2; -const int _mediaConsumerMethodFlushName = 3; +const int _mediaPacketConsumerMethodSetBufferName = 0; +const int _mediaPacketConsumerMethodSendPacketName = 1; +const int _mediaPacketConsumerMethodPrimeName = 2; +const int _mediaPacketConsumerMethodFlushName = 3; -class MediaConsumerSendResult extends bindings.MojoEnum { - static const MediaConsumerSendResult consumed = const MediaConsumerSendResult._(0); - static const MediaConsumerSendResult flushed = const MediaConsumerSendResult._(1); +class MediaPacketConsumerSendResult extends bindings.MojoEnum { + static const MediaPacketConsumerSendResult consumed = const MediaPacketConsumerSendResult._(0); + static const MediaPacketConsumerSendResult flushed = const MediaPacketConsumerSendResult._(1); - const MediaConsumerSendResult._(int v) : super(v); + const MediaPacketConsumerSendResult._(int v) : super(v); - static const Map<String, MediaConsumerSendResult> valuesMap = const { + static const Map<String, MediaPacketConsumerSendResult> valuesMap = const { "consumed": consumed, "flushed": flushed, }; - static const List<MediaConsumerSendResult> values = const [ + static const List<MediaPacketConsumerSendResult> values = const [ consumed, flushed, ]; - static MediaConsumerSendResult valueOf(String name) => valuesMap[name]; + static MediaPacketConsumerSendResult valueOf(String name) => valuesMap[name]; - factory MediaConsumerSendResult(int v) { + factory MediaPacketConsumerSendResult(int v) { switch (v) { case 0: - return MediaConsumerSendResult.consumed; + return MediaPacketConsumerSendResult.consumed; case 1: - return MediaConsumerSendResult.flushed; + return MediaPacketConsumerSendResult.flushed; default: return null; } } - static MediaConsumerSendResult decode(bindings.Decoder decoder0, int offset) { + static MediaPacketConsumerSendResult decode(bindings.Decoder decoder0, int offset) { int v = decoder0.decodeUint32(offset); - MediaConsumerSendResult result = new MediaConsumerSendResult(v); + MediaPacketConsumerSendResult result = new MediaPacketConsumerSendResult(v); if (result == null) { throw new bindings.MojoCodecError( - 'Bad value $v for enum MediaConsumerSendResult.'); + 'Bad value $v for enum MediaPacketConsumerSendResult.'); } return result; } @@ -1667,9 +1053,9 @@ String toString() { switch(this) { case consumed: - return 'MediaConsumerSendResult.consumed'; + return 'MediaPacketConsumerSendResult.consumed'; case flushed: - return 'MediaConsumerSendResult.flushed'; + return 'MediaPacketConsumerSendResult.flushed'; default: return null; } @@ -1678,7 +1064,7 @@ int toJson() => mojoEnumValue; } -class _MediaConsumerServiceDescription implements service_describer.ServiceDescription { +class _MediaPacketConsumerServiceDescription implements service_describer.ServiceDescription { void getTopLevelInterface(Function responder) { responder(null); } @@ -1692,21 +1078,21 @@ } } -abstract class MediaConsumer { +abstract class MediaPacketConsumer { static const String serviceName = null; static service_describer.ServiceDescription _cachedServiceDescription; static service_describer.ServiceDescription get serviceDescription { if (_cachedServiceDescription == null) { - _cachedServiceDescription = new _MediaConsumerServiceDescription(); + _cachedServiceDescription = new _MediaPacketConsumerServiceDescription(); } return _cachedServiceDescription; } - static MediaConsumerProxy connectToService( + static MediaPacketConsumerProxy connectToService( bindings.ServiceConnector s, String url, [String serviceName]) { - MediaConsumerProxy p = new MediaConsumerProxy.unbound(); - String name = serviceName ?? MediaConsumer.serviceName; + MediaPacketConsumerProxy p = new MediaPacketConsumerProxy.unbound(); + String name = serviceName ?? MediaPacketConsumer.serviceName; if ((name == null) || name.isEmpty) { throw new core.MojoApiError( "If an interface has no ServiceName, then one must be provided."); @@ -1715,80 +1101,80 @@ return p; } void setBuffer(core.MojoSharedBuffer buffer,void callback()); - void sendPacket(MediaPacket packet,void callback(MediaConsumerSendResult result)); + void sendPacket(MediaPacket packet,void callback(MediaPacketConsumerSendResult result)); void prime(void callback()); void flush(void callback()); static const int kMaxBufferLen = 4611686018427387903; } -abstract class MediaConsumerInterface - implements bindings.MojoInterface<MediaConsumer>, - MediaConsumer { - factory MediaConsumerInterface([MediaConsumer impl]) => - new MediaConsumerStub.unbound(impl); +abstract class MediaPacketConsumerInterface + implements bindings.MojoInterface<MediaPacketConsumer>, + MediaPacketConsumer { + factory MediaPacketConsumerInterface([MediaPacketConsumer impl]) => + new MediaPacketConsumerStub.unbound(impl); - factory MediaConsumerInterface.fromEndpoint( + factory MediaPacketConsumerInterface.fromEndpoint( core.MojoMessagePipeEndpoint endpoint, - [MediaConsumer impl]) => - new MediaConsumerStub.fromEndpoint(endpoint, impl); + [MediaPacketConsumer impl]) => + new MediaPacketConsumerStub.fromEndpoint(endpoint, impl); - factory MediaConsumerInterface.fromMock( - MediaConsumer mock) => - new MediaConsumerProxy.fromMock(mock); + factory MediaPacketConsumerInterface.fromMock( + MediaPacketConsumer mock) => + new MediaPacketConsumerProxy.fromMock(mock); } -abstract class MediaConsumerInterfaceRequest - implements bindings.MojoInterface<MediaConsumer>, - MediaConsumer { - factory MediaConsumerInterfaceRequest() => - new MediaConsumerProxy.unbound(); +abstract class MediaPacketConsumerInterfaceRequest + implements bindings.MojoInterface<MediaPacketConsumer>, + MediaPacketConsumer { + factory MediaPacketConsumerInterfaceRequest() => + new MediaPacketConsumerProxy.unbound(); } -class _MediaConsumerProxyControl +class _MediaPacketConsumerProxyControl extends bindings.ProxyMessageHandler - implements bindings.ProxyControl<MediaConsumer> { - MediaConsumer impl; + implements bindings.ProxyControl<MediaPacketConsumer> { + MediaPacketConsumer impl; - _MediaConsumerProxyControl.fromEndpoint( + _MediaPacketConsumerProxyControl.fromEndpoint( core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint); - _MediaConsumerProxyControl.fromHandle( + _MediaPacketConsumerProxyControl.fromHandle( core.MojoHandle handle) : super.fromHandle(handle); - _MediaConsumerProxyControl.unbound() : super.unbound(); + _MediaPacketConsumerProxyControl.unbound() : super.unbound(); - String get serviceName => MediaConsumer.serviceName; + String get serviceName => MediaPacketConsumer.serviceName; void handleResponse(bindings.ServiceMessage message) { switch (message.header.type) { - case _mediaConsumerMethodSetBufferName: + case _mediaPacketConsumerMethodSetBufferName: Function callback = getCallback(message); if (callback != null) { - var r = MediaConsumerSetBufferResponseParams.deserialize( + var r = MediaPacketConsumerSetBufferResponseParams.deserialize( message.payload); callback(); } break; - case _mediaConsumerMethodSendPacketName: + case _mediaPacketConsumerMethodSendPacketName: Function callback = getCallback(message); if (callback != null) { - var r = MediaConsumerSendPacketResponseParams.deserialize( + var r = MediaPacketConsumerSendPacketResponseParams.deserialize( message.payload); callback(r.result ); } break; - case _mediaConsumerMethodPrimeName: + case _mediaPacketConsumerMethodPrimeName: Function callback = getCallback(message); if (callback != null) { - var r = MediaConsumerPrimeResponseParams.deserialize( + var r = MediaPacketConsumerPrimeResponseParams.deserialize( message.payload); callback(); } break; - case _mediaConsumerMethodFlushName: + case _mediaPacketConsumerMethodFlushName: Function callback = getCallback(message); if (callback != null) { - var r = MediaConsumerFlushResponseParams.deserialize( + var r = MediaPacketConsumerFlushResponseParams.deserialize( message.payload); callback(); } @@ -1803,36 +1189,36 @@ @override String toString() { var superString = super.toString(); - return "_MediaConsumerProxyControl($superString)"; + return "_MediaPacketConsumerProxyControl($superString)"; } } -class MediaConsumerProxy - extends bindings.Proxy<MediaConsumer> - implements MediaConsumer, - MediaConsumerInterface, - MediaConsumerInterfaceRequest { - MediaConsumerProxy.fromEndpoint( +class MediaPacketConsumerProxy + extends bindings.Proxy<MediaPacketConsumer> + implements MediaPacketConsumer, + MediaPacketConsumerInterface, + MediaPacketConsumerInterfaceRequest { + MediaPacketConsumerProxy.fromEndpoint( core.MojoMessagePipeEndpoint endpoint) - : super(new _MediaConsumerProxyControl.fromEndpoint(endpoint)); + : super(new _MediaPacketConsumerProxyControl.fromEndpoint(endpoint)); - MediaConsumerProxy.fromHandle(core.MojoHandle handle) - : super(new _MediaConsumerProxyControl.fromHandle(handle)); + MediaPacketConsumerProxy.fromHandle(core.MojoHandle handle) + : super(new _MediaPacketConsumerProxyControl.fromHandle(handle)); - MediaConsumerProxy.unbound() - : super(new _MediaConsumerProxyControl.unbound()); + MediaPacketConsumerProxy.unbound() + : super(new _MediaPacketConsumerProxyControl.unbound()); - factory MediaConsumerProxy.fromMock(MediaConsumer mock) { - MediaConsumerProxy newMockedProxy = - new MediaConsumerProxy.unbound(); + factory MediaPacketConsumerProxy.fromMock(MediaPacketConsumer mock) { + MediaPacketConsumerProxy newMockedProxy = + new MediaPacketConsumerProxy.unbound(); newMockedProxy.impl = mock; return newMockedProxy; } - static MediaConsumerProxy newFromEndpoint( + static MediaPacketConsumerProxy newFromEndpoint( core.MojoMessagePipeEndpoint endpoint) { - assert(endpoint.setDescription("For MediaConsumerProxy")); - return new MediaConsumerProxy.fromEndpoint(endpoint); + assert(endpoint.setDescription("For MediaPacketConsumerProxy")); + return new MediaPacketConsumerProxy.fromEndpoint(endpoint); } @@ -1841,7 +1227,7 @@ impl.setBuffer(buffer,callback ?? bindings.DoNothingFunction.fn); return; } - var params = new _MediaConsumerSetBufferParams(); + var params = new _MediaPacketConsumerSetBufferParams(); params.buffer = buffer; Function zonedCallback; if ((callback == null) || identical(Zone.current, Zone.ROOT)) { @@ -1856,24 +1242,24 @@ } ctrl.sendMessageWithRequestId( params, - _mediaConsumerMethodSetBufferName, + _mediaPacketConsumerMethodSetBufferName, -1, bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); } - void sendPacket(MediaPacket packet,void callback(MediaConsumerSendResult result)) { + void sendPacket(MediaPacket packet,void callback(MediaPacketConsumerSendResult result)) { if (impl != null) { impl.sendPacket(packet,callback ?? bindings.DoNothingFunction.fn); return; } - var params = new _MediaConsumerSendPacketParams(); + var params = new _MediaPacketConsumerSendPacketParams(); params.packet = packet; Function zonedCallback; if ((callback == null) || identical(Zone.current, Zone.ROOT)) { zonedCallback = callback; } else { Zone z = Zone.current; - zonedCallback = ((MediaConsumerSendResult result) { + zonedCallback = ((MediaPacketConsumerSendResult result) { z.bindCallback(() { callback(result); })(); @@ -1881,7 +1267,7 @@ } ctrl.sendMessageWithRequestId( params, - _mediaConsumerMethodSendPacketName, + _mediaPacketConsumerMethodSendPacketName, -1, bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); @@ -1891,7 +1277,7 @@ impl.prime(callback ?? bindings.DoNothingFunction.fn); return; } - var params = new _MediaConsumerPrimeParams(); + var params = new _MediaPacketConsumerPrimeParams(); Function zonedCallback; if ((callback == null) || identical(Zone.current, Zone.ROOT)) { zonedCallback = callback; @@ -1905,7 +1291,7 @@ } ctrl.sendMessageWithRequestId( params, - _mediaConsumerMethodPrimeName, + _mediaPacketConsumerMethodPrimeName, -1, bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); @@ -1915,7 +1301,7 @@ impl.flush(callback ?? bindings.DoNothingFunction.fn); return; } - var params = new _MediaConsumerFlushParams(); + var params = new _MediaPacketConsumerFlushParams(); Function zonedCallback; if ((callback == null) || identical(Zone.current, Zone.ROOT)) { zonedCallback = callback; @@ -1929,76 +1315,76 @@ } ctrl.sendMessageWithRequestId( params, - _mediaConsumerMethodFlushName, + _mediaPacketConsumerMethodFlushName, -1, bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); } } -class _MediaConsumerStubControl +class _MediaPacketConsumerStubControl extends bindings.StubMessageHandler - implements bindings.StubControl<MediaConsumer> { - MediaConsumer _impl; + implements bindings.StubControl<MediaPacketConsumer> { + MediaPacketConsumer _impl; - _MediaConsumerStubControl.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, [MediaConsumer impl]) + _MediaPacketConsumerStubControl.fromEndpoint( + core.MojoMessagePipeEndpoint endpoint, [MediaPacketConsumer impl]) : super.fromEndpoint(endpoint, autoBegin: impl != null) { _impl = impl; } - _MediaConsumerStubControl.fromHandle( - core.MojoHandle handle, [MediaConsumer impl]) + _MediaPacketConsumerStubControl.fromHandle( + core.MojoHandle handle, [MediaPacketConsumer impl]) : super.fromHandle(handle, autoBegin: impl != null) { _impl = impl; } - _MediaConsumerStubControl.unbound([this._impl]) : super.unbound(); + _MediaPacketConsumerStubControl.unbound([this._impl]) : super.unbound(); - String get serviceName => MediaConsumer.serviceName; + String get serviceName => MediaPacketConsumer.serviceName; - Function _mediaConsumerSetBufferResponseParamsResponder( + Function _mediaPacketConsumerSetBufferResponseParamsResponder( int requestId) { return () { - var result = new MediaConsumerSetBufferResponseParams(); + var result = new MediaPacketConsumerSetBufferResponseParams(); sendResponse(buildResponseWithId( result, - _mediaConsumerMethodSetBufferName, + _mediaPacketConsumerMethodSetBufferName, requestId, bindings.MessageHeader.kMessageIsResponse)); }; } - Function _mediaConsumerSendPacketResponseParamsResponder( + Function _mediaPacketConsumerSendPacketResponseParamsResponder( int requestId) { - return (MediaConsumerSendResult result) { - var result = new MediaConsumerSendPacketResponseParams(); + return (MediaPacketConsumerSendResult result) { + var result = new MediaPacketConsumerSendPacketResponseParams(); result.result = result; sendResponse(buildResponseWithId( result, - _mediaConsumerMethodSendPacketName, + _mediaPacketConsumerMethodSendPacketName, requestId, bindings.MessageHeader.kMessageIsResponse)); }; } - Function _mediaConsumerPrimeResponseParamsResponder( + Function _mediaPacketConsumerPrimeResponseParamsResponder( int requestId) { return () { - var result = new MediaConsumerPrimeResponseParams(); + var result = new MediaPacketConsumerPrimeResponseParams(); sendResponse(buildResponseWithId( result, - _mediaConsumerMethodPrimeName, + _mediaPacketConsumerMethodPrimeName, requestId, bindings.MessageHeader.kMessageIsResponse)); }; } - Function _mediaConsumerFlushResponseParamsResponder( + Function _mediaPacketConsumerFlushResponseParamsResponder( int requestId) { return () { - var result = new MediaConsumerFlushResponseParams(); + var result = new MediaPacketConsumerFlushResponseParams(); sendResponse(buildResponseWithId( result, - _mediaConsumerMethodFlushName, + _mediaPacketConsumerMethodFlushName, requestId, bindings.MessageHeader.kMessageIsResponse)); }; @@ -2014,21 +1400,21 @@ throw new core.MojoApiError("$this has no implementation set"); } switch (message.header.type) { - case _mediaConsumerMethodSetBufferName: - var params = _MediaConsumerSetBufferParams.deserialize( + case _mediaPacketConsumerMethodSetBufferName: + var params = _MediaPacketConsumerSetBufferParams.deserialize( message.payload); - _impl.setBuffer(params.buffer, _mediaConsumerSetBufferResponseParamsResponder(message.header.requestId)); + _impl.setBuffer(params.buffer, _mediaPacketConsumerSetBufferResponseParamsResponder(message.header.requestId)); break; - case _mediaConsumerMethodSendPacketName: - var params = _MediaConsumerSendPacketParams.deserialize( + case _mediaPacketConsumerMethodSendPacketName: + var params = _MediaPacketConsumerSendPacketParams.deserialize( message.payload); - _impl.sendPacket(params.packet, _mediaConsumerSendPacketResponseParamsResponder(message.header.requestId)); + _impl.sendPacket(params.packet, _mediaPacketConsumerSendPacketResponseParamsResponder(message.header.requestId)); break; - case _mediaConsumerMethodPrimeName: - _impl.prime(_mediaConsumerPrimeResponseParamsResponder(message.header.requestId)); + case _mediaPacketConsumerMethodPrimeName: + _impl.prime(_mediaPacketConsumerPrimeResponseParamsResponder(message.header.requestId)); break; - case _mediaConsumerMethodFlushName: - _impl.flush(_mediaConsumerFlushResponseParamsResponder(message.header.requestId)); + case _mediaPacketConsumerMethodFlushName: + _impl.flush(_mediaPacketConsumerFlushResponseParamsResponder(message.header.requestId)); break; default: throw new bindings.MojoCodecError("Unexpected message name"); @@ -2036,8 +1422,8 @@ } } - MediaConsumer get impl => _impl; - set impl(MediaConsumer d) { + MediaPacketConsumer get impl => _impl; + set impl(MediaPacketConsumer d) { if (d == null) { throw new core.MojoApiError("$this: Cannot set a null implementation"); } @@ -2058,39 +1444,39 @@ @override String toString() { var superString = super.toString(); - return "_MediaConsumerStubControl($superString)"; + return "_MediaPacketConsumerStubControl($superString)"; } int get version => 0; } -class MediaConsumerStub - extends bindings.Stub<MediaConsumer> - implements MediaConsumer, - MediaConsumerInterface, - MediaConsumerInterfaceRequest { - MediaConsumerStub.unbound([MediaConsumer impl]) - : super(new _MediaConsumerStubControl.unbound(impl)); +class MediaPacketConsumerStub + extends bindings.Stub<MediaPacketConsumer> + implements MediaPacketConsumer, + MediaPacketConsumerInterface, + MediaPacketConsumerInterfaceRequest { + MediaPacketConsumerStub.unbound([MediaPacketConsumer impl]) + : super(new _MediaPacketConsumerStubControl.unbound(impl)); - MediaConsumerStub.fromEndpoint( - core.MojoMessagePipeEndpoint endpoint, [MediaConsumer impl]) - : super(new _MediaConsumerStubControl.fromEndpoint(endpoint, impl)); + MediaPacketConsumerStub.fromEndpoint( + core.MojoMessagePipeEndpoint endpoint, [MediaPacketConsumer impl]) + : super(new _MediaPacketConsumerStubControl.fromEndpoint(endpoint, impl)); - MediaConsumerStub.fromHandle( - core.MojoHandle handle, [MediaConsumer impl]) - : super(new _MediaConsumerStubControl.fromHandle(handle, impl)); + MediaPacketConsumerStub.fromHandle( + core.MojoHandle handle, [MediaPacketConsumer impl]) + : super(new _MediaPacketConsumerStubControl.fromHandle(handle, impl)); - static MediaConsumerStub newFromEndpoint( + static MediaPacketConsumerStub newFromEndpoint( core.MojoMessagePipeEndpoint endpoint) { - assert(endpoint.setDescription("For MediaConsumerStub")); - return new MediaConsumerStub.fromEndpoint(endpoint); + assert(endpoint.setDescription("For MediaPacketConsumerStub")); + return new MediaPacketConsumerStub.fromEndpoint(endpoint); } void setBuffer(core.MojoSharedBuffer buffer,void callback()) { return impl.setBuffer(buffer,callback); } - void sendPacket(MediaPacket packet,void callback(MediaConsumerSendResult result)) { + void sendPacket(MediaPacket packet,void callback(MediaPacketConsumerSendResult result)) { return impl.sendPacket(packet,callback); } void prime(void callback()) {
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_type_converter.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_type_converter.mojom.dart index 69566ea..a05ddb9 100644 --- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_type_converter.mojom.dart +++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_type_converter.mojom.dart
@@ -112,42 +112,42 @@ } -class _MediaTypeConverterGetConsumerParams extends bindings.Struct { +class _MediaTypeConverterGetPacketConsumerParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; - media_transport_mojom.MediaConsumerInterfaceRequest consumer = null; + media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer = null; - _MediaTypeConverterGetConsumerParams() : super(kVersions.last.size); + _MediaTypeConverterGetPacketConsumerParams() : super(kVersions.last.size); - _MediaTypeConverterGetConsumerParams.init( - media_transport_mojom.MediaConsumerInterfaceRequest this.consumer + _MediaTypeConverterGetPacketConsumerParams.init( + media_transport_mojom.MediaPacketConsumerInterfaceRequest this.packetConsumer ) : super(kVersions.last.size); - static _MediaTypeConverterGetConsumerParams deserialize(bindings.Message message) => + static _MediaTypeConverterGetPacketConsumerParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaTypeConverterGetConsumerParams decode(bindings.Decoder decoder0) { + static _MediaTypeConverterGetPacketConsumerParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaTypeConverterGetConsumerParams result = new _MediaTypeConverterGetConsumerParams(); + _MediaTypeConverterGetPacketConsumerParams result = new _MediaTypeConverterGetPacketConsumerParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { - result.consumer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaConsumerStub.newFromEndpoint); + result.packetConsumer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaPacketConsumerStub.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaTypeConverterGetConsumerParams"; + const String structName = "_MediaTypeConverterGetPacketConsumerParams"; String fieldName; try { - fieldName = "consumer"; - encoder0.encodeInterfaceRequest(consumer, 8, false); + fieldName = "packetConsumer"; + encoder0.encodeInterfaceRequest(packetConsumer, 8, false); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -155,8 +155,8 @@ } String toString() { - return "_MediaTypeConverterGetConsumerParams(" - "consumer: $consumer" ")"; + return "_MediaTypeConverterGetPacketConsumerParams(" + "packetConsumer: $packetConsumer" ")"; } Map toJson() { @@ -166,42 +166,42 @@ } -class _MediaTypeConverterGetProducerParams extends bindings.Struct { +class _MediaTypeConverterGetPacketProducerParams extends bindings.Struct { static const List<bindings.StructDataHeader> kVersions = const [ const bindings.StructDataHeader(16, 0) ]; - media_transport_mojom.MediaProducerInterfaceRequest producer = null; + media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer = null; - _MediaTypeConverterGetProducerParams() : super(kVersions.last.size); + _MediaTypeConverterGetPacketProducerParams() : super(kVersions.last.size); - _MediaTypeConverterGetProducerParams.init( - media_transport_mojom.MediaProducerInterfaceRequest this.producer + _MediaTypeConverterGetPacketProducerParams.init( + media_transport_mojom.MediaPacketProducerInterfaceRequest this.packetProducer ) : super(kVersions.last.size); - static _MediaTypeConverterGetProducerParams deserialize(bindings.Message message) => + static _MediaTypeConverterGetPacketProducerParams deserialize(bindings.Message message) => bindings.Struct.deserialize(decode, message); - static _MediaTypeConverterGetProducerParams decode(bindings.Decoder decoder0) { + static _MediaTypeConverterGetPacketProducerParams decode(bindings.Decoder decoder0) { if (decoder0 == null) { return null; } - _MediaTypeConverterGetProducerParams result = new _MediaTypeConverterGetProducerParams(); + _MediaTypeConverterGetPacketProducerParams result = new _MediaTypeConverterGetPacketProducerParams(); var mainDataHeader = bindings.Struct.checkVersion(decoder0, kVersions); if (mainDataHeader.version >= 0) { - result.producer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaProducerStub.newFromEndpoint); + result.packetProducer = decoder0.decodeInterfaceRequest(8, false, media_transport_mojom.MediaPacketProducerStub.newFromEndpoint); } return result; } void encode(bindings.Encoder encoder) { var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last); - const String structName = "_MediaTypeConverterGetProducerParams"; + const String structName = "_MediaTypeConverterGetPacketProducerParams"; String fieldName; try { - fieldName = "producer"; - encoder0.encodeInterfaceRequest(producer, 8, false); + fieldName = "packetProducer"; + encoder0.encodeInterfaceRequest(packetProducer, 8, false); } on bindings.MojoCodecError catch(e) { bindings.Struct.fixErrorMessage(e, fieldName, structName); rethrow; @@ -209,8 +209,8 @@ } String toString() { - return "_MediaTypeConverterGetProducerParams(" - "producer: $producer" ")"; + return "_MediaTypeConverterGetPacketProducerParams(" + "packetProducer: $packetProducer" ")"; } Map toJson() { @@ -220,8 +220,8 @@ } const int _mediaTypeConverterMethodGetOutputTypeName = 0; -const int _mediaTypeConverterMethodGetConsumerName = 1; -const int _mediaTypeConverterMethodGetProducerName = 2; +const int _mediaTypeConverterMethodGetPacketConsumerName = 1; +const int _mediaTypeConverterMethodGetPacketProducerName = 2; class _MediaTypeConverterServiceDescription implements service_describer.ServiceDescription { void getTopLevelInterface(Function responder) { @@ -260,8 +260,8 @@ return p; } void getOutputType(void callback(media_types_mojom.MediaType outputType)); - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer); - void getProducer(media_transport_mojom.MediaProducerInterfaceRequest producer); + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer); + void getPacketProducer(media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer); } abstract class MediaTypeConverterInterface @@ -379,33 +379,33 @@ bindings.MessageHeader.kMessageExpectsResponse, zonedCallback); } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer) { + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer) { if (impl != null) { - impl.getConsumer(consumer); + impl.getPacketConsumer(packetConsumer); return; } if (!ctrl.isBound) { ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaTypeConverterGetConsumerParams(); - params.consumer = consumer; + var params = new _MediaTypeConverterGetPacketConsumerParams(); + params.packetConsumer = packetConsumer; ctrl.sendMessage(params, - _mediaTypeConverterMethodGetConsumerName); + _mediaTypeConverterMethodGetPacketConsumerName); } - void getProducer(media_transport_mojom.MediaProducerInterfaceRequest producer) { + void getPacketProducer(media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer) { if (impl != null) { - impl.getProducer(producer); + impl.getPacketProducer(packetProducer); return; } if (!ctrl.isBound) { ctrl.proxyError("The Proxy is closed."); return; } - var params = new _MediaTypeConverterGetProducerParams(); - params.producer = producer; + var params = new _MediaTypeConverterGetPacketProducerParams(); + params.packetProducer = packetProducer; ctrl.sendMessage(params, - _mediaTypeConverterMethodGetProducerName); + _mediaTypeConverterMethodGetPacketProducerName); } } @@ -457,15 +457,15 @@ case _mediaTypeConverterMethodGetOutputTypeName: _impl.getOutputType(_mediaTypeConverterGetOutputTypeResponseParamsResponder(message.header.requestId)); break; - case _mediaTypeConverterMethodGetConsumerName: - var params = _MediaTypeConverterGetConsumerParams.deserialize( + case _mediaTypeConverterMethodGetPacketConsumerName: + var params = _MediaTypeConverterGetPacketConsumerParams.deserialize( message.payload); - _impl.getConsumer(params.consumer); + _impl.getPacketConsumer(params.packetConsumer); break; - case _mediaTypeConverterMethodGetProducerName: - var params = _MediaTypeConverterGetProducerParams.deserialize( + case _mediaTypeConverterMethodGetPacketProducerName: + var params = _MediaTypeConverterGetPacketProducerParams.deserialize( message.payload); - _impl.getProducer(params.producer); + _impl.getPacketProducer(params.packetProducer); break; default: throw new bindings.MojoCodecError("Unexpected message name"); @@ -527,11 +527,11 @@ void getOutputType(void callback(media_types_mojom.MediaType outputType)) { return impl.getOutputType(callback); } - void getConsumer(media_transport_mojom.MediaConsumerInterfaceRequest consumer) { - return impl.getConsumer(consumer); + void getPacketConsumer(media_transport_mojom.MediaPacketConsumerInterfaceRequest packetConsumer) { + return impl.getPacketConsumer(packetConsumer); } - void getProducer(media_transport_mojom.MediaProducerInterfaceRequest producer) { - return impl.getProducer(producer); + void getPacketProducer(media_transport_mojom.MediaPacketProducerInterfaceRequest packetProducer) { + return impl.getPacketProducer(packetProducer); } }
diff --git a/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.cc b/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.cc index abf23f4..1383c2c 100644 --- a/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.cc +++ b/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.cc
@@ -26,20 +26,20 @@ CircularBufferMediaPipeAdapter::PacketState::PacketState( uint64_t post_consume_rd, uint32_t seq_num, - const MediaConsumer::SendPacketCallback& cbk) + const MediaPacketConsumer::SendPacketCallback& cbk) : post_consume_rd_(post_consume_rd), seq_num_(seq_num), cbk_(cbk) {} CircularBufferMediaPipeAdapter::PacketState::~PacketState() { } CircularBufferMediaPipeAdapter::CircularBufferMediaPipeAdapter( - MediaConsumerPtr pipe) + MediaPacketConsumerPtr pipe) : pipe_(pipe.Pass()) , thiz_(new CircularBufferMediaPipeAdapter*(this)) { MOJO_DCHECK(pipe_); MOJO_DCHECK(RunLoop::current()); - pipe_flush_cbk_ = MediaConsumer::FlushCallback( + pipe_flush_cbk_ = MediaPacketConsumer::FlushCallback( [this] () { HandleFlush(); }); @@ -242,7 +242,7 @@ MediaResult CircularBufferMediaPipeAdapter::SendMediaPacket( MappedPacket* packet, - const MediaConsumer::SendPacketCallback& cbk) { + const MediaPacketConsumer::SendPacketCallback& cbk) { MOJO_DCHECK(packet && !packet->packet_.is_null()); if (!packet || packet->packet_.is_null()) { return MediaResult::INVALID_ARGUMENT; @@ -295,7 +295,7 @@ pipe_->SendPacket( packet->packet_.Pass(), - [this, seq_num](MediaConsumer::SendResult result) { + [this, seq_num](MediaPacketConsumer::SendResult result) { HandleSendPacket(seq_num, result); }); @@ -344,8 +344,8 @@ void CircularBufferMediaPipeAdapter::HandleSendPacket( uint32_t seq_num, - MediaConsumer::SendResult result) { - MediaConsumer::SendPacketCallback cbk; + MediaPacketConsumer::SendResult result) { + MediaPacketConsumer::SendPacketCallback cbk; do { // There should be at least one element in the in-flight queue, and the
diff --git a/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h b/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h index 48158f2..cf98ff1 100644 --- a/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h +++ b/mojo/services/media/common/cpp/circular_buffer_media_pipe_adapter.h
@@ -19,8 +19,8 @@ namespace media { // A class to help producers of media with the bookkeeping involved in using the -// shared buffer provided by a MediaConsumer mojo interface in a circular buffer -// fashion. +// shared buffer provided by a MediaPacketConsumer mojo interface in a circular +// buffer fashion. // class CircularBufferMediaPipeAdapter { public: @@ -73,14 +73,15 @@ /** * Constructor * - * Create an adapter which will take ownership of the provided MediaConsumer - * interface and assist in the process of generating MediaPackets and - * marshalling them to the other side of the MediaConsumer. + * Create an adapter which will take ownership of the provided + * MediaPacketConsumer interface and assist in the process of generating + * MediaPackets and marshalling them to the other side of the + * MediaPacketConsumer. * - * @param pipe A pointer to the MediaConsumer interface which will be used as - * the target for MediaPackets. + * @param pipe A pointer to the MediaPacketConsumer interface which will be + * used as the target for MediaPackets. */ - explicit CircularBufferMediaPipeAdapter(MediaConsumerPtr pipe); + explicit CircularBufferMediaPipeAdapter(MediaPacketConsumerPtr pipe); /** * Destructor @@ -91,7 +92,7 @@ * Init * * Allocate a shared memory buffer of the specified size and begin the process - * of marshalling it to the other side of the MediaConsumer. + * of marshalling it to the other side of the MediaPacketConsumer. * * @param size The size in bytes of the shared memory buffer to allocate. */ @@ -189,8 +190,8 @@ */ MediaResult SendMediaPacket( MappedPacket* packet, - const MediaConsumer::SendPacketCallback& cbk = - MediaConsumer::SendPacketCallback()); + const MediaPacketConsumer::SendPacketCallback& cbk = + MediaPacketConsumer::SendPacketCallback()); /** * Cancel a packet previously created using CreateMediaPacket. @@ -220,16 +221,17 @@ struct PacketState { PacketState(uint64_t post_consume_rd, uint32_t seq_num, - const MediaConsumer::SendPacketCallback& cbk); + const MediaPacketConsumer::SendPacketCallback& cbk); ~PacketState(); uint64_t post_consume_rd_; uint32_t seq_num_; - MediaConsumer::SendPacketCallback cbk_; + MediaPacketConsumer::SendPacketCallback cbk_; }; using PacketStateQueue = std::deque<PacketState>; - void HandleSendPacket(uint32_t seq_num, MediaConsumer::SendResult result); + void HandleSendPacket(uint32_t seq_num, + MediaPacketConsumer::SendResult result); void HandleFlush(); void HandleSignalCallback(); @@ -246,9 +248,9 @@ } // Pipe interface callbacks - MediaConsumerPtr pipe_; - MediaConsumer::FlushCallback pipe_flush_cbk_; - Closure signalled_callback_; + MediaPacketConsumerPtr pipe_; + MediaPacketConsumer::FlushCallback pipe_flush_cbk_; + Closure signalled_callback_; // A small helper which lets us nerf callbacks we may have directly scheduled // on the main run loop which may be in flight as we get destroyed.
diff --git a/mojo/services/media/common/cpp/shared_media_buffer_allocator.h b/mojo/services/media/common/cpp/shared_media_buffer_allocator.h index 3700a13..fc971a6 100644 --- a/mojo/services/media/common/cpp/shared_media_buffer_allocator.h +++ b/mojo/services/media/common/cpp/shared_media_buffer_allocator.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_COMMON_CPP_MAPPED_SHARED_MEDIA_BUFFER_ALLOCATOR_H_ -#define MOJO_SERVICES_MEDIA_COMMON_CPP_MAPPED_SHARED_MEDIA_BUFFER_ALLOCATOR_H_ +#ifndef MOJO_SERVICES_MEDIA_COMMON_CPP_SHARED_MEDIA_BUFFER_ALLOCATOR_H_ +#define MOJO_SERVICES_MEDIA_COMMON_CPP_SHARED_MEDIA_BUFFER_ALLOCATOR_H_ #include <memory> #include <mutex> // NOLINT(build/c++11) @@ -64,4 +64,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_COMMON_CPP_MAPPED_SHARED_MEDIA_BUFFER_ALLOCATOR_H_ +#endif // MOJO_SERVICES_MEDIA_COMMON_CPP_SHARED_MEDIA_BUFFER_ALLOCATOR_H_
diff --git a/mojo/services/media/common/cpp/video_renderer.cc b/mojo/services/media/common/cpp/video_renderer.cc index 84eda78..55c34da 100644 --- a/mojo/services/media/common/cpp/video_renderer.cc +++ b/mojo/services/media/common/cpp/video_renderer.cc
@@ -83,8 +83,8 @@ converter_.SetMediaType(media_type); } -void VideoRenderer::GetConsumer( - InterfaceRequest<MediaConsumer> consumer_request) { +void VideoRenderer::GetPacketConsumer( + InterfaceRequest<MediaPacketConsumer> consumer_request) { consumer_binding_.Bind(consumer_request.Pass()); } @@ -108,7 +108,7 @@ // Discard empty packets so they don't confuse the selection logic. if (!packet->payload || packet->payload->length == 0) { - callback.Run(MediaConsumer::SendResult::CONSUMED); + callback.Run(MediaPacketConsumer::SendResult::CONSUMED); return; } @@ -238,7 +238,7 @@ } VideoRenderer::PacketAndCallback::~PacketAndCallback() { - callback_.Run(MediaConsumer::SendResult::CONSUMED); + callback_.Run(MediaPacketConsumer::SendResult::CONSUMED); } } // namespace media
diff --git a/mojo/services/media/common/cpp/video_renderer.h b/mojo/services/media/common/cpp/video_renderer.h index 43ed4f2..4765a54 100644 --- a/mojo/services/media/common/cpp/video_renderer.h +++ b/mojo/services/media/common/cpp/video_renderer.h
@@ -21,7 +21,7 @@ // Implements MediaRenderer for an app that wants to show video. class VideoRenderer : public MediaRenderer, - public MediaConsumer, + public MediaPacketConsumer, public MediaTimelineControlPoint, public TimelineConsumer { public: @@ -56,12 +56,13 @@ void SetMediaType(MediaTypePtr media_type) override; - void GetConsumer(InterfaceRequest<MediaConsumer> consumer_request) override; + void GetPacketConsumer( + InterfaceRequest<MediaPacketConsumer> consumer_request) override; void GetTimelineControlPoint(InterfaceRequest<MediaTimelineControlPoint> control_point_request) override; - // MediaConsumer implementation. + // MediaPacketConsumer implementation. void SetBuffer(ScopedSharedBufferHandle buffer, const SetBufferCallback& callback) override; @@ -101,7 +102,7 @@ void CompleteGetStatus(const GetStatusCallback& callback); Binding<MediaRenderer> renderer_binding_; - Binding<MediaConsumer> consumer_binding_; + Binding<MediaPacketConsumer> consumer_binding_; Binding<MediaTimelineControlPoint> control_point_binding_; Binding<TimelineConsumer> timeline_consumer_binding_; MappedSharedBuffer shared_buffer_;
diff --git a/mojo/services/media/common/interfaces/media_transport.mojom b/mojo/services/media/common/interfaces/media_transport.mojom index 8e6a99b..9013b31 100644 --- a/mojo/services/media/common/interfaces/media_transport.mojom +++ b/mojo/services/media/common/interfaces/media_transport.mojom
@@ -59,47 +59,25 @@ // packet? }; -// Models a stream producer. A MediaProducer allows a client to connect the -// producer to a MediaConsumer so packets flow from the producer to the -// consumer. Clients who want to receive packets directly from the producer +// Models a stream producer. A MediaPacketProducer allows a client to connect +// the producer to a MediaPacketConsumer so packets flow from the producer to +// the consumer. Clients who want to receive packets directly from the producer // should use MediaPullModeProducer instead. // // The client calls Connect to connect producer and consumer. The producer then // calls PushPacket on the consumer to deliver packets. -interface MediaProducer { - // Connects this MediaProducer to a MediaConsumer. - Connect(MediaConsumer consumer) => (); +interface MediaPacketProducer { + // Connects this MediaPacketProducer to a MediaPacketConsumer. + Connect(MediaPacketConsumer consumer) => (); - // Disconnects this MediaProducer from a previously-connected MediaConsumer. + // Disconnects this MediaPacketProducer from a previously-connected + // MediaPacketConsumer. Disconnect(); }; -// Models a stream producer. A MediaPullModeProducer allows a client to receive -// packets directly from the producer. Clients who want to connect the producer -// to a MediaConsumer should use MediaProducer instead. -// -// The client calls PullPacket to get a packet. Once the client is done with -// the packet, it calls ReleasePacket to let the producer know that the packet -// buffer region can be reused. Alternatively, the client can piggyback a -// release on a PullPacket call using the to_release parameter. -interface MediaPullModeProducer { - // Gets the shared buffer in which packet payload will be located. - GetBuffer() => (handle<shared_buffer> buffer); - - // Pulls a packet from the producer. When the client is done with the - // packet buffer region, it should call ReleasePacket or PullPacket passing - // the locator. Note that the optional locator passed in PullPacket is - // a locator to be released and probably won't be the same locator passed - // back in the callback. - PullPacket(MediaPacket? to_release) => (MediaPacket packet); - - // Signals the producer that the client is done with the buffer region. - ReleasePacket(MediaPacket to_release); -}; - -// Models a stream consumer. A MediaConsumer allows a client to send packets -// directly to the consumer or to connect the consumer to a MediaProducer so -// packets flow from the producer to the consumer. +// Models a stream consumer. A MediaPacketConsumer allows a client to send +// packets directly to the consumer or to connect the consumer to a +// MediaPacketProducer so packets flow from the producer to the consumer. // // In the former scenario, the client calls PushPacket to deliver a packet. The // callback notifies the client that the consumer is done with the packet @@ -108,7 +86,7 @@ // In the latter scenario, the client calls Connect on the producer to connect // producer and consumer. The producer then calls PushPacket on the consumer to // deliver packets. -interface MediaConsumer { +interface MediaPacketConsumer { const uint64 kMaxBufferLen = 0x3FFFFFFFFFFFFFFF; // An enumeration used to indicate the ultimate fate of packets sent across
diff --git a/mojo/services/media/control/interfaces/media_sink.mojom b/mojo/services/media/control/interfaces/media_sink.mojom index e30ae62..a8084e8 100644 --- a/mojo/services/media/control/interfaces/media_sink.mojom +++ b/mojo/services/media/control/interfaces/media_sink.mojom
@@ -14,8 +14,8 @@ interface MediaSink { // TODO(dalesat): Support fanout to many destinations. - // Gets the consumer for the stream to be delivered. - GetConsumer(MediaConsumer& consumer); + // Gets the packet consumer for the stream to be delivered. + GetPacketConsumer(MediaPacketConsumer& packet_consumer); // Request the timeline control point for this sink GetTimelineControlPoint(MediaTimelineControlPoint& timeline_control_point);
diff --git a/mojo/services/media/control/interfaces/media_source.mojom b/mojo/services/media/control/interfaces/media_source.mojom index 4bac510..9c79f3b 100644 --- a/mojo/services/media/control/interfaces/media_source.mojom +++ b/mojo/services/media/control/interfaces/media_source.mojom
@@ -18,11 +18,8 @@ // Gets the streams produced by this source. GetStreams() => (array<MediaSourceStreamDescriptor> streams); - // Gets the producer for the specified stream. - GetProducer(uint32 stream_index, MediaProducer& producer); - - // Gets the pull mode producer for the specified stream. - GetPullModeProducer(uint32 stream_index, MediaPullModeProducer& producer); + // Gets the packet producer for the specified stream. + GetPacketProducer(uint32 stream_index, MediaPacketProducer& packet_producer); // Gets the status. To get the status immediately, call // GetStatus(kInitialStatus). To get updates thereafter, pass the version
diff --git a/mojo/services/media/core/interfaces/media_demux.mojom b/mojo/services/media/core/interfaces/media_demux.mojom index 3972927..66b4e48 100644 --- a/mojo/services/media/core/interfaces/media_demux.mojom +++ b/mojo/services/media/core/interfaces/media_demux.mojom
@@ -18,8 +18,8 @@ // Describes the demux. Describe() => (array<MediaType> stream_types); - // Gets the producer for the specified stream. - GetProducer(uint32 stream_index, MediaProducer& producer); + // Gets the packet producer for the specified stream. + GetPacketProducer(uint32 stream_index, MediaPacketProducer& packet_producer); // Gets the metadata. To get the metadata immediately, call // GetMetadata(kInitialMetadata). To get updates thereafter, pass the version
diff --git a/mojo/services/media/core/interfaces/media_renderer.mojom b/mojo/services/media/core/interfaces/media_renderer.mojom index eeac749..35be9e4 100644 --- a/mojo/services/media/core/interfaces/media_renderer.mojom +++ b/mojo/services/media/core/interfaces/media_renderer.mojom
@@ -17,8 +17,8 @@ // Sets the media type of the stream to be delivered. SetMediaType(MediaType media_type); - // Gets the consumer for the stream to be delivered. - GetConsumer(MediaConsumer& consumer); + // Gets the packet consumer for the stream to be delivered. + GetPacketConsumer(MediaPacketConsumer& packet_consumer); // Requests the timeline control point for this output. GetTimelineControlPoint(MediaTimelineControlPoint& timeline_control_point);
diff --git a/mojo/services/media/core/interfaces/media_type_converter.mojom b/mojo/services/media/core/interfaces/media_type_converter.mojom index 5d28263..31455c1 100644 --- a/mojo/services/media/core/interfaces/media_type_converter.mojom +++ b/mojo/services/media/core/interfaces/media_type_converter.mojom
@@ -13,9 +13,9 @@ // Gets the converter’s output type. GetOutputType() => (MediaType output_type); - // Gets the consumer. - GetConsumer(MediaConsumer& consumer); + // Gets the packet consumer. + GetPacketConsumer(MediaPacketConsumer& packet_consumer); - // Gets the producer. - GetProducer(MediaProducer& producer); + // Gets the packet producer. + GetPacketProducer(MediaPacketProducer& packet_producer); };
diff --git a/services/media/audio/audio_track_impl.cc b/services/media/audio/audio_track_impl.cc index fb0d69c..3d8c1c6 100644 --- a/services/media/audio/audio_track_impl.cc +++ b/services/media/audio/audio_track_impl.cc
@@ -259,8 +259,8 @@ owner_->GetOutputManager().SelectOutputsForTrack(strong_this); } -void AudioTrackImpl::GetConsumer( - InterfaceRequest<MediaConsumer> consumer_request) { +void AudioTrackImpl::GetPacketConsumer( + InterfaceRequest<MediaPacketConsumer> consumer_request) { // Bind our pipe to the interface request. if (pipe_.Init(consumer_request.Pass()) != MOJO_RESULT_OK) { LOG(ERROR) << "Failed to media pipe to interface request."; @@ -343,7 +343,8 @@ } } -bool AudioTrackImpl::OnFlushRequested(const MediaConsumer::FlushCallback& cbk) { +bool AudioTrackImpl::OnFlushRequested( + const MediaPacketConsumer::FlushCallback& cbk) { for (const auto& output : outputs_) { DCHECK(output); output->FlushPendingQueue();
diff --git a/services/media/audio/audio_track_impl.h b/services/media/audio/audio_track_impl.h index 2f1232d..05bc872 100644 --- a/services/media/audio/audio_track_impl.h +++ b/services/media/audio/audio_track_impl.h
@@ -68,7 +68,8 @@ void GetSupportedMediaTypes( const GetSupportedMediaTypesCallback& callback) override; void SetMediaType(MediaTypePtr media_type) override; - void GetConsumer(InterfaceRequest<MediaConsumer> consumer_request) override; + void GetPacketConsumer(InterfaceRequest<MediaPacketConsumer> consumer_request) + override; void GetTimelineControlPoint( InterfaceRequest<MediaTimelineControlPoint> control_point_request) override; @@ -81,7 +82,7 @@ // encapsulation so that AudioPipe does not have to know that we are an // AudioTrackImpl (just that we implement its interface). void OnPacketReceived(AudioPipe::AudioPacketRefPtr packet); - bool OnFlushRequested(const MediaConsumer::FlushCallback& cbk); + bool OnFlushRequested(const MediaPacketConsumer::FlushCallback& cbk); AudioTrackImplWeakPtr weak_this_; AudioServerImpl* owner_;
diff --git a/services/media/audio/audio_track_to_output_link.cc b/services/media/audio/audio_track_to_output_link.cc index 9f5b613..1ac9526 100644 --- a/services/media/audio/audio_track_to_output_link.cc +++ b/services/media/audio/audio_track_to_output_link.cc
@@ -159,7 +159,7 @@ } for (auto iter = queue->begin(); iter != queue->end(); ++iter) { - (*iter)->SetResult(MediaConsumer::SendResult::FLUSHED); + (*iter)->SetResult(MediaPacketConsumer::SendResult::FLUSHED); (*iter).reset(); }
diff --git a/services/media/common/media_pipe_base.cc b/services/media/common/media_pipe_base.cc index c5de4ac..8f0639b 100644 --- a/services/media/common/media_pipe_base.cc +++ b/services/media/common/media_pipe_base.cc
@@ -15,7 +15,7 @@ MediaPipeBase::~MediaPipeBase() { } -MojoResult MediaPipeBase::Init(InterfaceRequest<MediaConsumer> request) { +MojoResult MediaPipeBase::Init(InterfaceRequest<MediaPacketConsumer> request) { // Double init? if (IsInitialized()) { return MOJO_RESULT_ALREADY_EXISTS; @@ -45,8 +45,8 @@ // Double init? Close the connection. if (buffer_) { - LOG(ERROR) << "Attempting to set a new buffer on a MediaConsumer which " - "already has a buffer assigned. (size = " + LOG(ERROR) << "Attempting to set a new buffer on a MediaPacketConsumer " + "which already has a buffer assigned. (size = " << buffer_->size() << ")"; Reset(); @@ -66,7 +66,7 @@ // Invalid size? Close the connection. uint64_t size = info.num_bytes; - if (!size || (size > MediaConsumer::kMaxBufferLen)) { + if (!size || (size > MediaPacketConsumer::kMaxBufferLen)) { LOG(ERROR) << "Invalid shared buffer size (size = " << size << ")"; Reset(); return; @@ -163,7 +163,7 @@ : packet_(packet.Pass()), buffer_(buffer), cbk_(cbk), - result_(MediaConsumer::SendResult::CONSUMED) { + result_(MediaPacketConsumer::SendResult::CONSUMED) { DCHECK(packet_); DCHECK(packet_->payload); } @@ -173,8 +173,9 @@ } void MediaPipeBase::MediaPacketState::SetResult( - MediaConsumer::SendResult result) { - MediaConsumer::SendResult tmp = MediaConsumer::SendResult::CONSUMED; + MediaPacketConsumer::SendResult result) { + MediaPacketConsumer::SendResult tmp = + MediaPacketConsumer::SendResult::CONSUMED; result_.compare_exchange_strong(tmp, result); }
diff --git a/services/media/common/media_pipe_base.h b/services/media/common/media_pipe_base.h index 514e301..066a53f 100644 --- a/services/media/common/media_pipe_base.h +++ b/services/media/common/media_pipe_base.h
@@ -18,7 +18,7 @@ namespace mojo { namespace media { -class MediaPipeBase : public MediaConsumer { +class MediaPipeBase : public MediaPacketConsumer { protected: class MappedSharedBuffer; using MappedSharedBufferPtr = std::shared_ptr<MappedSharedBuffer>; @@ -30,7 +30,7 @@ const MediaPacketPtr& packet() const { return packet_; } const MappedSharedBufferPtr& buffer() const { return buffer_; } - void SetResult(MediaConsumer::SendResult result); + void SetResult(MediaPacketConsumer::SendResult result); private: friend class MediaPipeBase; @@ -41,7 +41,7 @@ MediaPacketPtr packet_; MappedSharedBufferPtr buffer_; SendPacketCallback cbk_; - std::atomic<MediaConsumer::SendResult> result_; + std::atomic<MediaPacketConsumer::SendResult> result_; }; using MediaPacketStatePtr = std::unique_ptr<MediaPacketState>; @@ -50,7 +50,7 @@ ~MediaPipeBase() override; // Initialize the internal state of the pipe (allocate resources, etc..) - MojoResult Init(InterfaceRequest<MediaConsumer> request); + MojoResult Init(InterfaceRequest<MediaPacketConsumer> request); bool IsInitialized() const; void Reset(); @@ -82,9 +82,9 @@ MappedSharedBufferPtr buffer_; private: - Binding<MediaConsumer> binding_; + Binding<MediaPacketConsumer> binding_; - // MediaConsumer.mojom implementation. + // MediaPacketConsumer.mojom implementation. void SetBuffer(ScopedSharedBufferHandle handle, const SetBufferCallback& cbk) final; void SendPacket(MediaPacketPtr packet,
diff --git a/services/media/common/timeline_control_point.h b/services/media/common/timeline_control_point.h index 507aa4f..0d11214 100644 --- a/services/media/common/timeline_control_point.h +++ b/services/media/common/timeline_control_point.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_COMMON_TIMELINE_CONTROL_SITE_IMPL_H_ -#define MOJO_SERVICES_MEDIA_COMMON_TIMELINE_CONTROL_SITE_IMPL_H_ +#ifndef SERVICES_MEDIA_COMMON_TIMELINE_CONTROL_POINT_H_ +#define SERVICES_MEDIA_COMMON_TIMELINE_CONTROL_POINT_H_ #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" @@ -95,4 +95,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_COMMON_TIMELINE_CONTROL_SITE_IMPL_H_ +#endif // SERVICES_MEDIA_COMMON_TIMELINE_CONTROL_POINT_H_
diff --git a/services/media/factory_service/factory_service.h b/services/media/factory_service/factory_service.h index 247bf8a..1282da9 100644 --- a/services/media/factory_service/factory_service.h +++ b/services/media/factory_service/factory_service.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_FACTORY_SERVICE_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_FACTORY_SERVICE_H_ +#ifndef SERVICES_MEDIA_FACTORY_SERVICE_FACTORY_SERVICE_H_ +#define SERVICES_MEDIA_FACTORY_SERVICE_FACTORY_SERVICE_H_ #include "mojo/common/binding_set.h" #include "mojo/services/media/control/interfaces/media_factory.mojom.h" @@ -55,4 +55,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_FACTORY_SERVICE_H_ +#endif // SERVICES_MEDIA_FACTORY_SERVICE_FACTORY_SERVICE_H_
diff --git a/services/media/factory_service/media_decoder_impl.cc b/services/media/factory_service/media_decoder_impl.cc index 2e00494..9b92d73 100644 --- a/services/media/factory_service/media_decoder_impl.cc +++ b/services/media/factory_service/media_decoder_impl.cc
@@ -24,8 +24,8 @@ : MediaFactoryService::Product<MediaTypeConverter>(this, request.Pass(), owner), - consumer_(MojoConsumer::Create()), - producer_(MojoProducer::Create()) { + consumer_(MojoPacketConsumer::Create()), + producer_(MojoPacketProducer::Create()) { DCHECK(input_media_type); std::unique_ptr<StreamType> input_stream_type = @@ -45,12 +45,12 @@ graph_.ConnectParts(decoder_ref, producer_ref); consumer_->SetPrimeRequestedCallback( - [this](const MediaConsumer::PrimeCallback& callback) { + [this](const MediaPacketConsumer::PrimeCallback& callback) { DCHECK(producer_); producer_->PrimeConnection(callback); }); consumer_->SetFlushRequestedCallback( - [this, consumer_ref](const MediaConsumer::FlushCallback& callback) { + [this, consumer_ref](const MediaPacketConsumer::FlushCallback& callback) { DCHECK(producer_); graph_.FlushOutput(consumer_ref.output()); producer_->FlushConnection(callback); @@ -66,13 +66,13 @@ callback.Run(MediaType::From(decoder_->output_stream_type())); } -void MediaDecoderImpl::GetConsumer( - mojo::InterfaceRequest<MediaConsumer> consumer) { +void MediaDecoderImpl::GetPacketConsumer( + mojo::InterfaceRequest<MediaPacketConsumer> consumer) { consumer_->AddBinding(consumer.Pass()); } -void MediaDecoderImpl::GetProducer( - mojo::InterfaceRequest<MediaProducer> producer) { +void MediaDecoderImpl::GetPacketProducer( + mojo::InterfaceRequest<MediaPacketProducer> producer) { producer_->AddBinding(producer.Pass()); }
diff --git a/services/media/factory_service/media_decoder_impl.h b/services/media/factory_service/media_decoder_impl.h index 913169e..082d7b3 100644 --- a/services/media/factory_service/media_decoder_impl.h +++ b/services/media/factory_service/media_decoder_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DECODER_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DECODER_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_DECODER_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_DECODER_IMPL_H_ #include <memory> @@ -12,8 +12,8 @@ #include "services/media/factory_service/factory_service.h" #include "services/media/framework/graph.h" #include "services/media/framework/parts/decoder.h" -#include "services/media/framework_mojo/mojo_consumer.h" -#include "services/media/framework_mojo/mojo_producer.h" +#include "services/media/framework_mojo/mojo_packet_consumer.h" +#include "services/media/framework_mojo/mojo_packet_producer.h" namespace mojo { namespace media { @@ -33,9 +33,11 @@ // MediaTypeConverter implementation. void GetOutputType(const GetOutputTypeCallback& callback) override; - void GetConsumer(InterfaceRequest<MediaConsumer> consumer) override; + void GetPacketConsumer( + InterfaceRequest<MediaPacketConsumer> consumer) override; - void GetProducer(InterfaceRequest<MediaProducer> producer) override; + void GetPacketProducer( + InterfaceRequest<MediaPacketProducer> producer) override; private: MediaDecoderImpl(MediaTypePtr input_media_type, @@ -43,12 +45,12 @@ MediaFactoryService* owner); Graph graph_; - std::shared_ptr<MojoConsumer> consumer_; + std::shared_ptr<MojoPacketConsumer> consumer_; std::shared_ptr<Decoder> decoder_; - std::shared_ptr<MojoProducer> producer_; + std::shared_ptr<MojoPacketProducer> producer_; }; } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DECODER_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_DECODER_IMPL_H_
diff --git a/services/media/factory_service/media_demux_impl.cc b/services/media/factory_service/media_demux_impl.cc index 37478e4..f976ae2 100644 --- a/services/media/factory_service/media_demux_impl.cc +++ b/services/media/factory_service/media_demux_impl.cc
@@ -96,15 +96,16 @@ }); } -void MediaDemuxImpl::GetProducer(uint32_t stream_index, - InterfaceRequest<MediaProducer> producer) { +void MediaDemuxImpl::GetPacketProducer( + uint32_t stream_index, + InterfaceRequest<MediaPacketProducer> producer) { RCHECK(init_complete_.occurred()); if (stream_index >= streams_.size()) { return; } - streams_[stream_index]->GetProducer(producer.Pass()); + streams_[stream_index]->GetPacketProducer(producer.Pass()); } void MediaDemuxImpl::GetMetadata(uint64_t version_last_seen, @@ -158,7 +159,7 @@ DCHECK(stream_type_); DCHECK(graph); - producer_ = MojoProducer::Create(); + producer_ = MojoPacketProducer::Create(); graph_->ConnectOutputToPart(output_, graph_->Add(producer_)); } @@ -168,20 +169,20 @@ return MediaType::From(stream_type_); } -void MediaDemuxImpl::Stream::GetProducer( - InterfaceRequest<MediaProducer> producer) { +void MediaDemuxImpl::Stream::GetPacketProducer( + InterfaceRequest<MediaPacketProducer> producer) { DCHECK(producer_); producer_->AddBinding(producer.Pass()); } void MediaDemuxImpl::Stream::PrimeConnection( - const MojoProducer::PrimeConnectionCallback callback) { + const MojoPacketProducer::PrimeConnectionCallback callback) { DCHECK(producer_); producer_->PrimeConnection(callback); } void MediaDemuxImpl::Stream::FlushConnection( - const MojoProducer::FlushConnectionCallback callback) { + const MojoPacketProducer::FlushConnectionCallback callback) { DCHECK(producer_); producer_->FlushConnection(callback); }
diff --git a/services/media/factory_service/media_demux_impl.h b/services/media/factory_service/media_demux_impl.h index 49e43a9..1a04075 100644 --- a/services/media/factory_service/media_demux_impl.h +++ b/services/media/factory_service/media_demux_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DEMUX_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DEMUX_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_DEMUX_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_DEMUX_IMPL_H_ #include <cstdint> #include <memory> @@ -17,7 +17,7 @@ #include "services/media/factory_service/factory_service.h" #include "services/media/framework/graph.h" #include "services/media/framework/parts/demux.h" -#include "services/media/framework_mojo/mojo_producer.h" +#include "services/media/framework_mojo/mojo_packet_producer.h" #include "services/util/cpp/incident.h" namespace mojo { @@ -37,8 +37,9 @@ // MediaDemux implementation. void Describe(const DescribeCallback& callback) override; - void GetProducer(uint32_t stream_index, - InterfaceRequest<MediaProducer> producer) override; + void GetPacketProducer( + uint32_t stream_index, + InterfaceRequest<MediaPacketProducer> producer) override; void GetMetadata(uint64_t version_last_seen, const GetMetadataCallback& callback) override; @@ -66,19 +67,21 @@ MediaTypePtr media_type() const; // Gets the producer. - void GetProducer(InterfaceRequest<MediaProducer> producer); + void GetPacketProducer(InterfaceRequest<MediaPacketProducer> producer); // Tells the producer to prime its connection. - void PrimeConnection(const MojoProducer::PrimeConnectionCallback callback); + void PrimeConnection( + const MojoPacketProducer::PrimeConnectionCallback callback); // Tells the producer to flush its connection. - void FlushConnection(const MojoProducer::FlushConnectionCallback callback); + void FlushConnection( + const MojoPacketProducer::FlushConnectionCallback callback); private: std::unique_ptr<StreamType> stream_type_; Graph* graph_; OutputRef output_; - std::shared_ptr<MojoProducer> producer_; + std::shared_ptr<MojoPacketProducer> producer_; }; // Handles the completion of demux initialization. @@ -98,4 +101,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DEMUX_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_DEMUX_IMPL_H_
diff --git a/services/media/factory_service/media_player_impl.cc b/services/media/factory_service/media_player_impl.cc index 57475ff..fc094d6 100644 --- a/services/media/factory_service/media_player_impl.cc +++ b/services/media/factory_service/media_player_impl.cc
@@ -296,7 +296,7 @@ const std::function<void()>& callback) { DCHECK(factory_); - demux_->GetProducer(index, GetProxy(&stream->encoded_producer_)); + demux_->GetPacketProducer(index, GetProxy(&stream->encoded_producer_)); if (input_media_type->encoding != MediaType::kAudioEncodingLpcm && input_media_type->encoding != MediaType::kVideoEncodingUncompressed) { @@ -307,8 +307,8 @@ factory_->CreateDecoder(input_media_type.Clone(), GetProxy(&stream->decoder_)); - MediaConsumerPtr decoder_consumer; - stream->decoder_->GetConsumer(GetProxy(&decoder_consumer)); + MediaPacketConsumerPtr decoder_consumer; + stream->decoder_->GetPacketConsumer(GetProxy(&decoder_consumer)); callback_joiner->Spawn(); stream->encoded_producer_->Connect(decoder_consumer.Pass(), @@ -318,12 +318,12 @@ }); callback_joiner->Spawn(); - stream->decoder_->GetOutputType( - [this, stream, callback_joiner](MediaTypePtr output_type) { - stream->decoder_->GetProducer(GetProxy(&stream->decoded_producer_)); - CreateSink(stream, output_type, callback_joiner->NewCallback()); - callback_joiner->Complete(); - }); + stream->decoder_->GetOutputType([this, stream, callback_joiner]( + MediaTypePtr output_type) { + stream->decoder_->GetPacketProducer(GetProxy(&stream->decoded_producer_)); + CreateSink(stream, output_type, callback_joiner->NewCallback()); + callback_joiner->Complete(); + }); callback_joiner->WhenJoined(callback); } else { @@ -350,8 +350,8 @@ timeline_controller_->AddControlPoint(timeline_control_point.Pass()); - MediaConsumerPtr consumer; - stream->sink_->GetConsumer(GetProxy(&consumer)); + MediaPacketConsumerPtr consumer; + stream->sink_->GetPacketConsumer(GetProxy(&consumer)); stream->decoded_producer_->Connect(consumer.Pass(), [this, callback, stream]() {
diff --git a/services/media/factory_service/media_player_impl.h b/services/media/factory_service/media_player_impl.h index 726d347..795d123 100644 --- a/services/media/factory_service/media_player_impl.h +++ b/services/media/factory_service/media_player_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_PLAYER_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_PLAYER_IMPL_H_ #include <limits> #include <vector> @@ -64,8 +64,8 @@ MediaSinkPtr sink_; // The following fields are just temporaries used to solve lambda capture // problems. - MediaProducerPtr encoded_producer_; - MediaProducerPtr decoded_producer_; + MediaPacketProducerPtr encoded_producer_; + MediaPacketProducerPtr decoded_producer_; InterfaceHandle<MediaRenderer> renderer_; }; @@ -146,4 +146,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_PLAYER_IMPL_H_
diff --git a/services/media/factory_service/media_sink_impl.cc b/services/media/factory_service/media_sink_impl.cc index aa96552..2f8f40b 100644 --- a/services/media/factory_service/media_sink_impl.cc +++ b/services/media/factory_service/media_sink_impl.cc
@@ -25,8 +25,8 @@ InterfaceRequest<MediaSink> request, MediaFactoryService* owner) : MediaFactoryService::Product<MediaSink>(this, request.Pass(), owner), - consumer_(MojoConsumer::Create()), - producer_(MojoProducer::Create()), + consumer_(MojoPacketConsumer::Create()), + producer_(MojoPacketProducer::Create()), renderer_(MediaRendererPtr::Create(renderer.Pass())) { DCHECK(renderer_); DCHECK(media_type); @@ -35,14 +35,14 @@ PartRef producer_ref = graph_.Add(producer_); consumer_->SetPrimeRequestedCallback( - [this](const MediaConsumer::PrimeCallback& callback) { + [this](const MediaPacketConsumer::PrimeCallback& callback) { ready_.When([this, callback]() { DCHECK(producer_); producer_->PrimeConnection(callback); }); }); consumer_->SetFlushRequestedCallback( - [this, consumer_ref](const MediaConsumer::FlushCallback& callback) { + [this, consumer_ref](const MediaPacketConsumer::FlushCallback& callback) { ready_.When([this, consumer_ref, callback]() { DCHECK(producer_); graph_.FlushOutput(consumer_ref.output()); @@ -76,8 +76,8 @@ graph_.ConnectOutputToPart(out, producer_ref); renderer_->SetMediaType(MediaType::From(std::move(producer_stream_type))); - MediaConsumerPtr consumer; - renderer_->GetConsumer(GetProxy(&consumer)); + MediaPacketConsumerPtr consumer; + renderer_->GetPacketConsumer(GetProxy(&consumer)); producer_->Connect(consumer.Pass(), [this]() { graph_.Prepare(); ready_.Occur(); @@ -87,7 +87,8 @@ MediaSinkImpl::~MediaSinkImpl() {} -void MediaSinkImpl::GetConsumer(InterfaceRequest<MediaConsumer> consumer) { +void MediaSinkImpl::GetPacketConsumer( + InterfaceRequest<MediaPacketConsumer> consumer) { consumer_->AddBinding(consumer.Pass()); }
diff --git a/services/media/factory_service/media_sink_impl.h b/services/media/factory_service/media_sink_impl.h index eb8543a..e0e4ec9 100644 --- a/services/media/factory_service/media_sink_impl.h +++ b/services/media/factory_service/media_sink_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SINK_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SINK_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SINK_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SINK_IMPL_H_ #include <memory> @@ -13,8 +13,8 @@ #include "services/media/factory_service/factory_service.h" #include "services/media/framework/graph.h" #include "services/media/framework/parts/decoder.h" -#include "services/media/framework_mojo/mojo_consumer.h" -#include "services/media/framework_mojo/mojo_producer.h" +#include "services/media/framework_mojo/mojo_packet_consumer.h" +#include "services/media/framework_mojo/mojo_packet_producer.h" #include "services/util/cpp/incident.h" namespace mojo { @@ -34,7 +34,8 @@ ~MediaSinkImpl() override; // MediaSink implementation. - void GetConsumer(InterfaceRequest<MediaConsumer> consumer) override; + void GetPacketConsumer( + InterfaceRequest<MediaPacketConsumer> consumer) override; void GetTimelineControlPoint( InterfaceRequest<MediaTimelineControlPoint> req) override; @@ -47,8 +48,8 @@ Incident ready_; Graph graph_; - std::shared_ptr<MojoConsumer> consumer_; - std::shared_ptr<MojoProducer> producer_; + std::shared_ptr<MojoPacketConsumer> consumer_; + std::shared_ptr<MojoPacketProducer> producer_; MediaRendererPtr renderer_; // The following fields are just temporaries used to solve lambda capture // problems. @@ -58,4 +59,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SINK_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SINK_IMPL_H_
diff --git a/services/media/factory_service/media_source_impl.cc b/services/media/factory_service/media_source_impl.cc index c2e38db..57d4fd5 100644 --- a/services/media/factory_service/media_source_impl.cc +++ b/services/media/factory_service/media_source_impl.cc
@@ -102,27 +102,16 @@ }); } -void MediaSourceImpl::GetProducer(uint32_t stream_index, - InterfaceRequest<MediaProducer> producer) { - RCHECK(init_complete_.occurred()); - - if (stream_index >= streams_.size()) { - return; - } - - streams_[stream_index]->GetProducer(producer.Pass()); -} - -void MediaSourceImpl::GetPullModeProducer( +void MediaSourceImpl::GetPacketProducer( uint32_t stream_index, - InterfaceRequest<MediaPullModeProducer> producer) { + InterfaceRequest<MediaPacketProducer> producer) { RCHECK(init_complete_.occurred()); if (stream_index >= streams_.size()) { return; } - streams_[stream_index]->GetPullModeProducer(producer.Pass()); + streams_[stream_index]->GetPacketProducer(producer.Pass()); } void MediaSourceImpl::GetStatus(uint64_t version_last_seen, @@ -215,45 +204,25 @@ return MediaType::From(original_stream_type_); } -void MediaSourceImpl::Stream::GetProducer( - InterfaceRequest<MediaProducer> producer) { - if (pull_mode_producer_) { - // Can't have both push mode and pull mode producers. - return; - } - +void MediaSourceImpl::Stream::GetPacketProducer( + InterfaceRequest<MediaPacketProducer> producer) { if (!producer_) { - producer_ = MojoProducer::Create(); + producer_ = MojoPacketProducer::Create(); graph_->ConnectOutputToPart(output_, graph_->Add(producer_)); } producer_->AddBinding(producer.Pass()); } -void MediaSourceImpl::Stream::GetPullModeProducer( - InterfaceRequest<MediaPullModeProducer> producer) { - if (producer_) { - // Can't have both push mode and pull mode producers. - return; - } - - if (!pull_mode_producer_) { - pull_mode_producer_ = MojoPullModeProducer::Create(); - graph_->ConnectOutputToPart(output_, graph_->Add(pull_mode_producer_)); - } - - pull_mode_producer_->AddBinding(producer.Pass()); -} - void MediaSourceImpl::Stream::EnsureSink() { - if (producer_ == nullptr && pull_mode_producer_ == nullptr) { + if (producer_ == nullptr) { null_sink_ = NullSink::Create(); graph_->ConnectOutputToPart(output_, graph_->Add(null_sink_)); } } void MediaSourceImpl::Stream::PrimeConnection( - const MojoProducer::PrimeConnectionCallback callback) { + const MojoPacketProducer::PrimeConnectionCallback callback) { if (producer_ != nullptr) { producer_->PrimeConnection(callback); } else { @@ -262,7 +231,7 @@ } void MediaSourceImpl::Stream::FlushConnection( - const MojoProducer::FlushConnectionCallback callback) { + const MojoPacketProducer::FlushConnectionCallback callback) { if (producer_ != nullptr) { producer_->FlushConnection(callback); } else {
diff --git a/services/media/factory_service/media_source_impl.h b/services/media/factory_service/media_source_impl.h index ee440e5..abfc756 100644 --- a/services/media/factory_service/media_source_impl.h +++ b/services/media/factory_service/media_source_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SOURCE_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SOURCE_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SOURCE_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SOURCE_IMPL_H_ #include <vector> @@ -18,8 +18,7 @@ #include "services/media/framework/parts/demux.h" #include "services/media/framework/parts/null_sink.h" #include "services/media/framework/parts/reader.h" -#include "services/media/framework_mojo/mojo_producer.h" -#include "services/media/framework_mojo/mojo_pull_mode_producer.h" +#include "services/media/framework_mojo/mojo_packet_producer.h" #include "services/util/cpp/incident.h" namespace mojo { @@ -40,12 +39,9 @@ // MediaSource implementation. void GetStreams(const GetStreamsCallback& callback) override; - void GetProducer(uint32_t stream_index, - InterfaceRequest<MediaProducer> producer) override; - - void GetPullModeProducer( + void GetPacketProducer( uint32_t stream_index, - InterfaceRequest<MediaPullModeProducer> producer) override; + InterfaceRequest<MediaPacketProducer> producer) override; void GetStatus(uint64_t version_last_seen, const GetStatusCallback& callback) override; @@ -81,27 +77,25 @@ MediaTypePtr original_media_type() const; // Gets the producer. - void GetProducer(InterfaceRequest<MediaProducer> producer); - - // Gets the pull mode producer. - void GetPullModeProducer(InterfaceRequest<MediaPullModeProducer> producer); + void GetPacketProducer(InterfaceRequest<MediaPacketProducer> producer); // Makes sure the stream has a sink. void EnsureSink(); // Tells the producer to prime its connection. - void PrimeConnection(const MojoProducer::PrimeConnectionCallback callback); + void PrimeConnection( + const MojoPacketProducer::PrimeConnectionCallback callback); // Tells the producer to flush its connection. - void FlushConnection(const MojoProducer::FlushConnectionCallback callback); + void FlushConnection( + const MojoPacketProducer::FlushConnectionCallback callback); private: std::unique_ptr<StreamType> stream_type_; std::unique_ptr<StreamType> original_stream_type_; Graph* graph_; OutputRef output_; - std::shared_ptr<MojoProducer> producer_; - std::shared_ptr<MojoPullModeProducer> pull_mode_producer_; + std::shared_ptr<MojoPacketProducer> producer_; std::shared_ptr<NullSink> null_sink_; }; @@ -124,4 +118,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_SOURCE_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_SERVICE_MEDIA_SOURCE_IMPL_H_
diff --git a/services/media/factory_service/media_timeline_controller_impl.h b/services/media/factory_service/media_timeline_controller_impl.h index bb80d87..56df997 100644 --- a/services/media/factory_service/media_timeline_controller_impl.h +++ b/services/media/factory_service/media_timeline_controller_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_ #include <memory> #include <vector> @@ -154,4 +154,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_
diff --git a/services/media/factory_service/network_reader_impl.h b/services/media/factory_service/network_reader_impl.h index f82020f..c73a4d0 100644 --- a/services/media/factory_service/network_reader_impl.h +++ b/services/media/factory_service/network_reader_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FACTORY_NETWORK_READER_IMPL_H_ -#define MOJO_SERVICES_MEDIA_FACTORY_NETWORK_READER_IMPL_H_ +#ifndef SERVICES_MEDIA_FACTORY_NETWORK_READER_IMPL_H_ +#define SERVICES_MEDIA_FACTORY_NETWORK_READER_IMPL_H_ #include <memory> @@ -59,4 +59,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FACTORY_NETWORK_READER_IMPL_H_ +#endif // SERVICES_MEDIA_FACTORY_NETWORK_READER_IMPL_H_
diff --git a/services/media/framework/models/active_multistream_sink.h b/services/media/framework/models/active_multistream_sink.h index 9347fc9..3914c04 100644 --- a/services/media/framework/models/active_multistream_sink.h +++ b/services/media/framework/models/active_multistream_sink.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_ACTIVE_MULTISTREAM_SINK_H_ -#define MOJO_MEDIA_MODELS_ACTIVE_MULTISTREAM_SINK_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_MULTISTREAM_SINK_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_MULTISTREAM_SINK_H_ #include "services/media/framework/models/demand.h" #include "services/media/framework/models/part.h" @@ -46,4 +46,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_ACTIVE_MULTISTREAM_SINK_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_MULTISTREAM_SINK_H_
diff --git a/services/media/framework/models/active_multistream_source.h b/services/media/framework/models/active_multistream_source.h index 22b1b11..6cca0fc 100644 --- a/services/media/framework/models/active_multistream_source.h +++ b/services/media/framework/models/active_multistream_source.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_ACTIVE_MULTISTREAM_SOURCE_H_ -#define MOJO_MEDIA_MODELS_ACTIVE_MULTISTREAM_SOURCE_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_MULTISTREAM_SOURCE_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_MULTISTREAM_SOURCE_H_ #include "services/media/framework/models/part.h" #include "services/media/framework/packet.h" @@ -35,4 +35,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_ACTIVE_MULTISTREAM_SOURCE_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_MULTISTREAM_SOURCE_H_
diff --git a/services/media/framework/models/active_sink.h b/services/media/framework/models/active_sink.h index 3463dfc..baf009a 100644 --- a/services/media/framework/models/active_sink.h +++ b/services/media/framework/models/active_sink.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_ACTIVE_SINK_H_ -#define MOJO_MEDIA_MODELS_ACTIVE_SINK_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_SINK_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_SINK_H_ #include "services/media/framework/models/demand.h" #include "services/media/framework/models/part.h" @@ -34,4 +34,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_ACTIVE_SINK_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_SINK_H_
diff --git a/services/media/framework/models/active_source.h b/services/media/framework/models/active_source.h index 0e3f67f..eaaced2 100644 --- a/services/media/framework/models/active_source.h +++ b/services/media/framework/models/active_source.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_ACTIVE_SOURCE_H_ -#define MOJO_MEDIA_MODELS_ACTIVE_SOURCE_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_SOURCE_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_SOURCE_H_ #include "services/media/framework/models/demand.h" #include "services/media/framework/models/part.h" @@ -36,4 +36,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_ACTIVE_SOURCE_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_ACTIVE_SOURCE_H_
diff --git a/services/media/framework/models/demand.h b/services/media/framework/models/demand.h index 9487a43..eb1c15b 100644 --- a/services/media/framework/models/demand.h +++ b/services/media/framework/models/demand.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_DEMAND_H_ -#define MOJO_MEDIA_MODELS_DEMAND_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_DEMAND_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_DEMAND_H_ namespace mojo { namespace media { @@ -25,4 +25,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_DEMAND_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_DEMAND_H_
diff --git a/services/media/framework/models/multistream_source.h b/services/media/framework/models/multistream_source.h index 9c70808..4249961 100644 --- a/services/media/framework/models/multistream_source.h +++ b/services/media/framework/models/multistream_source.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_MULTISTREAM_SOURCE_H_ -#define MOJO_MEDIA_MODELS_MULTISTREAM_SOURCE_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_MULTISTREAM_SOURCE_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_MULTISTREAM_SOURCE_H_ #include "services/media/framework/models/part.h" #include "services/media/framework/packet.h" @@ -28,4 +28,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_MULTISTREAM_SOURCE_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_MULTISTREAM_SOURCE_H_
diff --git a/services/media/framework/models/transform.h b/services/media/framework/models/transform.h index 495aae5..32c719f 100644 --- a/services/media/framework/models/transform.h +++ b/services/media/framework/models/transform.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_MEDIA_MODELS_TRANSFORM_H_ -#define MOJO_MEDIA_MODELS_TRANSFORM_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MODELS_TRANSFORM_H_ +#define SERVICES_MEDIA_FRAMEWORK_MODELS_TRANSFORM_H_ #include "services/media/framework/models/part.h" #include "services/media/framework/packet.h" @@ -31,4 +31,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_MEDIA_MODELS_TRANSFORM_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MODELS_TRANSFORM_H_
diff --git a/services/media/framework/util/callback_joiner.h b/services/media/framework/util/callback_joiner.h index 35fb353..f00978f 100644 --- a/services/media/framework/util/callback_joiner.h +++ b/services/media/framework/util/callback_joiner.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_ -#define MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_ +#define SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_ #include <memory> @@ -122,4 +122,4 @@ } // namespace media } // namespace mojo -#endif // MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_
diff --git a/services/media/framework_mojo/BUILD.gn b/services/media/framework_mojo/BUILD.gn index d1e59e8..24b664f 100644 --- a/services/media/framework_mojo/BUILD.gn +++ b/services/media/framework_mojo/BUILD.gn
@@ -6,14 +6,12 @@ sources = [ "mojo_allocator.cc", "mojo_allocator.h", - "mojo_consumer.cc", - "mojo_consumer.h", "mojo_formatting.cc", "mojo_formatting.h", - "mojo_producer.cc", - "mojo_producer.h", - "mojo_pull_mode_producer.cc", - "mojo_pull_mode_producer.h", + "mojo_packet_consumer.cc", + "mojo_packet_consumer.h", + "mojo_packet_producer.cc", + "mojo_packet_producer.h", "mojo_reader.cc", "mojo_reader.h", "mojo_type_conversions.cc",
diff --git a/services/media/framework_mojo/mojo_consumer.cc b/services/media/framework_mojo/mojo_consumer.cc deleted file mode 100644 index a07a54f..0000000 --- a/services/media/framework_mojo/mojo_consumer.cc +++ /dev/null
@@ -1,112 +0,0 @@ -// Copyright 2016 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. - -#include "base/bind.h" -#include "base/logging.h" -#include "base/message_loop/message_loop.h" -#include "services/media/framework_mojo/mojo_consumer.h" - -namespace mojo { -namespace media { - -void MojoConsumerMediaConsumer::Flush(const FlushCallback& callback) { - MediaConsumerFlush(callback); -} - -MojoConsumer::MojoConsumer() {} - -MojoConsumer::~MojoConsumer() {} - -void MojoConsumer::AddBinding(InterfaceRequest<MediaConsumer> consumer) { - bindings_.AddBinding(this, consumer.Pass()); - DCHECK(base::MessageLoop::current()); - task_runner_ = base::MessageLoop::current()->task_runner(); - DCHECK(task_runner_); -} - -void MojoConsumer::SetPrimeRequestedCallback( - const PrimeRequestedCallback& callback) { - prime_requested_callback_ = callback; -} - -void MojoConsumer::SetFlushRequestedCallback( - const FlushRequestedCallback& callback) { - flush_requested_callback_ = callback; -} - -void MojoConsumer::SetBuffer(ScopedSharedBufferHandle buffer, - const SetBufferCallback& callback) { - buffer_.InitFromHandle(buffer.Pass()); - callback.Run(); -} - -void MojoConsumer::SendPacket(MediaPacketPtr media_packet, - const SendPacketCallback& callback) { - DCHECK(media_packet); - DCHECK(supply_callback_); - supply_callback_( - PacketImpl::Create(media_packet.Pass(), callback, task_runner_, buffer_)); -} - -void MojoConsumer::Prime(const PrimeCallback& callback) { - if (prime_requested_callback_) { - prime_requested_callback_(callback); - } else { - LOG(WARNING) << "prime requested but no callback registered"; - callback.Run(); - } -} - -void MojoConsumer::MediaConsumerFlush(const FlushCallback& callback) { - if (flush_requested_callback_) { - flush_requested_callback_(callback); - } else { - LOG(WARNING) << "flush requested but no callback registered"; - callback.Run(); - } -} - -bool MojoConsumer::can_accept_allocator() const { - return false; -} - -void MojoConsumer::set_allocator(PayloadAllocator* allocator) { - LOG(ERROR) << "set_allocator called on MojoConsumer"; -} - -void MojoConsumer::SetSupplyCallback(const SupplyCallback& supply_callback) { - supply_callback_ = supply_callback; -} - -void MojoConsumer::SetDownstreamDemand(Demand demand) {} - -MojoConsumer::PacketImpl::PacketImpl( - MediaPacketPtr media_packet, - const SendPacketCallback& callback, - scoped_refptr<base::SingleThreadTaskRunner> task_runner, - const MappedSharedBuffer& buffer) - : Packet(media_packet->pts, - media_packet->end_of_stream, - media_packet->payload->length, - media_packet->payload->length == 0 - ? nullptr - : buffer.PtrFromOffset(media_packet->payload->offset)), - media_packet_(media_packet.Pass()), - callback_(callback), - task_runner_(task_runner) {} - -MojoConsumer::PacketImpl::~PacketImpl() {} - -// static -void MojoConsumer::PacketImpl::RunCallback(const SendPacketCallback& callback) { - callback.Run(MediaConsumer::SendResult::CONSUMED); -} - -void MojoConsumer::PacketImpl::Release() { - task_runner_->PostTask(FROM_HERE, base::Bind(&RunCallback, callback_)); - delete this; -} - -} // namespace media -} // namespace mojo
diff --git a/services/media/framework_mojo/mojo_packet_consumer.cc b/services/media/framework_mojo/mojo_packet_consumer.cc new file mode 100644 index 0000000..e474c71 --- /dev/null +++ b/services/media/framework_mojo/mojo_packet_consumer.cc
@@ -0,0 +1,117 @@ +// Copyright 2016 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. + +#include "base/bind.h" +#include "base/logging.h" +#include "base/message_loop/message_loop.h" +#include "services/media/framework_mojo/mojo_packet_consumer.h" + +namespace mojo { +namespace media { + +void MojoPacketConsumerMediaPacketConsumer::Flush( + const FlushCallback& callback) { + MediaPacketConsumerFlush(callback); +} + +MojoPacketConsumer::MojoPacketConsumer() {} + +MojoPacketConsumer::~MojoPacketConsumer() {} + +void MojoPacketConsumer::AddBinding( + InterfaceRequest<MediaPacketConsumer> consumer) { + bindings_.AddBinding(this, consumer.Pass()); + DCHECK(base::MessageLoop::current()); + task_runner_ = base::MessageLoop::current()->task_runner(); + DCHECK(task_runner_); +} + +void MojoPacketConsumer::SetPrimeRequestedCallback( + const PrimeRequestedCallback& callback) { + prime_requested_callback_ = callback; +} + +void MojoPacketConsumer::SetFlushRequestedCallback( + const FlushRequestedCallback& callback) { + flush_requested_callback_ = callback; +} + +void MojoPacketConsumer::SetBuffer(ScopedSharedBufferHandle buffer, + const SetBufferCallback& callback) { + buffer_.InitFromHandle(buffer.Pass()); + callback.Run(); +} + +void MojoPacketConsumer::SendPacket(MediaPacketPtr media_packet, + const SendPacketCallback& callback) { + DCHECK(media_packet); + DCHECK(supply_callback_); + supply_callback_( + PacketImpl::Create(media_packet.Pass(), callback, task_runner_, buffer_)); +} + +void MojoPacketConsumer::Prime(const PrimeCallback& callback) { + if (prime_requested_callback_) { + prime_requested_callback_(callback); + } else { + LOG(WARNING) << "prime requested but no callback registered"; + callback.Run(); + } +} + +void MojoPacketConsumer::MediaPacketConsumerFlush( + const FlushCallback& callback) { + if (flush_requested_callback_) { + flush_requested_callback_(callback); + } else { + LOG(WARNING) << "flush requested but no callback registered"; + callback.Run(); + } +} + +bool MojoPacketConsumer::can_accept_allocator() const { + return false; +} + +void MojoPacketConsumer::set_allocator(PayloadAllocator* allocator) { + LOG(ERROR) << "set_allocator called on MojoPacketConsumer"; +} + +void MojoPacketConsumer::SetSupplyCallback( + const SupplyCallback& supply_callback) { + supply_callback_ = supply_callback; +} + +void MojoPacketConsumer::SetDownstreamDemand(Demand demand) {} + +MojoPacketConsumer::PacketImpl::PacketImpl( + MediaPacketPtr media_packet, + const SendPacketCallback& callback, + scoped_refptr<base::SingleThreadTaskRunner> task_runner, + const MappedSharedBuffer& buffer) + : Packet(media_packet->pts, + media_packet->end_of_stream, + media_packet->payload->length, + media_packet->payload->length == 0 + ? nullptr + : buffer.PtrFromOffset(media_packet->payload->offset)), + media_packet_(media_packet.Pass()), + callback_(callback), + task_runner_(task_runner) {} + +MojoPacketConsumer::PacketImpl::~PacketImpl() {} + +// static +void MojoPacketConsumer::PacketImpl::RunCallback( + const SendPacketCallback& callback) { + callback.Run(MediaPacketConsumer::SendResult::CONSUMED); +} + +void MojoPacketConsumer::PacketImpl::Release() { + task_runner_->PostTask(FROM_HERE, base::Bind(&RunCallback, callback_)); + delete this; +} + +} // namespace media +} // namespace mojo
diff --git a/services/media/framework_mojo/mojo_consumer.h b/services/media/framework_mojo/mojo_packet_consumer.h similarity index 70% rename from services/media/framework_mojo/mojo_consumer.h rename to services/media/framework_mojo/mojo_packet_consumer.h index 44ffc8e..d1fa15e 100644 --- a/services/media/framework_mojo/mojo_consumer.h +++ b/services/media/framework_mojo/mojo_packet_consumer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_CONSUMER_H_ -#define SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_CONSUMER_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PACKET_CONSUMER_H_ +#define SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PACKET_CONSUMER_H_ #include "base/single_thread_task_runner.h" #include "base/task_runner.h" @@ -15,40 +15,42 @@ namespace mojo { namespace media { -// Implements MediaConsumer::Flush on behalf of MediaConsumer to avoid name +// Implements MediaPacketConsumer::Flush on behalf of MediaPacketConsumer to +// avoid name // conflict with Part::Flush. -class MojoConsumerMediaConsumer : public MediaConsumer { - // MediaConsumer implementation. +class MojoPacketConsumerMediaPacketConsumer : public MediaPacketConsumer { + // MediaPacketConsumer implementation. void Flush(const FlushCallback& callback) override; - // Implements MediaConsumer::Flush. - virtual void MediaConsumerFlush(const FlushCallback& callback) = 0; + // Implements MediaPacketConsumer::Flush. + virtual void MediaPacketConsumerFlush(const FlushCallback& callback) = 0; }; -// Implements MediaConsumer to receive a stream from across mojo. -class MojoConsumer : public MojoConsumerMediaConsumer, public ActiveSource { +// Implements MediaPacketConsumer to receive a stream from across mojo. +class MojoPacketConsumer : public MojoPacketConsumerMediaPacketConsumer, + public ActiveSource { public: using PrimeRequestedCallback = std::function<void(const PrimeCallback&)>; using FlushRequestedCallback = std::function<void(const FlushCallback&)>; - static std::shared_ptr<MojoConsumer> Create() { - return std::shared_ptr<MojoConsumer>(new MojoConsumer()); + static std::shared_ptr<MojoPacketConsumer> Create() { + return std::shared_ptr<MojoPacketConsumer>(new MojoPacketConsumer()); } - ~MojoConsumer() override; + ~MojoPacketConsumer() override; // Adds a binding. - void AddBinding(InterfaceRequest<MediaConsumer> consumer); + void AddBinding(InterfaceRequest<MediaPacketConsumer> consumer); // Sets a callback signalling that a prime has been requested from the - // MediaConsumer client. + // MediaPacketConsumer client. void SetPrimeRequestedCallback(const PrimeRequestedCallback& callback); // Sets a callback signalling that a flush has been requested from the - // MediaConsumer client. + // MediaPacketConsumer client. void SetFlushRequestedCallback(const FlushRequestedCallback& callback); - // MediaConsumer implementation. + // MediaPacketConsumer implementation. void SetBuffer(ScopedSharedBufferHandle buffer, const SetBufferCallback& callback) override; @@ -57,7 +59,7 @@ void Prime(const PrimeCallback& callback) override; - void MediaConsumerFlush(const FlushCallback& callback) override; + void MediaPacketConsumerFlush(const FlushCallback& callback) override; // ActiveSource implementation. bool can_accept_allocator() const override; @@ -69,7 +71,7 @@ void SetDownstreamDemand(Demand demand) override; private: - MojoConsumer(); + MojoPacketConsumer(); // Specialized packet implementation. class PacketImpl : public Packet { @@ -101,7 +103,7 @@ scoped_refptr<base::SingleThreadTaskRunner> task_runner_; }; - BindingSet<MediaConsumer> bindings_; + BindingSet<MediaPacketConsumer> bindings_; PrimeRequestedCallback prime_requested_callback_; FlushRequestedCallback flush_requested_callback_; scoped_refptr<base::SingleThreadTaskRunner> task_runner_; @@ -112,4 +114,4 @@ } // namespace media } // namespace mojo -#endif // SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_CONSUMER_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PACKET_CONSUMER_H_
diff --git a/services/media/framework_mojo/mojo_producer.cc b/services/media/framework_mojo/mojo_packet_producer.cc similarity index 74% rename from services/media/framework_mojo/mojo_producer.cc rename to services/media/framework_mojo/mojo_packet_producer.cc index 50eb26e..f60f31b 100644 --- a/services/media/framework_mojo/mojo_producer.cc +++ b/services/media/framework_mojo/mojo_packet_producer.cc
@@ -6,25 +6,27 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" -#include "services/media/framework_mojo/mojo_producer.h" +#include "services/media/framework_mojo/mojo_packet_producer.h" namespace mojo { namespace media { -MojoProducer::MojoProducer() { +MojoPacketProducer::MojoPacketProducer() { task_runner_ = base::MessageLoop::current()->task_runner(); DCHECK(task_runner_); } -MojoProducer::~MojoProducer() { +MojoPacketProducer::~MojoPacketProducer() { base::AutoLock lock(lock_); } -void MojoProducer::AddBinding(InterfaceRequest<MediaProducer> producer) { +void MojoPacketProducer::AddBinding( + InterfaceRequest<MediaPacketProducer> producer) { bindings_.AddBinding(this, producer.Pass()); } -void MojoProducer::PrimeConnection(const PrimeConnectionCallback& callback) { +void MojoPacketProducer::PrimeConnection( + const PrimeConnectionCallback& callback) { Demand demand; if (consumer_.is_bound()) { @@ -50,7 +52,8 @@ } } -void MojoProducer::FlushConnection(const FlushConnectionCallback& callback) { +void MojoPacketProducer::FlushConnection( + const FlushConnectionCallback& callback) { { base::AutoLock lock(lock_); max_pushes_outstanding_ = 0; @@ -66,15 +69,16 @@ } } -PayloadAllocator* MojoProducer::allocator() { +PayloadAllocator* MojoPacketProducer::allocator() { return &mojo_allocator_; } -void MojoProducer::SetDemandCallback(const DemandCallback& demand_callback) { +void MojoPacketProducer::SetDemandCallback( + const DemandCallback& demand_callback) { demand_callback_ = demand_callback; } -Demand MojoProducer::SupplyPacket(PacketPtr packet) { +Demand MojoPacketProducer::SupplyPacket(PacketPtr packet) { DCHECK(packet); // If we're not connected, throw the packet away. @@ -103,17 +107,17 @@ MediaPacketPtr media_packet = CreateMediaPacket(packet); task_runner_->PostTask( FROM_HERE, - base::Bind(&MojoProducer::SendPacket, base::Unretained(this), + base::Bind(&MojoPacketProducer::SendPacket, base::Unretained(this), packet.release(), base::Passed(media_packet.Pass()))); return demand; } -void MojoProducer::Connect(InterfaceHandle<MediaConsumer> consumer, - const ConnectCallback& callback) { +void MojoPacketProducer::Connect(InterfaceHandle<MediaPacketConsumer> consumer, + const ConnectCallback& callback) { DCHECK(consumer); - consumer_ = MediaConsumerPtr::Create(std::move(consumer)); + consumer_ = MediaPacketConsumerPtr::Create(std::move(consumer)); if (!mojo_allocator_.initialized()) { mojo_allocator_.InitNew(4096 * 1024); // TODO(dalesat): Made up! @@ -123,17 +127,17 @@ [callback]() { callback.Run(); }); } -void MojoProducer::Disconnect() { +void MojoPacketProducer::Disconnect() { DCHECK(demand_callback_); demand_callback_(Demand::kNegative); consumer_.reset(); } -void MojoProducer::SendPacket(Packet* packet_raw_ptr, - MediaPacketPtr media_packet) { +void MojoPacketProducer::SendPacket(Packet* packet_raw_ptr, + MediaPacketPtr media_packet) { consumer_->SendPacket( media_packet.Pass(), - [this, packet_raw_ptr](MediaConsumer::SendResult send_result) { + [this, packet_raw_ptr](MediaPacketConsumer::SendResult send_result) { PacketPtr packet = PacketPtr(packet_raw_ptr); Demand demand; @@ -149,7 +153,7 @@ }); } -MediaPacketPtr MojoProducer::CreateMediaPacket(const PacketPtr& packet) { +MediaPacketPtr MojoPacketProducer::CreateMediaPacket(const PacketPtr& packet) { DCHECK(packet); MediaPacketRegionPtr region = MediaPacketRegion::New();
diff --git a/services/media/framework_mojo/mojo_producer.h b/services/media/framework_mojo/mojo_packet_producer.h similarity index 72% rename from services/media/framework_mojo/mojo_producer.h rename to services/media/framework_mojo/mojo_packet_producer.h index ed78add..e580396 100644 --- a/services/media/framework_mojo/mojo_producer.h +++ b/services/media/framework_mojo/mojo_packet_producer.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_PUSH_PRODUCER_BASE_H_ -#define SERVICES_MEDIA_FRAMEWORK_MOJO_PUSH_PRODUCER_BASE_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PACKET_PRODUCER_H_ +#define SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PACKET_PRODUCER_H_ #include "base/single_thread_task_runner.h" #include "base/synchronization/lock.h" @@ -15,20 +15,20 @@ namespace mojo { namespace media { -// Implements MediaProducer to forward a stream across mojo. -class MojoProducer : public MediaProducer, public ActiveSink { +// Implements MediaPacketProducer to forward a stream across mojo. +class MojoPacketProducer : public MediaPacketProducer, public ActiveSink { public: using PrimeConnectionCallback = mojo::Callback<void()>; using FlushConnectionCallback = mojo::Callback<void()>; - static std::shared_ptr<MojoProducer> Create() { - return std::shared_ptr<MojoProducer>(new MojoProducer()); + static std::shared_ptr<MojoPacketProducer> Create() { + return std::shared_ptr<MojoPacketProducer>(new MojoPacketProducer()); } - ~MojoProducer() override; + ~MojoPacketProducer() override; // Adds a binding. - void AddBinding(InterfaceRequest<MediaProducer> producer); + void AddBinding(InterfaceRequest<MediaPacketProducer> producer); // Initiates demand to provide downstream parties with enough content to // start without starving. @@ -44,14 +44,14 @@ Demand SupplyPacket(PacketPtr packet) override; - // MediaProducer implementation. - void Connect(InterfaceHandle<MediaConsumer> consumer, + // MediaPacketProducer implementation. + void Connect(InterfaceHandle<MediaPacketConsumer> consumer, const ConnectCallback& callback) override; void Disconnect() override; private: - MojoProducer(); + MojoPacketProducer(); // Sends a packet to the consumer. // TODO(dalesat): Don't use a raw pointer, if possible. @@ -63,8 +63,8 @@ // Allocates from the shared buffer. MojoAllocator mojo_allocator_; - BindingSet<MediaProducer> bindings_; - MediaConsumerPtr consumer_; + BindingSet<MediaPacketProducer> bindings_; + MediaPacketConsumerPtr consumer_; mutable base::Lock lock_; // THE FIELDS BELOW SHOULD ONLY BE ACCESSED WITH lock_ TAKEN. @@ -79,4 +79,4 @@ } // namespace media } // namespace mojo -#endif // SERVICES_MEDIA_FRAMEWORK_MOJO_PUSH_PRODUCER_BASE_H_ +#endif // SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PACKET_PRODUCER_H_
diff --git a/services/media/framework_mojo/mojo_pull_mode_producer.cc b/services/media/framework_mojo/mojo_pull_mode_producer.cc deleted file mode 100644 index f0101b9..0000000 --- a/services/media/framework_mojo/mojo_pull_mode_producer.cc +++ /dev/null
@@ -1,189 +0,0 @@ -// Copyright 2016 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. - -#include "base/logging.h" -#include "services/media/framework_mojo/mojo_pull_mode_producer.h" - -namespace mojo { -namespace media { - -MojoPullModeProducer::MojoPullModeProducer() - : demand_(Demand::kNegative), - pts_(0), - cached_packet_(nullptr) {} - -MojoPullModeProducer::~MojoPullModeProducer() { - base::AutoLock lock(lock_); -} - -void MojoPullModeProducer::AddBinding( - InterfaceRequest<MediaPullModeProducer> producer) { - bindings_.AddBinding(this, producer.Pass()); -} - -void MojoPullModeProducer::GetBuffer(const GetBufferCallback& callback) { - if (!mojo_allocator_.initialized()) { - mojo_allocator_.InitNew(256 * 1024); // TODO(dalesat): Made up! - } - - callback.Run(mojo_allocator_.GetDuplicateHandle()); - - DCHECK(!cached_packet_); - DCHECK(demand_callback_); - demand_callback_(Demand::kPositive); -} - -void MojoPullModeProducer::PullPacket(MediaPacketPtr to_release, - const PullPacketCallback& callback) { - if (to_release) { - // The client has piggy-backed a release on this pull request. - ReleasePacket(to_release.Pass()); - } - - { - base::AutoLock lock(lock_); - - //if (state_ == MediaState::UNPREPARED) { - // The consumer has yet to call GetBuffer. This request will have to wait. - // pending_pulls_.push_back(callback); - // return; - //} - - DCHECK(mojo_allocator_.initialized()); - - // If there are no pending requests, see if we can handle this now. If - // requests are pending, add the callback to the pending queue. - if (!pending_pulls_.empty() || !MaybeHandlePullUnsafe(callback)) { - pending_pulls_.push_back(callback); - } - - DCHECK(!cached_packet_); - } - - DCHECK(demand_callback_); - demand_callback_(Demand::kPositive); -} - -void MojoPullModeProducer::ReleasePacket(MediaPacketPtr to_release) { - { - base::AutoLock lock(lock_); - uint64_t size = to_release->payload ? to_release->payload->length : 0; - void* payload = size == 0 ? nullptr : mojo_allocator_.PtrFromOffset( - to_release->payload->offset); - - for (auto iterator = unreleased_packets_.begin(); true; ++iterator) { - if (iterator == unreleased_packets_.end()) { - DCHECK(false) << "released packet has bad offset and/or size"; - break; - } - - if ((*iterator)->payload() == payload && (*iterator)->size() == size) { - unreleased_packets_.erase(iterator); - break; - } - } - - // TODO(dalesat): What if the allocator has starved? - } - - DCHECK(demand_callback_); - demand_callback_(cached_packet_ ? Demand::kNegative : Demand::kPositive); -} - -PayloadAllocator* MojoPullModeProducer::allocator() { - return mojo_allocator_.initialized() ? &mojo_allocator_ : nullptr; -} - -void MojoPullModeProducer::SetDemandCallback( - const DemandCallback& demand_callback) { - demand_callback_ = demand_callback; -} - -Demand MojoPullModeProducer::SupplyPacket(PacketPtr packet) { - base::AutoLock lock(lock_); - DCHECK(demand_ != Demand::kNegative) << "packet pushed with negative demand"; - - DCHECK(!cached_packet_); - - // If there's no binding on the stream, throw the packet away. This can - // happen if a pull client disconnects unexpectedly. - if (bindings_.size() == 0) { - demand_ = Demand::kNegative; - // TODO(dalesat): More shutdown? - return demand_; - } - - // Accept the packet and handle pending pulls with it. - cached_packet_ = std::move(packet); - - HandlePendingPullsUnsafe(); - - demand_ = cached_packet_ ? Demand::kNegative : Demand::kPositive; - return demand_; -} - -void MojoPullModeProducer::HandlePendingPullsUnsafe() { - lock_.AssertAcquired(); - - while (!pending_pulls_.empty()) { - DCHECK(mojo_allocator_.initialized()); - - if (MaybeHandlePullUnsafe(pending_pulls_.front())) { - pending_pulls_.pop_front(); - } else { - break; - } - } -} - -bool MojoPullModeProducer::MaybeHandlePullUnsafe( - const PullPacketCallback& callback) { - DCHECK(!callback.is_null()); - lock_.AssertAcquired(); - - //if (state_ == MediaState::ENDED) { - // At end-of-stream. Respond with empty end-of-stream packet. - // HandlePullWithPacketUnsafe(callback, Packet::CreateEndOfStream(pts_)); - // return true; - //} - - if (!cached_packet_) { - // Waiting for packet or end-of-stream indication. - return false; - } - - HandlePullWithPacketUnsafe(callback, std::move(cached_packet_)); - return true; -} - -void MojoPullModeProducer::HandlePullWithPacketUnsafe( - const PullPacketCallback& callback, - PacketPtr packet) { - DCHECK(packet); - lock_.AssertAcquired(); - - // TODO(dalesat): Use TaskRunner for this callback. - callback.Run(CreateMediaPacket(packet)); - unreleased_packets_.push_back(std::move(packet)); -} - -MediaPacketPtr MojoPullModeProducer::CreateMediaPacket( - const PacketPtr& packet) { - DCHECK(packet); - - MediaPacketRegionPtr region = MediaPacketRegion::New(); - region->offset = mojo_allocator_.OffsetFromPtr(packet->payload()); - region->length = packet->size(); - - MediaPacketPtr media_packet = MediaPacket::New(); - media_packet->pts = packet->pts(); - media_packet->end_of_stream = packet->end_of_stream(); - media_packet->payload = region.Pass(); - pts_ = packet->pts(); - - return media_packet.Pass(); -} - -} // namespace media -} // namespace mojo
diff --git a/services/media/framework_mojo/mojo_pull_mode_producer.h b/services/media/framework_mojo/mojo_pull_mode_producer.h deleted file mode 100644 index 741458c..0000000 --- a/services/media/framework_mojo/mojo_pull_mode_producer.h +++ /dev/null
@@ -1,93 +0,0 @@ -// Copyright 2016 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. - -#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PULL_MODE_PRODUCER_H_ -#define SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PULL_MODE_PRODUCER_H_ - -#include <deque> - -#include "base/synchronization/lock.h" -#include "mojo/common/binding_set.h" -#include "mojo/services/media/common/interfaces/media_transport.mojom.h" -#include "services/media/framework/models/active_sink.h" -#include "services/media/framework_mojo/mojo_allocator.h" - -namespace mojo { -namespace media { - -// Implements MediaPullModeProducer to forward a stream across mojo. -class MojoPullModeProducer : public MediaPullModeProducer, public ActiveSink { - public: - static std::shared_ptr<MojoPullModeProducer> Create() { - return std::shared_ptr<MojoPullModeProducer>(new MojoPullModeProducer()); - } - - ~MojoPullModeProducer() override; - - // Adds a binding. - void AddBinding(InterfaceRequest<MediaPullModeProducer> producer); - - // MediaPullModeProducer implementation. - void GetBuffer(const GetBufferCallback& callback) override; - - void PullPacket(MediaPacketPtr to_release, - const PullPacketCallback& callback) override; - - void ReleasePacket(MediaPacketPtr to_release) override; - - // ActiveSink implementation. - PayloadAllocator* allocator() override; - - void SetDemandCallback(const DemandCallback& demand_callback) override; - - Demand SupplyPacket(PacketPtr packet) override; - - private: - MojoPullModeProducer(); - - // Handles as many pending pulls as possible. - // MUST BE CALLED WITH lock_ TAKEN. - void HandlePendingPullsUnsafe(); - - // Attempts to handle a pull and indicates whether it was handled. - // MUST BE CALLED WITH lock_ TAKEN. - bool MaybeHandlePullUnsafe(const PullPacketCallback& callback); - - // Runs the callback with a new MediaPacket created from the given Packet. - // MUST BE CALLED WITH lock_ TAKEN. - void HandlePullWithPacketUnsafe(const PullPacketCallback& callback, - PacketPtr packet); - - // Creates a MediaPacket from a Packet. - MediaPacketPtr CreateMediaPacket(const PacketPtr& packet); - - BindingSet<MediaPullModeProducer> bindings_; - - DemandCallback demand_callback_; - - // Allocates from the shared buffer. - MojoAllocator mojo_allocator_; - - mutable base::Lock lock_; - // THE FIELDS BELOW SHOULD ONLY BE ACCESSED WITH lock_ TAKEN. - Demand demand_; - int64_t pts_; - - // pending_pulls_ contains the callbacks for the pull requests that have yet - // to be satisfied. unreleased_packets_ contains the packets that have been - // delivered via pull but have not yet been released. cached_packet_ is a - // packet waiting for a pull (we keep one ready so we can be preparing a - // packet between pulls). If cached_packet_ isn't nullptr, pending_pulls_ - // should be empty. We signal positive demand when cached_packet_ is nullptr - // and negative demand when it isn't. - std::deque<PullPacketCallback> pending_pulls_; - std::deque<PacketPtr> unreleased_packets_; - PacketPtr cached_packet_; - // THE FIELDS ABOVE SHOULD ONLY BE ACCESSED WITH lock_ TAKEN. -}; - -} // namespace media -} // namespace mojo - -#endif // SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_PULL_MODE_PRODUCER_H_
diff --git a/services/media/framework_mojo/mojo_reader.h b/services/media/framework_mojo/mojo_reader.h index 177dec6..45aca80 100644 --- a/services/media/framework_mojo/mojo_reader.h +++ b/services/media/framework_mojo/mojo_reader.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_PARTS_MOJO_READER_H_ -#define SERVICES_MEDIA_FRAMEWORK_MOJO_PARTS_MOJO_READER_H_ +#ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_READER_H_ +#define SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_READER_H_ #include <atomic>