Mpeg2TS - estimate duration for video frames.

media/formats/mp2t/es_parser_h264.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_h264.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "media/base/buffers.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_frame.h"
 #include "media/filters/h264_parser.h"
 #include "media/formats/common/offset_byte_queue.h"
+#include "media/formats/mp2t/es_adapter_video.h"
 #include "media/formats/mp2t/mp2t_common.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 namespace mp2t {
 
 // An AUD NALU is at least 4 bytes:
 // 3 bytes for the start code + 1 byte for the NALU type.
 const int kMinAUDSize = 4;
 
 EsParserH264::EsParserH264(
     const NewVideoConfigCB& new_video_config_cb,
     const EmitBufferCB& emit_buffer_cb)
   : new_video_config_cb_(new_video_config_cb),
     emit_buffer_cb_(emit_buffer_cb),

[acolwell GONE FROM CHROMIUM, 2014/07/09 20:01:11]

remove this and new_video_config_cb_ ?

[damienv1, 2014/07/10 16:00:54]

Done.

+    es_adapter_(new EsAdapterVideo(
+        new_video_config_cb_, emit_buffer_cb_)),
     es_queue_(new media::OffsetByteQueue()),
     h264_parser_(new H264Parser()),
     current_access_unit_pos_(0),
     next_access_unit_pos_(0) {
 }
 
 EsParserH264::~EsParserH264() {
 }
 
 bool EsParserH264::Parse(const uint8* buf, int size,
@@ skipping 27 matching lines @@
 void EsParserH264::Flush() {
   DVLOG(1) << "EsParserH264::Flush";
   if (!FindAUD(&current_access_unit_pos_))
     return;
 
   // Simulate an additional AUD to force emitting the last access unit
   // which is assumed to be complete at this point.
   uint8 aud[] = { 0x00, 0x00, 0x01, 0x09 };
   es_queue_->Push(aud, sizeof(aud));
   ParseInternal();
+
+  es_adapter_->Flush();
 }
 
 void EsParserH264::Reset() {
   DVLOG(1) << "EsParserH264::Reset";
   es_queue_.reset(new media::OffsetByteQueue());
   h264_parser_.reset(new H264Parser());
   current_access_unit_pos_ = 0;
   next_access_unit_pos_ = 0;
   timing_desc_list_.clear();
   last_video_decoder_config_ = VideoDecoderConfig();
+  es_adapter_.reset(

[acolwell GONE FROM CHROMIUM, 2014/07/09 20:01:11]

Add a Reset/Clear method on the adapter so you don't need to cache these
callbacks in this object?

[damienv1, 2014/07/10 16:00:54]

Done.

+      new EsAdapterVideo(new_video_config_cb_, emit_buffer_cb_));
 }
 
 bool EsParserH264::FindAUD(int64* stream_pos) {
   while (true) {
     const uint8* es;
     int size;
     es_queue_->PeekAt(*stream_pos, &es, &size);
 
     // Find a start code and move the stream to the start code parser position.
     off_t start_code_offset;
@@ skipping 168 matching lines @@
   // type and allow multiple video tracks. See https://crbug.com/341581.
   scoped_refptr<StreamParserBuffer> stream_parser_buffer =
       StreamParserBuffer::CopyFrom(
           es,
           access_unit_size,
           is_key_frame,
           DemuxerStream::VIDEO,
           0);
   stream_parser_buffer->SetDecodeTimestamp(current_timing_desc.dts);
   stream_parser_buffer->set_timestamp(current_timing_desc.pts);
-  emit_buffer_cb_.Run(stream_parser_buffer);
+  es_adapter_->OnNewBuffer(stream_parser_buffer);
   return true;
 }
 
 bool EsParserH264::UpdateVideoDecoderConfig(const H264SPS* sps) {
   // Set the SAR to 1 when not specified in the H264 stream.
   int sar_width = (sps->sar_width == 0) ? 1 : sps->sar_width;
   int sar_height = (sps->sar_height == 0) ? 1 : sps->sar_height;
 
   // TODO(damienv): a MAP unit can be either 16 or 32 pixels.
   // although it's 16 pixels for progressive non MBAFF frames.
@@ skipping 27 matching lines @@
   if (!video_decoder_config.Matches(last_video_decoder_config_)) {
     DVLOG(1) << "Profile IDC: " << sps->profile_idc;
     DVLOG(1) << "Level IDC: " << sps->level_idc;
     DVLOG(1) << "Pic width: " << coded_size.width();
     DVLOG(1) << "Pic height: " << coded_size.height();
     DVLOG(1) << "log2_max_frame_num_minus4: "
              << sps->log2_max_frame_num_minus4;
     DVLOG(1) << "SAR: width=" << sps->sar_width
              << " height=" << sps->sar_height;
     last_video_decoder_config_ = video_decoder_config;
-    new_video_config_cb_.Run(video_decoder_config);
+    es_adapter_->OnConfigChanged(video_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media