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

Side by Side Diff: ppapi/tests/test_media_stream_audio_track.cc

Issue 290993005: Support configuring number of audio buffers in MediaStream Pepper API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // Tests PPB_MediaStreamAudioTrack interface. 5 // Tests PPB_MediaStreamAudioTrack interface.
6 6
7 #include "ppapi/tests/test_media_stream_audio_track.h" 7 #include "ppapi/tests/test_media_stream_audio_track.h"
8 8
9 #include "ppapi/c/private/ppb_testing_private.h" 9 #include "ppapi/c/private/ppb_testing_private.h"
10 #include "ppapi/cpp/audio_buffer.h" 10 #include "ppapi/cpp/audio_buffer.h"
11 #include "ppapi/cpp/completion_callback.h" 11 #include "ppapi/cpp/completion_callback.h"
12 #include "ppapi/cpp/instance.h" 12 #include "ppapi/cpp/instance.h"
13 #include "ppapi/cpp/var.h" 13 #include "ppapi/cpp/var.h"
14 #include "ppapi/tests/test_utils.h" 14 #include "ppapi/tests/test_utils.h"
15 #include "ppapi/tests/testing_instance.h" 15 #include "ppapi/tests/testing_instance.h"
16 16
17 REGISTER_TEST_CASE(MediaStreamAudioTrack); 17 REGISTER_TEST_CASE(MediaStreamAudioTrack);
18 18
19 namespace { 19 namespace {
20 20
21 // Real max defined in
22 // content/renderer/pepper/pepper_media_stream_audio_track_host.cc.
23 const int32_t kMaxNumberOfBuffers = 1000;
21 const int32_t kTimes = 3; 24 const int32_t kTimes = 3;
22 const char kJSCode[] = 25 const char kJSCode[] =
23 "function gotStream(stream) {" 26 "function gotStream(stream) {"
24 " test_stream = stream;" 27 " test_stream = stream;"
25 " var track = stream.getAudioTracks()[0];" 28 " var track = stream.getAudioTracks()[0];"
26 " var plugin = document.getElementById('plugin');" 29 " var plugin = document.getElementById('plugin');"
27 " plugin.postMessage(track);" 30 " plugin.postMessage(track);"
28 "}" 31 "}"
29 "var constraints = {" 32 "var constraints = {"
30 " audio: true," 33 " audio: true,"
(...skipping 15 matching lines...) Expand all
46 case PP_AUDIOBUFFER_SAMPLERATE_44100: 49 case PP_AUDIOBUFFER_SAMPLERATE_44100:
47 case PP_AUDIOBUFFER_SAMPLERATE_48000: 50 case PP_AUDIOBUFFER_SAMPLERATE_48000:
48 case PP_AUDIOBUFFER_SAMPLERATE_96000: 51 case PP_AUDIOBUFFER_SAMPLERATE_96000:
49 case PP_AUDIOBUFFER_SAMPLERATE_192000: 52 case PP_AUDIOBUFFER_SAMPLERATE_192000:
50 return true; 53 return true;
51 default: 54 default:
52 return false; 55 return false;
53 } 56 }
54 } 57 }
55 58
56 } 59 } // namespace
57 60
58 TestMediaStreamAudioTrack::TestMediaStreamAudioTrack(TestingInstance* instance) 61 TestMediaStreamAudioTrack::TestMediaStreamAudioTrack(TestingInstance* instance)
59 : TestCase(instance), 62 : TestCase(instance),
60 event_(instance_->pp_instance()) { 63 event_(instance_->pp_instance()) {
61 } 64 }
62 65
63 bool TestMediaStreamAudioTrack::Init() { 66 bool TestMediaStreamAudioTrack::Init() {
64 return true; 67 return true;
65 } 68 }
66 69
67 TestMediaStreamAudioTrack::~TestMediaStreamAudioTrack() { 70 TestMediaStreamAudioTrack::~TestMediaStreamAudioTrack() {
68 } 71 }
69 72
70 void TestMediaStreamAudioTrack::RunTests(const std::string& filter) { 73 void TestMediaStreamAudioTrack::RunTests(const std::string& filter) {
71 RUN_TEST(Create, filter); 74 RUN_TEST(Create, filter);
72 RUN_TEST(GetBuffer, filter); 75 RUN_TEST(GetBuffer, filter);
76 RUN_TEST(Configure, filter);
73 } 77 }
74 78
75 void TestMediaStreamAudioTrack::HandleMessage(const pp::Var& message) { 79 void TestMediaStreamAudioTrack::HandleMessage(const pp::Var& message) {
76 if (message.is_resource()) { 80 if (message.is_resource()) {
77 audio_track_ = pp::MediaStreamAudioTrack(message.AsResource()); 81 audio_track_ = pp::MediaStreamAudioTrack(message.AsResource());
78 } 82 }
79 event_.Signal(); 83 event_.Signal();
80 } 84 }
81 85
82 std::string TestMediaStreamAudioTrack::TestCreate() { 86 std::string TestMediaStreamAudioTrack::TestCreate() {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 ASSERT_EQ(buffer.GetDataBufferSize(), 0U); 137 ASSERT_EQ(buffer.GetDataBufferSize(), 0U);
134 ASSERT_TRUE(buffer.GetDataBuffer() == NULL); 138 ASSERT_TRUE(buffer.GetDataBuffer() == NULL);
135 } 139 }
136 140
137 // Close the track. 141 // Close the track.
138 audio_track_.Close(); 142 audio_track_.Close();
139 ASSERT_TRUE(audio_track_.HasEnded()); 143 ASSERT_TRUE(audio_track_.HasEnded());
140 audio_track_ = pp::MediaStreamAudioTrack(); 144 audio_track_ = pp::MediaStreamAudioTrack();
141 PASS(); 145 PASS();
142 } 146 }
147
148 std::string TestMediaStreamAudioTrack::TestConfigure() {
149 // Create a track.
150 instance_->EvalScript(kJSCode);
151 event_.Wait();
152 event_.Reset();
153
154 ASSERT_FALSE(audio_track_.is_null());
155 ASSERT_FALSE(audio_track_.HasEnded());
156 ASSERT_FALSE(audio_track_.GetId().empty());
157
158 PP_TimeDelta timestamp = 0.0;
159
160 // Configure number of buffers.
161 struct {
162 int32_t buffers;
163 int32_t expect_result;
164 } buffers[] = {
165 { 8, PP_OK },
166 { 100, PP_OK },
167 { kMaxNumberOfBuffers, PP_OK },
168 { -1, PP_ERROR_BADARGUMENT },
169 { kMaxNumberOfBuffers + 1, PP_OK }, // Clipped to max value.
170 { 0, PP_OK }, // Use default.
171 };
172 for (size_t i = 0; i < sizeof(buffers) / sizeof(buffers[0]); ++i) {
dcheng 2014/05/28 15:55:44 arraysize?
thembrown 2014/05/28 17:13:11 tried that, requires including base/macros.h which
173 TestCompletionCallback cc_configure(instance_->pp_instance(), false);
174 int32_t attrib_list[] = {
175 PP_MEDIASTREAMAUDIOTRACK_ATTRIB_BUFFERS, buffers[i].buffers,
176 PP_MEDIASTREAMAUDIOTRACK_ATTRIB_NONE,
177 };
178 cc_configure.WaitForResult(
179 audio_track_.Configure(attrib_list, cc_configure.GetCallback()));
180 ASSERT_EQ(buffers[i].expect_result, cc_configure.result());
181
182 // Get some buffers. This should also succeed when configure fails.
183 for (int j = 0; j < kTimes; ++j) {
184 TestCompletionCallbackWithOutput<pp::AudioBuffer> cc_get_buffer(
185 instance_->pp_instance(), false);
186 cc_get_buffer.WaitForResult(
187 audio_track_.GetBuffer(cc_get_buffer.GetCallback()));
188 ASSERT_EQ(PP_OK, cc_get_buffer.result());
189 pp::AudioBuffer buffer = cc_get_buffer.output();
190 ASSERT_FALSE(buffer.is_null());
191 ASSERT_TRUE(IsSampleRateValid(buffer.GetSampleRate()));
192 ASSERT_EQ(buffer.GetSampleSize(), PP_AUDIOBUFFER_SAMPLESIZE_16_BITS);
193
194 ASSERT_GE(buffer.GetTimestamp(), timestamp);
195 timestamp = buffer.GetTimestamp();
196
197 ASSERT_GT(buffer.GetDataBufferSize(), 0U);
198 ASSERT_TRUE(buffer.GetDataBuffer() != NULL);
199
200 audio_track_.RecycleBuffer(buffer);
201 }
202 }
203
204 // Configure should fail while plugin holds buffers.
205 {
206 TestCompletionCallbackWithOutput<pp::AudioBuffer> cc_get_buffer(
207 instance_->pp_instance(), false);
208 cc_get_buffer.WaitForResult(
209 audio_track_.GetBuffer(cc_get_buffer.GetCallback()));
210 ASSERT_EQ(PP_OK, cc_get_buffer.result());
211 pp::AudioBuffer buffer = cc_get_buffer.output();
212 int32_t attrib_list[] = {
213 PP_MEDIASTREAMAUDIOTRACK_ATTRIB_BUFFERS, 0,
214 PP_MEDIASTREAMAUDIOTRACK_ATTRIB_NONE,
215 };
216 TestCompletionCallback cc_configure(instance_->pp_instance(), false);
217 cc_configure.WaitForResult(
218 audio_track_.Configure(attrib_list, cc_configure.GetCallback()));
219 ASSERT_EQ(PP_ERROR_INPROGRESS, cc_configure.result());
220 audio_track_.RecycleBuffer(buffer);
221 }
222
223 // Close the track.
224 audio_track_.Close();
225 ASSERT_TRUE(audio_track_.HasEnded());
226 audio_track_ = pp::MediaStreamAudioTrack();
227 PASS();
228 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698