videojs-record
Advanced tools
Comparing version 1.2.0 to 1.3.0
{ | ||
"name": "videojs-record", | ||
"version": "1.2.0", | ||
"version": "1.3.0", | ||
"homepage": "https://github.com/collab-project/videojs-record", | ||
@@ -37,3 +37,3 @@ "description": "A video.js plugin for recording audio/video/image files.", | ||
"wavesurfer.js": ">=1.0.57", | ||
"videojs-wavesurfer": ">=1.1.0", | ||
"videojs-wavesurfer": ">=1.2.0", | ||
"recordrtc": ">=5.2.9" | ||
@@ -40,0 +40,0 @@ }, |
videojs-record changelog | ||
======================== | ||
1.3.0 - 2016/03/25 | ||
------------------ | ||
- add `enumerateDevices` API (#16) | ||
- prevent invalid or negative value in `formatTime` (#46 by @zang) | ||
1.2.0 - 2016/02/27 | ||
@@ -173,2 +180,2 @@ ------------------ | ||
- Initial release | ||
- Initial release |
@@ -108,2 +108,5 @@ 'use strict'; | ||
}, | ||
htmllint: { | ||
all: ['examples/**/*.html'] | ||
}, | ||
watch: { | ||
@@ -116,4 +119,16 @@ gruntfile: { | ||
files: '<%= jshint.src.src %>', | ||
tasks: ['jshint:src'] | ||
tasks: ['jshint:src', 'jscs'] | ||
}, | ||
examples: { | ||
files: '<%= htmllint.all %>', | ||
tasks: ['htmllint'] | ||
}, | ||
json: { | ||
files: ['lang/*.json', 'src/css/font/icons.json'], | ||
tasks: ['jsonlint'] | ||
}, | ||
languages: { | ||
files: 'lang/*.json', | ||
tasks: ['vjslanguages'] | ||
} | ||
}, | ||
@@ -137,9 +152,12 @@ vjslanguages: { | ||
grunt.loadNpmTasks('grunt-jscs'); | ||
grunt.loadNpmTasks('grunt-html'); | ||
grunt.loadNpmTasks('grunt-jsonlint'); | ||
grunt.registerTask('font', ['generate-font', 'update-base64', 'sass', 'wrapcodepoints']); | ||
grunt.registerTask('pretask', ['jshint', 'jscs', 'jsonlint', 'concat', 'vjslanguages', 'sass', 'wrapcodepoints']); | ||
grunt.registerTask('font', ['generate-font', 'update-base64', 'sass', | ||
'wrapcodepoints']); | ||
grunt.registerTask('pretask', ['jshint', 'jscs', 'jsonlint', 'htmllint', | ||
'concat', 'vjslanguages', 'sass', 'wrapcodepoints']); | ||
grunt.registerTask('default', ['pretask', 'build', 'uglify']); | ||
grunt.registerMultiTask('build', 'build and copy css and fonts', function(){ | ||
grunt.registerMultiTask('build', 'build and copy css and fonts', function() { | ||
var srcDir = this.data; | ||
@@ -146,0 +164,0 @@ var distStylesheet = 'dist/css/videojs.record.css' |
{ | ||
"name": "videojs-record", | ||
"version": "1.2.0", | ||
"version": "1.3.0", | ||
"description": "A video.js plugin for recording audio/video/image files.", | ||
@@ -38,6 +38,8 @@ "main": "src/js/videojs.record.js", | ||
"wavesurfer.js": ">=1.0.57", | ||
"videojs-wavesurfer": ">=1.1.0", | ||
"videojs-wavesurfer": ">=1.2.0", | ||
"recordrtc": ">=5.2.9" | ||
}, | ||
"devDependencies": { | ||
"blueimp-file-upload": ">=9.11.2", | ||
"fine-uploader": ">=5.4.1", | ||
"grunt": ">=0.4.5", | ||
@@ -49,2 +51,3 @@ "grunt-contrib-concat": ">=0.4.0", | ||
"grunt-contrib-watch": ">=0.6.1", | ||
"grunt-html": "^6.0.0", | ||
"grunt-jscs": "^2.7.0", | ||
@@ -54,13 +57,11 @@ "grunt-jsonlint": "^1.0.7", | ||
"grunt-videojs-languages": ">=0.0.4", | ||
"lamejs": ">=1.0.0", | ||
"libvorbis.js": ">=1.1.1", | ||
"lodash": "^3.9.3", | ||
"material-design-icons": "^2.0.0", | ||
"opus-recorder": ">=0.4.4", | ||
"recorderjs": "https://github.com/mattdiamond/Recorderjs.git", | ||
"time-grunt": "^1.2.1", | ||
"videojs-font": ">=1.3.0", | ||
"webfonts-generator": "^0.2.4", | ||
"time-grunt": "^1.2.1", | ||
"libvorbis.js": ">=1.1.1", | ||
"recorderjs": "https://github.com/mattdiamond/Recorderjs.git", | ||
"lamejs": ">=1.0.0", | ||
"opus-recorder": ">=0.4.4", | ||
"blueimp-file-upload": ">=9.11.2", | ||
"fine-uploader": ">=5.4.1" | ||
"webfonts-generator": "^0.2.4" | ||
}, | ||
@@ -67,0 +68,0 @@ "author": "Collab", |
Video.js Record | ||
=============== | ||
A Video.js plugin for recording audio/video/image files. | ||
Video.js plugin for recording audio/video/image files. | ||
@@ -58,4 +58,4 @@ <img title="Screenshot" src="examples/img/screenshot.png?raw=true" width="329"> | ||
```html | ||
<link href="//vjs.zencdn.net/5.7.1/video-js.css" rel="stylesheet"> | ||
<script src="//vjs.zencdn.net/5.7.1/video.min.js"></script> | ||
<link href="//vjs.zencdn.net/5.8.0/video-js.css" rel="stylesheet"> | ||
<script src="//vjs.zencdn.net/5.8.0/video.min.js"></script> | ||
``` | ||
@@ -197,2 +197,3 @@ | ||
| `getDevice` | Start the audio and/or video device(s). | | ||
| `enumerateDevices` | [Get async list of media input and output devices](#controlling-the-input-and-output-devices) available on the system. | | ||
@@ -218,2 +219,4 @@ Events | ||
| `finishRecord` | The recorded stream or image is available. [Check the](#get-recorded-data) `player.recordedData` object for the recorded data. | | ||
| `enumerateReady` | `enumerateDevices` returned the devices successfully. The list of devices is stored in the `player.recorder.devices` array. | | ||
| `enumerateError` | An error occured after calling `enumerateDevices`. Check the `player.enumerateErrorCode` property for an description of the error. | | ||
@@ -224,3 +227,4 @@ Media Constraints | ||
[Media stream constraints](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#Parameters) | ||
allow you to specify the types of media to request, along with any requirements for each type. | ||
allow you to specify the types of media to request, along with any requirements | ||
for each type. | ||
@@ -274,5 +278,2 @@ The following example shows how to change the camera resolution to 1280 by 720 | ||
Check the [jquery.fileupload](https://github.com/collab-project/videojs-record/blob/master/examples/upload/jquery.fileupload.html) or [Fine Uploader](https://github.com/collab-project/videojs-record/blob/master/examples/upload/fine-uploader.html) examples on how to upload the | ||
data to a server. | ||
Note that in the Chrome browser `player.recordedData` returns an object with | ||
@@ -282,2 +283,14 @@ `audio` and `video` properties when recording both audio/video. In Firefox | ||
Check the [jquery.fileupload](https://github.com/collab-project/videojs-record/blob/master/examples/upload/jquery.fileupload.html) or [Fine Uploader](https://github.com/collab-project/videojs-record/blob/master/examples/upload/fine-uploader.html) | ||
examples on how to upload the data to a server. | ||
Controlling the input and output devices | ||
---------------------------------------- | ||
Use `enumerateDevices` to get a list of the available input and output devices | ||
on the user's system, e.g. `FaceTime HD-camera`, `default (Built-in microphone)` | ||
etc. | ||
Check out the `enumerateDevices` example ([demo](https://collab-project.github.io/videojs-record/examples/enumerate-devices.html) / [source](https://github.com/collab-project/videojs-record/blob/master/examples/enumerate-devices.html)). | ||
Customizing controls | ||
@@ -407,3 +420,3 @@ -------------------- | ||
<script src="videojs-record/dist/lang/nl.js"></script> | ||
<script src="//vjs.zencdn.net/5.7.1/lang/nl.js"></script> | ||
<script src="//vjs.zencdn.net/5.8.0/lang/nl.js"></script> | ||
``` | ||
@@ -410,0 +423,0 @@ |
@@ -14,2 +14,2 @@ Font | ||
See the videojs `font` project documentation for more info: | ||
https://github.com/videojs/font/blob/master/README.md | ||
https://github.com/videojs/font/blob/master/README.md |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
480
1796933
22
72
4988
Updatedvideojs-wavesurfer@>=1.2.0