summaryrefslogtreecommitdiffstats
path: root/media/cast/audio_sender
diff options
context:
space:
mode:
authormikhal@google.com <mikhal@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 03:24:01 +0000
committermikhal@google.com <mikhal@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 03:24:01 +0000
commit7df9716b1c460092a3caca82dddfe78739940aa9 (patch)
treea57328270dafca2b95affd5bc47e546f255ea66e /media/cast/audio_sender
parent7cc7a2e71c9b9dc1fe1d2cf67839ed8f00169bb1 (diff)
downloadchromium_src-7df9716b1c460092a3caca82dddfe78739940aa9.zip
chromium_src-7df9716b1c460092a3caca82dddfe78739940aa9.tar.gz
chromium_src-7df9716b1c460092a3caca82dddfe78739940aa9.tar.bz2
Incorporating logging into Cast:
1. Adding logging to CastEnvironment. 2. Actually triggering logging within the cast library. 3. Adding thread checks. 4. Removing trace calls outside of the logging class. Open issues: 1.Use of rtp_timestamp and frame id is not consistent. In addition, the AudioBus does not include these values. 2. There is a pending cl to switch frame_id to int. This cl does not include that. 3. There are a few more places to add logging. As this cl is already big enough, all of the above will come in a follow-up cl. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236034 Review URL: https://codereview.chromium.org/69603002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/audio_sender')
-rw-r--r--media/cast/audio_sender/audio_encoder_unittest.cc3
-rw-r--r--media/cast/audio_sender/audio_sender.cc5
-rw-r--r--media/cast/audio_sender/audio_sender_unittest.cc3
3 files changed, 7 insertions, 4 deletions
diff --git a/media/cast/audio_sender/audio_encoder_unittest.cc b/media/cast/audio_sender/audio_encoder_unittest.cc
index 20f9edb..d721f71 100644
--- a/media/cast/audio_sender/audio_encoder_unittest.cc
+++ b/media/cast/audio_sender/audio_encoder_unittest.cc
@@ -97,7 +97,8 @@ class AudioEncoderTest : public ::testing::TestWithParam<TestScenario> {
virtual void SetUp() {
task_runner_ = new test::FakeTaskRunner(&testing_clock_);
cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
- task_runner_, task_runner_, task_runner_, task_runner_);
+ task_runner_, task_runner_, task_runner_, task_runner_,
+ GetDefaultCastLoggingConfig());
}
virtual ~AudioEncoderTest() {}
diff --git a/media/cast/audio_sender/audio_sender.cc b/media/cast/audio_sender/audio_sender.cc
index e1c5bc4..66133f1 100644
--- a/media/cast/audio_sender/audio_sender.cc
+++ b/media/cast/audio_sender/audio_sender.cc
@@ -10,6 +10,7 @@
#include "crypto/encryptor.h"
#include "crypto/symmetric_key.h"
#include "media/cast/audio_sender/audio_encoder.h"
+#include "media/cast/cast_environment.h"
#include "media/cast/rtcp/rtcp.h"
#include "media/cast/rtp_sender/rtp_sender.h"
@@ -56,12 +57,12 @@ AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
const AudioSenderConfig& audio_config,
PacedPacketSender* const paced_packet_sender)
: cast_environment_(cast_environment),
- rtp_sender_(cast_environment->Clock(), &audio_config, NULL,
+ rtp_sender_(cast_environment, &audio_config, NULL,
paced_packet_sender),
rtcp_feedback_(new LocalRtcpAudioSenderFeedback(this)),
rtp_audio_sender_statistics_(
new LocalRtpSenderStatistics(&rtp_sender_)),
- rtcp_(cast_environment->Clock(),
+ rtcp_(cast_environment,
rtcp_feedback_.get(),
paced_packet_sender,
rtp_audio_sender_statistics_.get(),
diff --git a/media/cast/audio_sender/audio_sender_unittest.cc b/media/cast/audio_sender/audio_sender_unittest.cc
index 92f51a3..5b632bf 100644
--- a/media/cast/audio_sender/audio_sender_unittest.cc
+++ b/media/cast/audio_sender/audio_sender_unittest.cc
@@ -34,7 +34,8 @@ class AudioSenderTest : public ::testing::Test {
virtual void SetUp() {
task_runner_ = new test::FakeTaskRunner(&testing_clock_);
cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
- task_runner_, task_runner_, task_runner_, task_runner_);
+ task_runner_, task_runner_, task_runner_, task_runner_,
+ GetDefaultCastLoggingConfig());
audio_config_.codec = kOpus;
audio_config_.use_external_encoder = false;
audio_config_.frequency = kDefaultAudioSamplingRate;