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

Unified Diff: chrome/test/data/media/eme_player_js/eme_app.js

Issue 408993002: Have media content and chrome browser tests load data from media/test/data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
Index: chrome/test/data/media/eme_player_js/eme_app.js
diff --git a/chrome/test/data/media/eme_player_js/eme_app.js b/chrome/test/data/media/eme_player_js/eme_app.js
deleted file mode 100644
index 4c2ec0d86bb78dd9b33fcc9bb17e4b8962230145..0000000000000000000000000000000000000000
--- a/chrome/test/data/media/eme_player_js/eme_app.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2014 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.
-
-// EMEApp is responsible for starting playback on the eme_player.html page.
-// It selects the suitable player based on key system and other test options.
-function EMEApp(testConfig) {
- this.video_ = null;
- this.testConfig_ = testConfig;
- this.updateDocument(testConfig);
-}
-
-EMEApp.prototype.createPlayer = function() {
- // Load document test configuration.
- this.updateTestConfig();
- if (this.video_) {
- Utils.timeLog('Delete old video tag.');
- this.video_.pause();
- this.video_.remove();
- delete(this.video_);
- }
-
- this.video_ = document.createElement('video');
- this.video_.controls = true;
- this.video_.preload = true;
- this.video_.width = 848;
- this.video_.height = 480;
- var videoSpan = document.getElementById(VIDEO_ELEMENT_ID);
- if (videoSpan)
- videoSpan.appendChild(this.video_);
- else
- document.body.appendChild(this.video_);
-
- var videoPlayer = PlayerUtils.createPlayer(this.video_, this.testConfig_);
- if (!videoPlayer) {
- Utils.timeLog('Cannot create a media player.');
- return;
- }
- Utils.timeLog('Using ' + videoPlayer.constructor.name);
- if (this.testConfig_.runFPS)
- FPSObserver.observe(this.video_);
-
- videoPlayer.init();
- return videoPlayer;
-};
-
-EMEApp.prototype.updateDocument = function(testConfig) {
- // Update document lists with test configuration values.
- Utils.addOptions(KEYSYSTEM_ELEMENT_ID, KEY_SYSTEMS);
- Utils.addOptions(MEDIA_TYPE_ELEMENT_ID, MEDIA_TYPES);
- Utils.addOptions(USE_PREFIXED_EME_ID, EME_VERSIONS_OPTIONS,
- EME_DISABLED_OPTIONS);
- document.getElementById(MEDIA_FILE_ELEMENT_ID).value =
- testConfig.mediaFile || DEFAULT_MEDIA_FILE;
- document.getElementById(LICENSE_SERVER_ELEMENT_ID).value =
- testConfig.licenseServerURL || DEFAULT_LICENSE_SERVER;
- if (testConfig.keySystem)
- Utils.ensureOptionInList(KEYSYSTEM_ELEMENT_ID, testConfig.keySystem);
- if (testConfig.mediaType)
- Utils.ensureOptionInList(MEDIA_TYPE_ELEMENT_ID, testConfig.mediaType);
- document.getElementById(USE_MSE_ELEMENT_ID).value = testConfig.useMSE;
- if (testConfig.usePrefixedEME)
- document.getElementById(USE_PREFIXED_EME_ID).value = EME_PREFIXED_VERSION;
-};
-
-EMEApp.prototype.updateTestConfig = function() {
- // Reload test configuration from document.
- this.testConfig_.mediaFile =
- document.getElementById(MEDIA_FILE_ELEMENT_ID).value;
- this.testConfig_.keySystem =
- document.getElementById(KEYSYSTEM_ELEMENT_ID).value;
- this.testConfig_.mediaType =
- document.getElementById(MEDIA_TYPE_ELEMENT_ID).value;
- this.testConfig_.useMSE =
- document.getElementById(USE_MSE_ELEMENT_ID).value == 'true';
- this.testConfig_.usePrefixedEME = (
- document.getElementById(USE_PREFIXED_EME_ID).value ==
- EME_PREFIXED_VERSION);
- this.testConfig_.licenseServerURL =
- document.getElementById(LICENSE_SERVER_ELEMENT_ID).value;
-};
« no previous file with comments | « chrome/test/data/media/eme_player_js/clearkey_player.js ('k') | chrome/test/data/media/eme_player_js/file_io_test_player.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698