Make the timestamp unroll offset consistent accross PES pids.

media/formats/mp2t/mp2t_stream_parser.cc

 // Copyright 2014 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/formats/mp2t/mp2t_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 199 matching lines @@
   // stream parser already involves the end of the current segment.
   segment_started_ = false;
 
   // Remove any bytes left in the TS buffer.
   // (i.e. any partial TS packet => less than 188 bytes).
   ts_byte_queue_.Reset();
 
   // Reset the selected PIDs.
   selected_audio_pid_ = -1;
   selected_video_pid_ = -1;
+
+  // Reset the timestamp unroller.
+  timestamp_unroller_.Reset();
 }
 
 bool Mp2tStreamParser::Parse(const uint8* buf, int size) {
   DVLOG(1) << "Mp2tStreamParser::Parse size=" << size;
 
   // Add the data to the parser state.
   ts_byte_queue_.Push(buf, size);
 
   while (true) {
     const uint8* ts_buffer;
@@ skipping 119 matching lines @@
                        pes_pid),
             sbr_in_mimetype_));
     is_audio = true;
   } else {
     return;
   }
 
   // Create the PES state here.
   DVLOG(1) << "Create a new PES state";
   scoped_ptr<TsSection> pes_section_parser(
-      new TsSectionPes(es_parser.Pass()));
+      new TsSectionPes(es_parser.Pass(), &timestamp_unroller_));
   PidState::PidType pid_type =
       is_audio ? PidState::kPidAudioPes : PidState::kPidVideoPes;
   scoped_ptr<PidState> pes_pid_state(
       new PidState(pes_pid, pid_type, pes_section_parser.Pass()));
   pids_.insert(std::pair<int, PidState*>(pes_pid, pes_pid_state.release()));
 
   // A new PES pid has been added, the PID filter might change.
   UpdatePidFilter();
 }
 
@@ skipping 142 matching lines @@
   DVLOG(LOG_LEVEL_ES)
       << "OnEmitAudioBuffer: "
       << " size="
       << stream_parser_buffer->data_size()
       << " dts="
       << stream_parser_buffer->GetDecodeTimestamp().InMilliseconds()
       << " pts="
       << stream_parser_buffer->timestamp().InMilliseconds()
       << " dur="
       << stream_parser_buffer->duration().InMilliseconds();
-  stream_parser_buffer->set_timestamp(
-      stream_parser_buffer->timestamp() - time_offset_);
-  stream_parser_buffer->SetDecodeTimestamp(
-      stream_parser_buffer->GetDecodeTimestamp() - time_offset_);
 
   // Ignore the incoming buffer if it is not associated with any config.
   if (buffer_queue_chain_.empty()) {
     NOTREACHED() << "Cannot provide buffers before configs";
     return;
   }
 
   buffer_queue_chain_.back().audio_queue.push_back(stream_parser_buffer);
 }
 
 void Mp2tStreamParser::OnEmitVideoBuffer(
     int pes_pid,
     scoped_refptr<StreamParserBuffer> stream_parser_buffer) {
   DCHECK_EQ(pes_pid, selected_video_pid_);
 
   DVLOG(LOG_LEVEL_ES)
       << "OnEmitVideoBuffer"
       << " size="
       << stream_parser_buffer->data_size()
       << " dts="
       << stream_parser_buffer->GetDecodeTimestamp().InMilliseconds()
       << " pts="
       << stream_parser_buffer->timestamp().InMilliseconds()
       << " dur="
       << stream_parser_buffer->duration().InMilliseconds()
       << " IsKeyframe="
       << stream_parser_buffer->IsKeyframe();
-  stream_parser_buffer->set_timestamp(
-      stream_parser_buffer->timestamp() - time_offset_);
-  stream_parser_buffer->SetDecodeTimestamp(
-      stream_parser_buffer->GetDecodeTimestamp() - time_offset_);
 
   // Ignore the incoming buffer if it is not associated with any config.
   if (buffer_queue_chain_.empty()) {
     NOTREACHED() << "Cannot provide buffers before configs";
     return;
   }
 
   buffer_queue_chain_.back().video_queue.push_back(stream_parser_buffer);
 }
 
@@ skipping 14 matching lines @@
       buffer_queue_chain_.back().video_config;
 
   // Do not have all the configs, need more data.
   if (selected_audio_pid_ >= 0 && !last_audio_config.IsValidConfig())
     return true;
   if (selected_video_pid_ >= 0 && !last_video_config.IsValidConfig())
     return true;
 
   // Buffer emission.
   while (!buffer_queue_chain_.empty()) {
+

[damienv1, 2014/09/05 23:02:20]

Remove line.

     // Start a segment if needed.
     if (!segment_started_) {
       DVLOG(1) << "Starting a new segment";
       segment_started_ = true;
       new_segment_cb_.Run();
     }
 
     // Update the audio and video config if needed.
     BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
     if (!queue_with_config.is_config_sent) {
@@ skipping 22 matching lines @@
   // so that buffers with the same config can be added later on.
   BufferQueueWithConfig queue_with_config(
       true, last_audio_config, last_video_config);
   buffer_queue_chain_.push_back(queue_with_config);
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media