| Index: chrome/test/data/extensions/api_test/webrtc_cast/basics.js
|
| diff --git a/chrome/test/data/extensions/api_test/webrtc_cast/basics.js b/chrome/test/data/extensions/api_test/webrtc_cast/basics.js
|
| index 79f523cde63cc9315918bc6de3903a5440120a55..72f57ff8d59e54c11dacabb4fc8970a0741d3305 100644
|
| --- a/chrome/test/data/extensions/api_test/webrtc_cast/basics.js
|
| +++ b/chrome/test/data/extensions/api_test/webrtc_cast/basics.js
|
| @@ -5,86 +5,28 @@
|
| var sendTransport = chrome.webrtc.castSendTransport;
|
| var tabCapture = chrome.tabCapture;
|
| var udpTransport = chrome.webrtc.castUdpTransport;
|
| +var createSession = chrome.cast.streaming.createSession;
|
|
|
| chrome.test.runTests([
|
| - function udpTransportCreate() {
|
| - udpTransport.create(function(udpId) {
|
| - udpTransport.start(
|
| - udpId,
|
| - {address: "127.0.0.1", port: 60613});
|
| - udpTransport.destroy(udpId);
|
| - chrome.test.succeed();
|
| - });
|
| - },
|
| - function sendTransportCreate() {
|
| - tabCapture.capture({audio: true}, function(stream) {
|
| - chrome.test.assertTrue(!!stream);
|
| - udpTransport.create(function(stream, udpId) {
|
| - sendTransport.create(
|
| - udpId,
|
| - stream.getAudioTracks()[0],
|
| - function(stream, udpId, sendTransportId) {
|
| - sendTransport.destroy(sendTransportId);
|
| - udpTransport.destroy(udpId);
|
| - stream.stop();
|
| - chrome.test.succeed();
|
| - }.bind(null, stream, udpId));
|
| - }.bind(null, stream));
|
| - });
|
| - },
|
| - function sendTransportGetCapsAudio() {
|
| - tabCapture.capture({audio: true}, function(stream) {
|
| - chrome.test.assertTrue(!!stream);
|
| - udpTransport.create(function(stream, udpId) {
|
| - sendTransport.create(
|
| - udpId,
|
| - stream.getAudioTracks()[0],
|
| - function(stream, udpId, sendTransportId) {
|
| - var caps = sendTransport.getCaps(sendTransportId);
|
| - sendTransport.destroy(sendTransportId);
|
| - udpTransport.destroy(udpId);
|
| - stream.stop();
|
| - chrome.test.assertEq(caps.payloads[0].codecName, "OPUS");
|
| - chrome.test.succeed();
|
| - }.bind(null, stream, udpId));
|
| - }.bind(null, stream));
|
| - });
|
| - },
|
| function sendTransportStart() {
|
| - function startId(id) {
|
| - // TODO(hclam): Give something meaningful for params.
|
| - var params = {
|
| - payloads: [],
|
| - rtcpFeatures: [],
|
| - };
|
| - sendTransport.start(id, params);
|
| - }
|
| - function cleanupId(id) {
|
| - sendTransport.stop(id);
|
| - sendTransport.destroy(id);
|
| - }
|
| tabCapture.capture({audio: true, video: true}, function(stream) {
|
| chrome.test.assertTrue(!!stream);
|
| - udpTransport.create(function(stream, udpId) {
|
| - // Create a transport for audio.
|
| - sendTransport.create(
|
| - udpId,
|
| - stream.getAudioTracks()[0],
|
| - function(stream, udpId, audioId) {
|
| - // Create a transport for video.
|
| - sendTransport.create(
|
| - udpId,
|
| - stream.getVideoTracks()[0],
|
| - function(stream, udpId, audioId, videoId) {
|
| - startId(audioId);
|
| - cleanupId(audioId);
|
| - startId(videoId);
|
| - cleanupId(videoId);
|
| - udpTransport.destroy(udpId);
|
| - stream.stop();
|
| - chrome.test.succeed();
|
| - }.bind(null, stream, udpId, audioId));
|
| - }.bind(null, stream, udpId));
|
| + createSession(stream.getAudioTracks()[0],
|
| + stream.getVideoTracks()[0],
|
| + function(stream, audioId, videoId, udpId) {
|
| + var audioParams = sendTransport.getCaps(audioId);
|
| + var videoParams = sendTransport.getCaps(videoId);
|
| + sendTransport.start(audioId, audioParams);
|
| + sendTransport.start(videoId, videoParams);
|
| + sendTransport.stop(audioId);
|
| + sendTransport.stop(videoId);
|
| + sendTransport.destroy(audioId);
|
| + sendTransport.destroy(videoId);
|
| + udpTransport.destroy(udpId);
|
| + stream.stop();
|
| + chrome.test.assertEq(audioParams.payloads[0].codecName, "OPUS");
|
| + chrome.test.assertEq(videoParams.payloads[0].codecName, "VP8");
|
| + chrome.test.succeed();
|
| }.bind(null, stream));
|
| });
|
| },
|
|
|