Motown: Ffmpeg video decoder

services/media/framework_mojo/mojo_producer.cc

 // 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/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "services/media/framework_mojo/mojo_producer.h"
 
 namespace mojo {
 namespace media {
 
 MojoProducer::MojoProducer() {
   task_runner_ = base::MessageLoop::current()->task_runner();
   DCHECK(task_runner_);
 }
 
 MojoProducer::~MojoProducer() {
   base::AutoLock lock(lock_);
 }
 
 void MojoProducer::AddBinding(InterfaceRequest<MediaProducer> producer) {
   bindings_.AddBinding(this, producer.Pass());
 }
 
-void MojoProducer::PrimeConnection(const FlushConnectionCallback& callback) {
+void MojoProducer::PrimeConnection(const PrimeConnectionCallback& callback) {
   Demand demand;
 
   if (consumer_.is_bound()) {
     base::AutoLock lock(lock_);
-    max_pushes_outstanding_ = 10;  // TODO(dalesat): Made up!
+    max_pushes_outstanding_ = 3;  // TODO(dalesat): Made up!
     demand = current_pushes_outstanding_ < max_pushes_outstanding_
                  ? Demand::kPositive
                  : Demand::kNegative;
   } else {
     demand = Demand::kNeutral;
     if (!mojo_allocator_.initialized()) {
-      mojo_allocator_.InitNew(256 * 1024);  // TODO(dalesat): Made up!
+      mojo_allocator_.InitNew(2048 * 1024);  // TODO(dalesat): Made up!
     }
   }
 
   DCHECK(demand_callback_);
   demand_callback_(demand);
   SetState(MediaState::PAUSED);
 
   if (consumer_.is_bound()) {
     consumer_->Prime([this, callback]() { callback.Run(); });
   } else {
     callback.Run();
   }
 }
 
 void MojoProducer::FlushConnection(const FlushConnectionCallback& callback) {
   {
     base::AutoLock lock(lock_);
     max_pushes_outstanding_ = 0;
   }
 
   DCHECK(demand_callback_);
   demand_callback_(Demand::kNegative);
 
-  DCHECK(consumer_.is_bound());
-  consumer_->Flush(callback);
+  if (consumer_.is_bound()) {
+    consumer_->Flush(callback);
+  } else {
+    callback.Run();
+  }
+
   first_pts_since_flush_ = Packet::kUnknownPts;
   end_of_stream_ = false;
 }
 
 void MojoProducer::SetStatusCallback(const StatusCallback& callback) {
   status_callback_ = callback;
 }
 
 int64_t MojoProducer::GetFirstPtsSinceFlush() {
   return first_pts_since_flush_;
 }
 
 PayloadAllocator* MojoProducer::allocator() {
   return &mojo_allocator_;
 }
 
 void MojoProducer::SetDemandCallback(const DemandCallback& demand_callback) {
   demand_callback_ = demand_callback;
 }
 
 Demand MojoProducer::SupplyPacket(PacketPtr packet) {
   DCHECK(packet);
 
   if (first_pts_since_flush_ == Packet::kUnknownPts) {
     first_pts_since_flush_ = packet->pts();
   }
 
-  // If we're no longer connected, throw the packet away.
+  // If we're not connected, throw the packet away.
   if (!consumer_.is_bound()) {
+    if (packet->end_of_stream()) {
+      {
+        base::AutoLock lock(lock_);
+        end_of_stream_ = true;
+      }
+      SetState(MediaState::ENDED);
+      return Demand::kNegative;
+    }
+
     return Demand::kNeutral;
   }
 
   Demand demand;
 
   {
     base::AutoLock lock(lock_);
     DCHECK(current_pushes_outstanding_ < max_pushes_outstanding_);
     DCHECK(!end_of_stream_) << "packet pushed after end-of-stream";
 
@@ skipping 19 matching lines @@
   return demand;
 }
 
 void MojoProducer::Connect(InterfaceHandle<MediaConsumer> consumer,
                            const ConnectCallback& callback) {
   DCHECK(consumer);
 
   consumer_ = MediaConsumerPtr::Create(std::move(consumer));
 
   if (!mojo_allocator_.initialized()) {
-    mojo_allocator_.InitNew(256 * 1024);  // TODO(dalesat): Made up!
+    mojo_allocator_.InitNew(2048 * 1024);  // TODO(dalesat): Made up!
   }
 
   consumer_->SetBuffer(mojo_allocator_.GetDuplicateHandle(),
                        [callback]() { callback.Run(); });
 }
 
 void MojoProducer::Disconnect() {
   DCHECK(demand_callback_);
   demand_callback_(Demand::kNegative);
   SetState(MediaState::UNPREPARED);
@@ skipping 45 matching lines @@
   MediaPacketPtr media_packet = MediaPacket::New();
   media_packet->pts = packet->pts();
   media_packet->end_of_stream = packet->end_of_stream();
   media_packet->payload = region.Pass();
 
   return media_packet.Pass();
 }
 
 }  // namespace media
 }  // namespace mojo