Return an error on Multiple AUs in a PES.

media/mp2t/es_parser_h264.cc

 // Copyright 2013 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/mp2t/es_parser_h264.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
 #include "media/base/buffers.h"
@@ skipping 198 matching lines @@
     // Retrieve the NAL type.
     int nal_header = raw_es[current_nal_pos_];
     int forbidden_zero_bit = (nal_header >> 7) & 0x1;
     RCHECK(forbidden_zero_bit == 0);
     NalUnitType nal_unit_type = static_cast<NalUnitType>(nal_header & 0x1f);
     DVLOG(LOG_LEVEL_ES) << "nal: offset=" << es_pos_
                         << " type=" << nal_unit_type;
 
     // Emit a frame if needed.
     if (nal_unit_type == kNalUnitTypeAUD)
-      EmitFrameIfNeeded(es_pos_);
+      RCHECK(EmitFrameIfNeeded(es_pos_));
 
     // Skip the syncword.
     es_pos_ += syncword_length;
   }
 
   return true;
 }
 
-void EsParserH264::EmitFrameIfNeeded(int next_aud_pos) {
+bool EsParserH264::EmitFrameIfNeeded(int next_aud_pos) {
   // There is no current frame: start a new frame.
   if (current_access_unit_pos_ < 0) {
     StartFrame(next_aud_pos);
-    return;
+    return true;
   }
 
   // Get the access unit timing info.
-  TimingDesc current_timing_desc;
+  TimingDesc current_timing_desc = {kNoTimestamp(), kNoTimestamp()};
+

[damienv1, 2014/01/16 01:05:54]

nit: blank line not needed (otherwise the previous comment "Get the access unit
timing info" seems to apply only to the next line).

   while (!timing_desc_list_.empty() &&
          timing_desc_list_.front().first <= current_access_unit_pos_) {
     current_timing_desc = timing_desc_list_.front().second;
     timing_desc_list_.pop_front();
   }
 
+  if (current_timing_desc.pts == kNoTimestamp())
+    return false;
+
   // Emit a frame.
   int raw_es_size;
   const uint8* raw_es;
   es_byte_queue_.Peek(&raw_es, &raw_es_size);
   int access_unit_size = next_aud_pos - current_access_unit_pos_;
   scoped_refptr<StreamParserBuffer> stream_parser_buffer =
       StreamParserBuffer::CopyFrom(
           &raw_es[current_access_unit_pos_],
           access_unit_size,
           is_key_frame_);
   stream_parser_buffer->SetDecodeTimestamp(current_timing_desc.dts);
   stream_parser_buffer->set_timestamp(current_timing_desc.pts);
   emit_buffer_cb_.Run(stream_parser_buffer);
 
   // Set the current frame position to the next AUD position.
   StartFrame(next_aud_pos);
+  return true;
 }
 
 void EsParserH264::StartFrame(int aud_pos) {
   // Two cases:
   // - if aud_pos < 0, clear the current frame and set |is_key_frame| to a
   // default value (false).
   // - if aud_pos >= 0, start a new frame and set |is_key_frame| to true
   // |is_key_frame_| will be updated while parsing the NALs of that frame.
   // If any NAL is a non IDR NAL, it will be set to false.
   current_access_unit_pos_ = aud_pos;
@@ skipping 253 matching lines @@
     last_video_decoder_config_ = video_decoder_config;
     new_video_config_cb_.Run(video_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media