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

Side by Side Diff: media/audio/android/audio_android_unittest.cc

Issue 2023943002: Revert of Forward output glitch information from stream WebRTC log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « media/audio/alsa/audio_manager_alsa.cc ('k') | media/audio/android/audio_manager_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 void GetDefaultOutputStreamParameters() { 537 void GetDefaultOutputStreamParameters() {
538 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread()); 538 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
539 audio_output_parameters_ = 539 audio_output_parameters_ =
540 audio_manager()->GetDefaultOutputStreamParameters(); 540 audio_manager()->GetDefaultOutputStreamParameters();
541 EXPECT_TRUE(audio_output_parameters_.IsValid()); 541 EXPECT_TRUE(audio_output_parameters_.IsValid());
542 } 542 }
543 543
544 void MakeOutputStream(const AudioParameters& params) { 544 void MakeOutputStream(const AudioParameters& params) {
545 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread()); 545 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
546 audio_output_stream_ = audio_manager()->MakeAudioOutputStream( 546 audio_output_stream_ = audio_manager()->MakeAudioOutputStream(
547 params, std::string(), AudioManager::LogCallback()); 547 params, std::string());
548 EXPECT_TRUE(audio_output_stream_); 548 EXPECT_TRUE(audio_output_stream_);
549 } 549 }
550 550
551 void OpenAndClose() { 551 void OpenAndClose() {
552 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread()); 552 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
553 EXPECT_TRUE(audio_output_stream_->Open()); 553 EXPECT_TRUE(audio_output_stream_->Open());
554 audio_output_stream_->Close(); 554 audio_output_stream_->Close();
555 audio_output_stream_ = NULL; 555 audio_output_stream_ = NULL;
556 } 556 }
557 557
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 685
686 void GetDefaultInputStreamParameters() { 686 void GetDefaultInputStreamParameters() {
687 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread()); 687 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
688 audio_input_parameters_ = audio_manager()->GetInputStreamParameters( 688 audio_input_parameters_ = audio_manager()->GetInputStreamParameters(
689 AudioDeviceDescription::kDefaultDeviceId); 689 AudioDeviceDescription::kDefaultDeviceId);
690 } 690 }
691 691
692 void MakeInputStream(const AudioParameters& params) { 692 void MakeInputStream(const AudioParameters& params) {
693 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread()); 693 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
694 audio_input_stream_ = audio_manager()->MakeAudioInputStream( 694 audio_input_stream_ = audio_manager()->MakeAudioInputStream(
695 params, AudioDeviceDescription::kDefaultDeviceId, 695 params, AudioDeviceDescription::kDefaultDeviceId);
696 AudioManager::LogCallback());
697 EXPECT_TRUE(audio_input_stream_); 696 EXPECT_TRUE(audio_input_stream_);
698 } 697 }
699 698
700 void OpenAndClose() { 699 void OpenAndClose() {
701 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread()); 700 DCHECK(audio_manager()->GetTaskRunner()->BelongsToCurrentThread());
702 EXPECT_TRUE(audio_input_stream_->Open()); 701 EXPECT_TRUE(audio_input_stream_->Open());
703 audio_input_stream_->Close(); 702 audio_input_stream_->Close();
704 audio_input_stream_ = NULL; 703 audio_input_stream_ = NULL;
705 } 704 }
706 705
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(20)); 961 base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(20));
963 printf("\n"); 962 printf("\n");
964 StopAndCloseAudioOutputStreamOnAudioThread(); 963 StopAndCloseAudioOutputStreamOnAudioThread();
965 StopAndCloseAudioInputStreamOnAudioThread(); 964 StopAndCloseAudioInputStreamOnAudioThread();
966 } 965 }
967 966
968 INSTANTIATE_TEST_CASE_P(AudioAndroidInputTest, AudioAndroidInputTest, 967 INSTANTIATE_TEST_CASE_P(AudioAndroidInputTest, AudioAndroidInputTest,
969 testing::ValuesIn(RunAudioRecordInputPathTests())); 968 testing::ValuesIn(RunAudioRecordInputPathTests()));
970 969
971 } // namespace media 970 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/alsa/audio_manager_alsa.cc ('k') | media/audio/android/audio_manager_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698