Motown: Improvements to packet definition

services/media/framework/parts/lpcm_reformatter.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/parts/lpcm_reformatter.h"
 
 namespace mojo {
 namespace media {
 
@@ skipping 231 matching lines @@
     PayloadAllocator* allocator,
     PacketPtr* output) {
   DCHECK(input);
   DCHECK(allocator);
   DCHECK(output);
 
   uint64_t in_size = input->size();
   if (in_size == 0) {
     // Zero-sized input packet. Make a copy.
     *output = Packet::Create(
-        input->presentation_time(),
-        input->duration(),
+        input->pts(),
         input->end_of_stream(),
         0,
         nullptr,
         nullptr);
     return true;
   }
 
-  size_t frame_count = input->duration();
+  size_t frame_count = in_type_.frame_count(in_size);
   uint64_t out_size = out_type_.min_buffer_size(frame_count);
 
   void* buffer = allocator->AllocatePayloadBuffer(out_size);
   if (buffer == nullptr) {
     LOG(WARNING) << "lpcm reformatter starved for buffers";
     // Starved for buffer space. Can't process now.
     *output = nullptr;
     return false;
   }
 
   const TIn* in_channel = static_cast<const TIn*>(input->payload());
   TOut* out_channel = static_cast<TOut*>(buffer);
 
   for (uint32_t channel = 0; channel < in_type_.channels(); channel++) {
     const TIn* in_sample = in_channel;
     TOut* out_sample = out_channel;
     for (size_t sample = 0; sample < frame_count; sample++) {
       CopySample(out_sample, in_sample);
       in_sample += in_type_.channels();
       out_sample += out_type_.channels();
     }
     ++in_channel;
     ++out_channel;
   }
 
   *output = Packet::Create(
-      input->presentation_time(),
-      frame_count,
+      input->pts(),
       input->end_of_stream(),
       out_size,
       buffer,
       allocator);
 
   return true;
 }
 
 }  // namespace media
 }  // namespace mojo