| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ | 5 #ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ |
| 6 #define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ | 6 #define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 struct Stream { | 59 struct Stream { |
| 60 Stream(); | 60 Stream(); |
| 61 ~Stream(); | 61 ~Stream(); |
| 62 // TODO(dalesat): Have the sink enlist the decoder. | 62 // TODO(dalesat): Have the sink enlist the decoder. |
| 63 MediaTypeConverterPtr decoder_; | 63 MediaTypeConverterPtr decoder_; |
| 64 MediaSinkPtr sink_; | 64 MediaSinkPtr sink_; |
| 65 // The following fields are just temporaries used to solve lambda capture | 65 // The following fields are just temporaries used to solve lambda capture |
| 66 // problems. | 66 // problems. |
| 67 MediaProducerPtr encoded_producer_; | 67 MediaPacketProducerPtr encoded_producer_; |
| 68 MediaProducerPtr decoded_producer_; | 68 MediaPacketProducerPtr decoded_producer_; |
| 69 InterfaceHandle<MediaRenderer> renderer_; | 69 InterfaceHandle<MediaRenderer> renderer_; |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 MediaPlayerImpl(InterfaceHandle<SeekingReader> reader, | 72 MediaPlayerImpl(InterfaceHandle<SeekingReader> reader, |
| 73 InterfaceHandle<MediaRenderer> audio_renderer, | 73 InterfaceHandle<MediaRenderer> audio_renderer, |
| 74 InterfaceHandle<MediaRenderer> video_renderer, | 74 InterfaceHandle<MediaRenderer> video_renderer, |
| 75 InterfaceRequest<MediaPlayer> request, | 75 InterfaceRequest<MediaPlayer> request, |
| 76 MediaFactoryService* owner); | 76 MediaFactoryService* owner); |
| 77 | 77 |
| 78 // Takes action based on current state. | 78 // Takes action based on current state. |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 // The following fields are just temporaries used to solve lambda capture | 140 // The following fields are just temporaries used to solve lambda capture |
| 141 // problems. | 141 // problems. |
| 142 InterfaceHandle<MediaRenderer> audio_renderer_; | 142 InterfaceHandle<MediaRenderer> audio_renderer_; |
| 143 InterfaceHandle<MediaRenderer> video_renderer_; | 143 InterfaceHandle<MediaRenderer> video_renderer_; |
| 144 }; | 144 }; |
| 145 | 145 |
| 146 } // namespace media | 146 } // namespace media |
| 147 } // namespace mojo | 147 } // namespace mojo |
| 148 | 148 |
| 149 #endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ | 149 #endif // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_PLAYER_IMPL_H_ |
| OLD | NEW |