Motown: Improvements to packet definition

services/media/framework_mojo/mojo_pull_mode_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/logging.h"
 #include "services/media/framework_mojo/mojo_pull_mode_producer.h"
 
 namespace mojo {
 namespace media {
 
 MojoPullModeProducer::MojoPullModeProducer() :
     state_(MediaState::UNPREPARED),
     demand_(Demand::kNegative),
-    presentation_time_(0),
+    pts_(0),
     cached_packet_(nullptr) {}
 
 MojoPullModeProducer::~MojoPullModeProducer() {
   base::AutoLock lock(lock_);
 }
 
 void MojoPullModeProducer::AddBinding(
     InterfaceRequest<MediaPullModeProducer> producer) {
   bindings_.AddBinding(this, producer.Pass());
 }
@@ skipping 125 matching lines @@
 
 bool MojoPullModeProducer::MaybeHandlePullUnsafe(
     const PullPacketCallback& callback) {
   DCHECK(!callback.is_null());
   lock_.AssertAcquired();
 
   if (state_ == MediaState::ENDED) {
     // At end-of-stream. Respond with empty end-of-stream packet.
     HandlePullWithPacketUnsafe(
         callback,
-        Packet::CreateEndOfStream(presentation_time_));
+        Packet::CreateEndOfStream(pts_));
     return true;
   }
 
   if (!cached_packet_) {
     // Waiting for packet or end-of-stream indication.
     return false;
   }
 
   HandlePullWithPacketUnsafe(callback, std::move(cached_packet_));
   return true;
@@ skipping 12 matching lines @@
 
 MediaPacketPtr MojoPullModeProducer::CreateMediaPacket(
     const PacketPtr& packet) {
   DCHECK(packet);
 
   MediaPacketRegionPtr region = MediaPacketRegion::New();
   region->offset = 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();
-  presentation_time_ = packet->presentation_time() + packet->duration();
+  pts_ = packet->pts();
 
   return media_packet.Pass();
 }
 
 } // namespace media
 } // namespace mojo