Use MIDIMessageQueue/IsValidWebMIDIData for MIDI byte stream validation

media/midi/midi_manager.cc

 // Copyright (c) 2013 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 "media/midi/midi_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
+#include "media/midi/midi_message_queue.h"
 
 namespace media {
 
 #if !defined(OS_MACOSX)
 // TODO(crogers): implement MIDIManager for other platforms.
 MIDIManager* MIDIManager::Create() {
   return NULL;
 }
 #endif
 
@@ skipping 18 matching lines @@
 
 void MIDIManager::EndSession(MIDIManagerClient* client) {
   base::AutoLock auto_lock(clients_lock_);
   ClientList::iterator i = clients_.find(client);
   if (i != clients_.end())
     clients_.erase(i);
 }
 
 void MIDIManager::AddInputPort(const MIDIPortInfo& info) {
   input_ports_.push_back(info);
+  input_message_queues_.push_back(new MIDIMessageQueue(true));
 }
 
 void MIDIManager::AddOutputPort(const MIDIPortInfo& info) {
   output_ports_.push_back(info);
 }
 
 void MIDIManager::ReceiveMIDIData(
     uint32 port_index,
     const uint8* data,
     size_t length,
     double timestamp) {
   base::AutoLock auto_lock(clients_lock_);
 

[Takashi Toyoshima, 2013/11/12 21:59:36]

This message queue introduces two additional memory copies.
Can we move this queue implementation to MIDIHost?
In MIDIHost, we originally have a buffer for sending it as an IPC. We may want
to replace it with this queue implementation. It saves memory usage and copy
operation.

[yukawa, 2013/11/14 14:55:31]

Thank you for the suggestion. I moved MIDIMessageQueue into MIDIHost.

-  for (ClientList::iterator i = clients_.begin(); i != clients_.end(); ++i)
-    (*i)->ReceiveMIDIData(port_index, data, length, timestamp);
+  input_message_queues_[port_index]->Add(data, length);
+  std::vector<uint8> message;
+  while (true) {
+    input_message_queues_[port_index]->Get(&message);
+    if (message.empty())
+      return;
+    for (ClientList::iterator i = clients_.begin(); i != clients_.end(); ++i)
+      (*i)->ReceiveMIDIData(port_index, &message[0], message.size(), timestamp);
+  }
 }
 
 bool MIDIManager::CurrentlyOnMIDISendThread() {
   return send_thread_->message_loop() == base::MessageLoop::current();
 }
 
 void MIDIManager::DispatchSendMIDIData(MIDIManagerClient* client,
                                        uint32 port_index,
                                        const std::vector<uint8>& data,
                                        double timestamp) {
   // Lazily create the thread when first needed.
   if (!send_thread_) {
     send_thread_.reset(new base::Thread("MIDISendThread"));
     send_thread_->Start();
     send_message_loop_ = send_thread_->message_loop_proxy();
   }
 
   send_message_loop_->PostTask(
      FROM_HERE,
      base::Bind(&MIDIManager::SendMIDIData, base::Unretained(this),
          client, port_index, data, timestamp));
 }
 
 }  // namespace media