Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1072)

Unified Diff: media/mpeg2/mpeg2ts_psi.cc

Issue 23566013: Mpeg2 TS stream parser for media source. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from patch set #3 Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/mpeg2/mpeg2ts_psi.cc
diff --git a/media/mpeg2/mpeg2ts_psi.cc b/media/mpeg2/mpeg2ts_psi.cc
new file mode 100644
index 0000000000000000000000000000000000000000..95800c59e8b837034355bd572491a26d5e5f7b31
--- /dev/null
+++ b/media/mpeg2/mpeg2ts_psi.cc
@@ -0,0 +1,115 @@
+// Copyright (c) 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/mpeg2/mpeg2ts_psi.h"
+
+#include "base/logging.h"
+#include "media/base/bit_reader.h"
+#include "media/mpeg2/mpeg2ts_crc.h"
+
+namespace media {
+namespace mpeg2ts {
+
+Mpeg2TsPsiParser::Mpeg2TsPsiParser()
+ : wait_for_pusi_(true),
+ leading_bytes_to_discard_(0) {
+}
+
+Mpeg2TsPsiParser::~Mpeg2TsPsiParser() {
+}
+
+bool Mpeg2TsPsiParser::Parse(bool payload_unit_start_indicator,
+ const uint8* buf, int size) {
+ return ParseInternal(payload_unit_start_indicator, buf, size);
+}
+
+bool Mpeg2TsPsiParser::ParseInternal(bool payload_unit_start_indicator,
damienv1 2013/09/10 04:10:02 Could remove ParseInternal function (since Parse i
damienv1 2013/09/10 21:03:48 Done.
+ const uint8* buf, int size) {
+ // Ignore partial PSI.
+ if (wait_for_pusi_ && !payload_unit_start_indicator)
+ return true;
+
+ if (payload_unit_start_indicator) {
+ // Reset the state of the PSI section.
+ ResetPsiState();
+
+ // Update the state.
+ wait_for_pusi_ = false;
+ DCHECK_GE(size, 1);
+ int pointer_field = buf[0];
+ leading_bytes_to_discard_ = pointer_field;
+ buf++;
+ size--;
+ }
+
+ // Discard some leading bytes if needed.
+ if (leading_bytes_to_discard_ > 0) {
+ int nbytes_to_discard = std::min(leading_bytes_to_discard_, size);
+ buf += nbytes_to_discard;
+ size -= nbytes_to_discard;
+ leading_bytes_to_discard_ -= nbytes_to_discard;
+ }
+ if (size == 0)
+ return true;
+
+ // Add the data to the parser state.
+ psi_byte_queue_.Push(buf, size);
+ int raw_psi_size;
+ const uint8* raw_psi;
+ psi_byte_queue_.Peek(&raw_psi, &raw_psi_size);
+
+ // Check whether we have enough data to start parsing.
+ if (raw_psi_size < 3)
+ return true;
+ int section_length =
+ ((static_cast<int>(raw_psi[1]) << 8) |
+ (static_cast<int>(raw_psi[2]))) & 0xfff;
+ if (section_length >= 1021)
+ return false;
+ int psi_length = section_length + 3;
+ if (raw_psi_size < psi_length) {
+ // Don't throw an error when there is not enough data,
+ // just wait for more data to come.
+ return true;
+ }
+
+ // There should not be any trailing bytes after a PMT.
+ // Instead, the pointer field should be used to stuff bytes.
+ DVLOG_IF(1, raw_psi_size > psi_length)
+ << "Trailing bytes after a PSI section: "
+ << psi_length << " vs " << raw_psi_size;
+
+ // Verify the CRC.
+ Mpeg2TsCrc crc;
+ for (int k = 0; k < psi_length; k++)
+ crc.Update(raw_psi[k]);
+ if (!crc.IsValid())
+ return false;
+
+ // Parse the PSI section.
+ BitReader bit_reader(raw_psi, raw_psi_size);
+ bool status = ParsePsiSection(&bit_reader);
+ if (status)
+ ResetPsiState();
+
+ return status;
+}
+
+void Mpeg2TsPsiParser::Flush() {
+}
+
+void Mpeg2TsPsiParser::Reset() {
+ ResetPsiSection();
+ ResetPsiState();
+}
+
+void Mpeg2TsPsiParser::ResetPsiState() {
+ wait_for_pusi_ = true;
+ psi_byte_queue_.Reset();
+ leading_bytes_to_discard_ = 0;
+}
+
+} // namespace mpeg2ts
+} // namespace media
+

Powered by Google App Engine
This is Rietveld 408576698