Skip to content

Commit

Permalink
remove media-reload mixin
Browse files Browse the repository at this point in the history
  • Loading branch information
Kim Scott committed Dec 5, 2020
1 parent 893da08 commit 93e7409
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 199 deletions.
168 changes: 7 additions & 161 deletions app/components/exp-lookit-calibration/component.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,98 +11,10 @@ let {
$
} = Ember;

/**
* @module exp-player
* @submodule frames
*/

/**
/*
*
* Frame to do calibration for looking direction. Shows a small video/image in a sequence
* of locations so you'll have video of the child looking to those locations at known times.
*
* The attention-grabber can be either a small video or an image (see examples below of each).
* Images can be animated (spinning or bouncing).
*
* Generally you will want to have video of this frame. You can set doRecording to true to
* make a video clip just for this frame, or you can use session-level recording (set
* startSessionRecording to true on this or a previous frame). If either type of recording
* is starting on this frame, it waits until recording starts to display the first calibration
* segment.
*
* It can be displayed at center, left, or right of the screen. You can specify the sequence
* of positions or use the default ['center', 'left', 'right', 'center']. Each time it moves,
* the video (if any) and audio restart, and an event is recorded with the location and time (and time
* relative to any video recording) of the segment start.
*
* For details about specifying media locations, please see
* https://lookit.readthedocs.io/en/develop/researchers-prep-stimuli.html?highlight=basedir#directory-structure
*
* This frame is displayed fullscreen, to match the frames you will likely want to compare
* looking behavior on. If the participant leaves fullscreen, that will be
* recorded as an event, and a large "return to fullscreen" button will be displayed. Don't
* use video coding from any intervals where the participant isn't in fullscreen mode - the
* position of the attention-grabbers won't be as expected.
*
* If the frame before it is not fullscreen, that frame
* needs to include a manual "next" button so that there's a user interaction
* event to trigger fullscreen mode. (Browsers don't allow us to switch to FS
* without a user event.)
*
* Example usage:
```json
"calibration-with-image": {
"kind": "exp-lookit-calibration",
"baseDir": "https://www.mit.edu/~kimscott/placeholderstimuli/",
"audioTypes": [
"ogg",
"mp3"
],
"videoTypes": [
"webm",
"mp4"
],
"calibrationImage": "peekaboo_remy.jpg",
"calibrationLength": 3000,
"calibrationPositions": [
"center",
"left",
"right"
],
"calibrationAudio": "chimes",
"calibrationImageAnimation": "spin"
},
"calibration-with-video": {
"kind": "exp-lookit-calibration",
"baseDir": "https://www.mit.edu/~kimscott/placeholderstimuli/",
"audioTypes": [
"ogg",
"mp3"
],
"videoTypes": [
"webm",
"mp4"
],
"calibrationLength": 3000,
"calibrationPositions": [
"center",
"left",
"right"
],
"calibrationAudio": "chimes",
"calibrationVideo": "attentiongrabber"
},
* ```
* @class Exp-lookit-calibration
* @extends Exp-frame-base
* @uses Full-screen
* @uses Media-reload
* @uses Video-record
* @uses Expand-assets
*/

export default ExpFrameBaseComponent.extend(VideoRecord, PauseUnpause, ExpandAssets, {
Expand Down Expand Up @@ -132,47 +44,24 @@ export default ExpFrameBaseComponent.extend(VideoRecord, PauseUnpause, ExpandAss

frameSchemaProperties: {

/**
Whether to do any video recording during this frame. Default true. Set to false for e.g. last frame where just doing an announcement.
@property {Boolean} doRecording
@default true
*/
doRecording: {
type: 'boolean',
description: 'Whether to do video recording',
default: true
},
/**
* Color of background. See https://developer.mozilla.org/en-US/docs/Web/CSS/color_value
* for acceptable syntax: can use color names ('blue', 'red', 'green', etc.), or
* rgb hex values (e.g. '#800080' - include the '#')
*
* @property {String} backgroundColor
* @default 'black'
*/

backgroundColor: {
type: 'string',
description: 'Color of background',
default: 'white'
},
/**
* Length of single calibration segment in ms.
*
* @property {Number} calibrationLength
* @default 3000
*/

calibrationLength: {
type: 'number',
description: 'length of single calibration segment in ms',
default: 3000
},
/**
* Ordered list of positions to show calibration segment in. Options are
* "center", "left", "right". Ignored if calibrationLength is 0.
*
* @property {Array} calibrationPositions
* @default ["center", "left", "right", "center"]
*/

calibrationPositions: {
type: 'array',
description: 'Ordered list of positions to show calibration',
Expand All @@ -182,60 +71,25 @@ export default ExpFrameBaseComponent.extend(VideoRecord, PauseUnpause, ExpandAss
},
default: ['center', 'left', 'right', 'center']
},
/**
* Audio to play when the attention-grabber is placed at each location (will be
* played once from the start, but cut off if it's longer than calibrationLength).
*
* This can either be an array of `{src: 'url', type: 'MIMEtype'}` objects for
* calibration audio, or just a string to use the full URLs based on `baseDir`.
*
* @property {Object[]} calibrationAudio
* @default []
*/

calibrationAudio: {
anyOf: audioAssetOptions,
description: 'list of objects specifying audio src and type for calibration audio',
default: []
},
/**
* Calibration video (played from start at each calibration position). Supply
* either a calibration video or calibration image, not both.
*
* This can be either an array of {src: 'url', type: 'MIMEtype'} objects or
* just a string like `attentiongrabber` to rely on the `baseDir` and `videoTypes`
* to generate full paths.
*
* @property {Object[]} calibrationVideo
* @default []
*/

calibrationVideo: {
anyOf: videoAssetOptions,
description: 'list of objects specifying video src and type for calibration audio',
default: []
},
/**
* Image to use for calibration - will be placed at each location. Supply
* either a calibration video or calibration image, not both.
*
* This can be either a full URL or just the filename (e.g. "star.png") to
* use the full path based on `baseDir` (e.g. `baseDir/img/star.png`).
*
* @property {String} calibrationImage
* @default []
*/

calibrationImage: {
anyOf: imageAssetOptions,
description: 'Image to use for calibration',
default: ''
},

/**
* Which animation to use for the calibration image. Options are 'bounce', 'spin',
* or '' (empty to not animate).
*
* @property {String} calibrationImageAnimation
* @default []
*/
calibrationImageAnimation: {
type: 'string',
enum: ['bounce', 'spin', ''],
Expand Down Expand Up @@ -338,14 +192,6 @@ export default ExpFrameBaseComponent.extend(VideoRecord, PauseUnpause, ExpandAss

},

reloadObserver: Ember.observer('reloadingMedia', function() {
if (!this.get('reloadingMedia')) { // done with most recent reload
if (this.get('retryCalibrationAudio')) {
$('#player-calibration-audio')[0].play();
}
}
}),

onRecordingStarted() {
if (!this.get('_isPaused')) {
this.enablePausing(true);
Expand Down
38 changes: 0 additions & 38 deletions app/mixins/media-reload.js
View file

This file was deleted.

0 comments on commit 93e7409

Please sign in to comment.