Mpeg2 TS - Fail when no valid timestamp in the ADTS parser.

media/formats/mp2t/es_parser_adts.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/es_parser_adts.h"
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 133 matching lines @@
     if (!UpdateAudioConfiguration(adts_frame.data))
       return false;
 
     // Get the PTS & the duration of this access unit.
     while (!pts_list_.empty() &&
            pts_list_.front().first <= adts_frame.queue_offset) {
       audio_timestamp_helper_->SetBaseTimestamp(pts_list_.front().second);
       pts_list_.pop_front();
     }
 
+    if (audio_timestamp_helper_->base_timestamp() == kNoTimestamp()) {
+      DVLOG(1) << "Audio frame with unknown timestamp";
+      return false;
+    }
     base::TimeDelta current_pts = audio_timestamp_helper_->GetTimestamp();

[wolenetz, 2014/08/14 18:46:29]

nit: I prefer a blank line between } and non-}.

[damienv1, 2014/08/14 22:31:22]

I usually put code in logical groups: here we really can call GetTimestamp only
because we check previously that base_timestamp() is valid. So to me this
belongs to the same logical group.

Let me know if this is a strong preference, thanks.

[wolenetz, 2014/08/14 23:13:53]

Acknowledged.

     base::TimeDelta frame_duration =
         audio_timestamp_helper_->GetFrameDuration(kSamplesPerAACFrame);
 
     // Emit an audio frame.
     bool is_key_frame = true;
 
     // TODO(wolenetz/acolwell): Validate and use a common cross-parser TrackId
     // type and allow multiple audio tracks. See https://crbug.com/341581.
     scoped_refptr<StreamParserBuffer> stream_parser_buffer =
         StreamParserBuffer::CopyFrom(
@@ skipping 75 matching lines @@
       extra_data,
       arraysize(extra_data),
       false);
 
   if (!audio_decoder_config.Matches(last_audio_decoder_config_)) {
     DVLOG(1) << "Sampling frequency: " << samples_per_second;
     DVLOG(1) << "Extended sampling frequency: " << extended_samples_per_second;
     DVLOG(1) << "Channel config: " << channel_configuration;
     DVLOG(1) << "Adts profile: " << adts_profile;
     // Reset the timestamp helper to use a new time scale.
-    if (audio_timestamp_helper_) {
+    if (audio_timestamp_helper_ &&
+        audio_timestamp_helper_->base_timestamp() != kNoTimestamp()) {
       base::TimeDelta base_timestamp = audio_timestamp_helper_->GetTimestamp();
       audio_timestamp_helper_.reset(
         new AudioTimestampHelper(samples_per_second));
       audio_timestamp_helper_->SetBaseTimestamp(base_timestamp);
     } else {
       audio_timestamp_helper_.reset(
           new AudioTimestampHelper(samples_per_second));
     }
     // Audio config notification.
     last_audio_decoder_config_ = audio_decoder_config;
     new_audio_config_cb_.Run(audio_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media