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

Unified Diff: media/formats/webm/opus_packet_builder.cc

Issue 883403002: Parsing of encoded duration for unencrypted opus streams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor fix for log line. Created 5 years, 10 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
« no previous file with comments | « media/formats/webm/opus_packet_builder.h ('k') | media/formats/webm/webm_cluster_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/opus_packet_builder.cc
diff --git a/media/formats/webm/opus_packet_builder.cc b/media/formats/webm/opus_packet_builder.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b2dd8dca1e1de13dfc2dbafb665a1b51ec2b74eb
--- /dev/null
+++ b/media/formats/webm/opus_packet_builder.cc
@@ -0,0 +1,89 @@
+// Copyright (c) 2015 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 "base/logging.h"
+#include "media/formats/webm/opus_packet_builder.h"
+#include "media/formats/webm/webm_cluster_parser.h"
+
+namespace media {
+
+OpusPacket::OpusPacket(uint8_t config, uint8_t frame_count, bool is_VBR) {
+ DCHECK_GE(config, 0);
+ DCHECK_LT(config, kNumPossibleOpusConfigs);
+ DCHECK_GE(frame_count, kMinOpusPacketFrameCount);
+ DCHECK_LE(frame_count, kMaxOpusPacketFrameCount);
+
+ duration_ms_ = frame_count *
+ WebMClusterParser::kOpusFrameDurationsMu[config] /
+ static_cast<float>(1000);
+
+ uint8_t frame_count_code;
+ uint8_t frame_count_byte;
+
+ if (frame_count == 1) {
+ frame_count_code = 0;
+ } else if (frame_count == 2) {
+ frame_count_code = is_VBR ? 2 : 1;
+ } else {
+ frame_count_code = 3;
+ frame_count_byte = (is_VBR ? 1 << 7 : 0) | frame_count;
+ }
+
+ // All opus packets must have TOC byte.
+ uint8_t opus_toc_byte = (config << 3) | frame_count_code;
+ data_.push_back(opus_toc_byte);
+
+ // For code 3 packets, the number of frames is signaled in the "frame
+ // count byte".
+ if (frame_count_code == 3) {
+ data_.push_back(frame_count_byte);
+ }
+
+ // Packet will only conform to layout specification for the TOC byte
+ // and optional frame count bytes appended above. This last byte
+ // is purely dummy padding where frame size data or encoded data might
+ // otherwise start.
+ data_.push_back(static_cast<uint8_t>(0));
+}
+
+OpusPacket::~OpusPacket() {
+}
+
+const uint8_t* OpusPacket::data() const {
+ return &(data_[0]);
+}
+
+int OpusPacket::size() const {
+ return data_.size();
+}
+
+double OpusPacket::duration_ms() const {
+ return duration_ms_;
+}
+
+ScopedVector<OpusPacket> BuildAllOpusPackets() {
+ ScopedVector<OpusPacket> opus_packets;
+
+ for (int frame_count = kMinOpusPacketFrameCount;
+ frame_count <= kMaxOpusPacketFrameCount; frame_count++) {
+ for (int opus_config_num = 0; opus_config_num < kNumPossibleOpusConfigs;
+ opus_config_num++) {
+ bool is_VBR = false;
+ opus_packets.push_back(
+ new OpusPacket(opus_config_num, frame_count, is_VBR));
+
+ if (frame_count >= 2) {
+ // Add another packet with VBR flag toggled. For frame counts >= 2,
+ // VBR triggers changes to packet framing.
+ is_VBR = true;
+ opus_packets.push_back(
+ new OpusPacket(opus_config_num, frame_count, is_VBR));
+ }
+ }
+ }
+
+ return opus_packets.Pass();
+}
+
+} // namespace media
« no previous file with comments | « media/formats/webm/opus_packet_builder.h ('k') | media/formats/webm/webm_cluster_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698