Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer

mojo/services/media/common/cpp/video_renderer.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 <limits>
 
 #include "mojo/services/media/common/cpp/timeline.h"
 #include "mojo/services/media/common/cpp/video_renderer.h"
 
 namespace mojo {
@@ skipping 65 matching lines @@
 
 void VideoRenderer::SetMediaType(MediaTypePtr media_type) {
   MOJO_DCHECK(media_type);
   MOJO_DCHECK(media_type->details);
   const VideoMediaTypeDetailsPtr& details = media_type->details->get_video();
   MOJO_DCHECK(details);
 
   converter_.SetMediaType(media_type);
 }
 
-void VideoRenderer::GetConsumer(
-    InterfaceRequest<MediaConsumer> consumer_request) {
+void VideoRenderer::GetPacketConsumer(
+    InterfaceRequest<MediaPacketConsumer> consumer_request) {
   consumer_binding_.Bind(consumer_request.Pass());
 }
 
 void VideoRenderer::GetTimelineControlPoint(
     InterfaceRequest<MediaTimelineControlPoint> control_point_request) {
   control_point_binding_.Bind(control_point_request.Pass());
 }
 
 void VideoRenderer::SetBuffer(ScopedSharedBufferHandle buffer,
                               const SetBufferCallback& callback) {
   shared_buffer_.InitFromHandle(buffer.Pass());
   callback.Run();
 }
 
 void VideoRenderer::SendPacket(MediaPacketPtr packet,
                                const SendPacketCallback& callback) {
   MOJO_DCHECK(packet);
   if (packet->end_of_stream) {
     end_of_stream_pts_ = packet->pts;
   }
 
   // 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;
   }
 
   packet_queue_.emplace(packet.Pass(), callback);
 }
 
 void VideoRenderer::Prime(const PrimeCallback& callback) {
   callback.Run();
 }
 
@@ skipping 109 matching lines @@
 
 VideoRenderer::PacketAndCallback::PacketAndCallback(
     MediaPacketPtr packet,
     const SendPacketCallback& callback)
     : packet_(packet.Pass()), callback_(callback) {
   MOJO_DCHECK(packet_);
   MOJO_DCHECK(!callback.is_null());
 }
 
 VideoRenderer::PacketAndCallback::~PacketAndCallback() {
-  callback_.Run(MediaConsumer::SendResult::CONSUMED);
+  callback_.Run(MediaPacketConsumer::SendResult::CONSUMED);
 }
 
 }  // namespace media
 }  // namespace mojo