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

media/formats/mp2t/es_parser_test_base.cc

Index: media/formats/mp2t/es_parser_test_base.cc
diff --git a/media/formats/mp2t/es_parser_test_base.cc b/media/formats/mp2t/es_parser_test_base.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1959821c0ca776918230d8ff525d72a2823aa63b
--- /dev/null
+++ b/media/formats/mp2t/es_parser_test_base.cc
@@ -0,0 +1,108 @@
+// 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_test_base.h"
+
+#include "base/files/memory_mapped_file.h"
+#include "base/logging.h"
+#include "base/path_service.h"
+#include "base/strings/string_util.h"
+#include "media/base/buffers.h"
+#include "media/base/stream_parser_buffer.h"
+#include "media/base/test_data_util.h"
+#include "media/formats/mp2t/es_parser.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace media {
+namespace mp2t {
+
+EsParserTestBase::Packet::Packet()
+    : offset(0u),
+      size(0u),
+      pts(kNoTimestamp()) {
+}
+
+EsParserTestBase::EsParserTestBase()
+    : config_count_(0u),
+      buffer_count_(0u) {
+}
+
+EsParserTestBase::~EsParserTestBase() {
+}
+
+void EsParserTestBase::LoadStream(const char* filename) {
+  base::FilePath file_path = GetTestDataFilePath(filename);
+
+  base::MemoryMappedFile stream;
+  ASSERT_TRUE(stream.Initialize(file_path))
+      << "Couldn't open stream file: " << file_path.MaybeAsASCII();
+
+  stream_.resize(stream.length());
+  memcpy(&stream_[0], stream.data(), stream_.size());
+}
+
+void EsParserTestBase::NewAudioConfig(const AudioDecoderConfig& config) {

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

nit: add include

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

We only have a const reference to a structure we don't use.
So we should not have to include "audio_decoder_config.h"

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

Acknowledged.

+  config_count_++;
+}
+
+void EsParserTestBase::NewVideoConfig(const VideoDecoderConfig& config) {

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

nit: ditto

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

Same answer.

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

Acknowledged.

+  config_count_++;
+}
+
+void EsParserTestBase::EmitBuffer(scoped_refptr<StreamParserBuffer> buffer) {
+  buffer_timestamps_stream_ << "("
+                            << buffer->timestamp().InMilliseconds()
+                            << ") ";
+  buffer_count_++;
+}
+
+bool EsParserTestBase::ProcessPesPackets(
+    EsParser* es_parser,
+    const std::vector<Packet>& pes_packets,
+    bool force_timing) {
+  DCHECK(es_parser);
+
+  buffer_count_ = 0;
+  config_count_ = 0;
+  buffer_timestamps_stream_.str(std::string());
+
+  for (size_t k = 0; k < pes_packets.size(); k++) {
+    size_t cur_pes_offset = pes_packets[k].offset;
+    size_t cur_pes_size = pes_packets[k].size;
+
+    base::TimeDelta pts = kNoTimestamp();
+    base::TimeDelta dts = kNoTimestamp();
+    if (pes_packets[k].pts >= base::TimeDelta() || force_timing)
+      pts = pes_packets[k].pts;
+
+    DCHECK_LT(cur_pes_offset, stream_.size());
+    if (!es_parser->Parse(&stream_[cur_pes_offset], cur_pes_size, pts, dts))
+      return false;
+  }
+  es_parser->Flush();
+
+  buffer_timestamps_ = buffer_timestamps_stream_.str();
+  base::TrimWhitespaceASCII(
+      buffer_timestamps_, base::TRIM_ALL, &buffer_timestamps_);
+  return true;
+}
+
+void EsParserTestBase::ComputePacketSize(std::vector<Packet>* packets) {
+  DCHECK(packets);
+  if (packets->size() == 0u)
+    return;
+
+  Packet* cur = &(*packets)[0];
+  for (size_t k = 0; k < packets->size() - 1; k++) {
+    Packet* next = &(*packets)[k + 1];
+    DCHECK_GE(next->offset, cur->offset);
+    cur->size = next->offset - cur->offset;
+    cur = next;
+  }
+  DCHECK_GE(stream_.size(), cur->offset);
+  cur->size = stream_.size() - cur->offset;
+}
+
+}  // namespace mp2t
+}  // namespace media