Motown: Improvements to packet definition

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"
 
@@ skipping 38 matching lines @@
   {
     base::AutoLock lock(lock_);
     max_pushes_outstanding_ = 0;
   }
 
   DCHECK(demand_callback_);
   demand_callback_(Demand::kNegative);
 
   DCHECK(consumer_.is_bound());
   consumer_->Flush(callback);
-  first_presentation_time_since_flush_ = Packet::kUnknownPresentationTime;
+  first_pts_since_flush_ = Packet::kUnknownPts;
   end_of_stream_= false;
 }
 
 void MojoProducer::SetStatusCallback(
     const StatusCallback& callback) {
   status_callback_ = callback;
 }
 
-int64_t MojoProducer::GetFirstPresentationTimeSinceFlush() {
-  return first_presentation_time_since_flush_;
+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_presentation_time_since_flush_ ==
-      Packet::kUnknownPresentationTime) {
-    first_presentation_time_since_flush_ = packet->presentation_time();
+  if (first_pts_since_flush_ == Packet::kUnknownPts) {
+    first_pts_since_flush_ = packet->pts();
   }
 
   // If we're no longer connected, throw the packet away.
   if (!consumer_.is_bound()) {
     SetState(MediaState::UNPREPARED);
     // TODO(dalesat): More shutdown?
     return Demand::kNegative;
   }
 
   Demand demand;
@@ skipping 89 matching lines @@
 MediaPacketPtr MojoProducer::CreateMediaPacket(
     const PacketPtr& packet) {
   DCHECK(packet);
 
   MediaPacketRegionPtr region = MediaPacketRegion::New();
   region->offset = packet->size() == 0 ? 0 :
       mojo_allocator_.OffsetFromPtr(packet->payload());
   region->length = packet->size();
 
   MediaPacketPtr media_packet = MediaPacket::New();
-  media_packet->pts = packet->presentation_time();
-  media_packet->duration = packet->duration();
+  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