| 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 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "services/media/framework_mojo/mojo_consumer.h" | 8 #include "services/media/framework_mojo/mojo_packet_consumer.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| 11 namespace media { | 11 namespace media { |
| 12 | 12 |
| 13 void MojoConsumerMediaConsumer::Flush(const FlushCallback& callback) { | 13 void MojoPacketConsumerMediaPacketConsumer::Flush( |
| 14 MediaConsumerFlush(callback); | 14 const FlushCallback& callback) { |
| 15 MediaPacketConsumerFlush(callback); |
| 15 } | 16 } |
| 16 | 17 |
| 17 MojoConsumer::MojoConsumer() {} | 18 MojoPacketConsumer::MojoPacketConsumer() {} |
| 18 | 19 |
| 19 MojoConsumer::~MojoConsumer() {} | 20 MojoPacketConsumer::~MojoPacketConsumer() {} |
| 20 | 21 |
| 21 void MojoConsumer::AddBinding(InterfaceRequest<MediaConsumer> consumer) { | 22 void MojoPacketConsumer::AddBinding( |
| 23 InterfaceRequest<MediaPacketConsumer> consumer) { |
| 22 bindings_.AddBinding(this, consumer.Pass()); | 24 bindings_.AddBinding(this, consumer.Pass()); |
| 23 DCHECK(base::MessageLoop::current()); | 25 DCHECK(base::MessageLoop::current()); |
| 24 task_runner_ = base::MessageLoop::current()->task_runner(); | 26 task_runner_ = base::MessageLoop::current()->task_runner(); |
| 25 DCHECK(task_runner_); | 27 DCHECK(task_runner_); |
| 26 } | 28 } |
| 27 | 29 |
| 28 void MojoConsumer::SetPrimeRequestedCallback( | 30 void MojoPacketConsumer::SetPrimeRequestedCallback( |
| 29 const PrimeRequestedCallback& callback) { | 31 const PrimeRequestedCallback& callback) { |
| 30 prime_requested_callback_ = callback; | 32 prime_requested_callback_ = callback; |
| 31 } | 33 } |
| 32 | 34 |
| 33 void MojoConsumer::SetFlushRequestedCallback( | 35 void MojoPacketConsumer::SetFlushRequestedCallback( |
| 34 const FlushRequestedCallback& callback) { | 36 const FlushRequestedCallback& callback) { |
| 35 flush_requested_callback_ = callback; | 37 flush_requested_callback_ = callback; |
| 36 } | 38 } |
| 37 | 39 |
| 38 void MojoConsumer::SetBuffer(ScopedSharedBufferHandle buffer, | 40 void MojoPacketConsumer::SetBuffer(ScopedSharedBufferHandle buffer, |
| 39 const SetBufferCallback& callback) { | 41 const SetBufferCallback& callback) { |
| 40 buffer_.InitFromHandle(buffer.Pass()); | 42 buffer_.InitFromHandle(buffer.Pass()); |
| 41 callback.Run(); | 43 callback.Run(); |
| 42 } | 44 } |
| 43 | 45 |
| 44 void MojoConsumer::SendPacket(MediaPacketPtr media_packet, | 46 void MojoPacketConsumer::SendPacket(MediaPacketPtr media_packet, |
| 45 const SendPacketCallback& callback) { | 47 const SendPacketCallback& callback) { |
| 46 DCHECK(media_packet); | 48 DCHECK(media_packet); |
| 47 DCHECK(supply_callback_); | 49 DCHECK(supply_callback_); |
| 48 supply_callback_( | 50 supply_callback_( |
| 49 PacketImpl::Create(media_packet.Pass(), callback, task_runner_, buffer_)); | 51 PacketImpl::Create(media_packet.Pass(), callback, task_runner_, buffer_)); |
| 50 } | 52 } |
| 51 | 53 |
| 52 void MojoConsumer::Prime(const PrimeCallback& callback) { | 54 void MojoPacketConsumer::Prime(const PrimeCallback& callback) { |
| 53 if (prime_requested_callback_) { | 55 if (prime_requested_callback_) { |
| 54 prime_requested_callback_(callback); | 56 prime_requested_callback_(callback); |
| 55 } else { | 57 } else { |
| 56 LOG(WARNING) << "prime requested but no callback registered"; | 58 LOG(WARNING) << "prime requested but no callback registered"; |
| 57 callback.Run(); | 59 callback.Run(); |
| 58 } | 60 } |
| 59 } | 61 } |
| 60 | 62 |
| 61 void MojoConsumer::MediaConsumerFlush(const FlushCallback& callback) { | 63 void MojoPacketConsumer::MediaPacketConsumerFlush( |
| 64 const FlushCallback& callback) { |
| 62 if (flush_requested_callback_) { | 65 if (flush_requested_callback_) { |
| 63 flush_requested_callback_(callback); | 66 flush_requested_callback_(callback); |
| 64 } else { | 67 } else { |
| 65 LOG(WARNING) << "flush requested but no callback registered"; | 68 LOG(WARNING) << "flush requested but no callback registered"; |
| 66 callback.Run(); | 69 callback.Run(); |
| 67 } | 70 } |
| 68 } | 71 } |
| 69 | 72 |
| 70 bool MojoConsumer::can_accept_allocator() const { | 73 bool MojoPacketConsumer::can_accept_allocator() const { |
| 71 return false; | 74 return false; |
| 72 } | 75 } |
| 73 | 76 |
| 74 void MojoConsumer::set_allocator(PayloadAllocator* allocator) { | 77 void MojoPacketConsumer::set_allocator(PayloadAllocator* allocator) { |
| 75 LOG(ERROR) << "set_allocator called on MojoConsumer"; | 78 LOG(ERROR) << "set_allocator called on MojoPacketConsumer"; |
| 76 } | 79 } |
| 77 | 80 |
| 78 void MojoConsumer::SetSupplyCallback(const SupplyCallback& supply_callback) { | 81 void MojoPacketConsumer::SetSupplyCallback( |
| 82 const SupplyCallback& supply_callback) { |
| 79 supply_callback_ = supply_callback; | 83 supply_callback_ = supply_callback; |
| 80 } | 84 } |
| 81 | 85 |
| 82 void MojoConsumer::SetDownstreamDemand(Demand demand) {} | 86 void MojoPacketConsumer::SetDownstreamDemand(Demand demand) {} |
| 83 | 87 |
| 84 MojoConsumer::PacketImpl::PacketImpl( | 88 MojoPacketConsumer::PacketImpl::PacketImpl( |
| 85 MediaPacketPtr media_packet, | 89 MediaPacketPtr media_packet, |
| 86 const SendPacketCallback& callback, | 90 const SendPacketCallback& callback, |
| 87 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 91 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
| 88 const MappedSharedBuffer& buffer) | 92 const MappedSharedBuffer& buffer) |
| 89 : Packet(media_packet->pts, | 93 : Packet(media_packet->pts, |
| 90 media_packet->end_of_stream, | 94 media_packet->end_of_stream, |
| 91 media_packet->payload->length, | 95 media_packet->payload->length, |
| 92 media_packet->payload->length == 0 | 96 media_packet->payload->length == 0 |
| 93 ? nullptr | 97 ? nullptr |
| 94 : buffer.PtrFromOffset(media_packet->payload->offset)), | 98 : buffer.PtrFromOffset(media_packet->payload->offset)), |
| 95 media_packet_(media_packet.Pass()), | 99 media_packet_(media_packet.Pass()), |
| 96 callback_(callback), | 100 callback_(callback), |
| 97 task_runner_(task_runner) {} | 101 task_runner_(task_runner) {} |
| 98 | 102 |
| 99 MojoConsumer::PacketImpl::~PacketImpl() {} | 103 MojoPacketConsumer::PacketImpl::~PacketImpl() {} |
| 100 | 104 |
| 101 // static | 105 // static |
| 102 void MojoConsumer::PacketImpl::RunCallback(const SendPacketCallback& callback) { | 106 void MojoPacketConsumer::PacketImpl::RunCallback( |
| 103 callback.Run(MediaConsumer::SendResult::CONSUMED); | 107 const SendPacketCallback& callback) { |
| 108 callback.Run(MediaPacketConsumer::SendResult::CONSUMED); |
| 104 } | 109 } |
| 105 | 110 |
| 106 void MojoConsumer::PacketImpl::Release() { | 111 void MojoPacketConsumer::PacketImpl::Release() { |
| 107 task_runner_->PostTask(FROM_HERE, base::Bind(&RunCallback, callback_)); | 112 task_runner_->PostTask(FROM_HERE, base::Bind(&RunCallback, callback_)); |
| 108 delete this; | 113 delete this; |
| 109 } | 114 } |
| 110 | 115 |
| 111 } // namespace media | 116 } // namespace media |
| 112 } // namespace mojo | 117 } // namespace mojo |
| OLD | NEW |