Use the Insert HTML5 Video button in the WordPress editor or use the [videojs] shortcode in your post or page using the following options:
+The location of the h.264/MP4 source for the video.
+The connection and stream parts are determined by splitting the URL on the first ampersand (&) or the last slash (/).
+http://myurl.com/streaming&/is/fun -->
+ connection: http://myurl.com/streaming
+ stream: /is/fun
+
+-or-
+
+http://myurl.com/streaming/is/fun -->
+ connection: http://myurl.com/streaming/is
+ stream: fun
[videojs rtmp="rtmp://video-js.zencoder.com/oceans-clip.mp4"]
+The location of the h.264/MP4 source for the video.
diff --git a/mce-button.js b/mce-button.js index 7855055..9f0eb68 100644 --- a/mce-button.js +++ b/mce-button.js @@ -48,6 +48,11 @@ var form = jQuery('| \ + | \ + The location of the h.264/MP4 stream for the video. | \
+
|---|---|
| \ | \ @@ -125,8 +130,10 @@ //text options var options = { 'mp4' : '', + 'rtmp' : '', 'webm' : '', 'ogg' : '', + 'youtube' : '', 'poster' : '', 'width' : '', 'height' : '', diff --git a/readme.txt b/readme.txt index 76595c0..9df6f64 100755 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === Video.js - HTML5 Video Player for Wordpress === -Contributors: nosecreek, Steve Heffernan, schnere +Contributors: nosecreek, Steve Heffernan, schnere, Stanislav Chernenko Donate link: http://ncrk.ca/videojs Tags: html5, video, player, javascript Requires at least: 2.7 -Tested up to: 3.9 -Stable tag: 4.5.0 +Tested up to: 4.1 +Stable tag: 4.11.3 License: LGPLv3 License URI: http://www.gnu.org/licenses/lgpl-3.0.html @@ -27,6 +27,22 @@ This section describes how to install the plugin and get it working. ##Video Shortcode Options ------------------------- +### rtmp +The location of the h.264/MP4 source for the video. +The connection and stream parts are determined by splitting the URL on the first ampersand (&) or the last slash (/). + +http://myurl.com/streaming&/is/fun --> + connection: http://myurl.com/streaming + stream: /is/fun + +-or- + +http://myurl.com/streaming/is/fun --> + connection: http://myurl.com/streaming/is + stream: fun + + [videojs rtmp="rtmp://cp67126.edgefcs.net/ondemand/&mp4:mediapm/ovp/content/test/video/spacealonehd_sounas_640_300.mp4"] + ### mp4 The location of the h.264/MP4 source for the video. @@ -105,7 +121,7 @@ Text Tracks are a function of HTML5 video for providing time triggered text to t ### All Attributes Example - [videojs mp4="http://video-js.zencoder.com/oceans-clip.mp4" ogg="http://video-js.zencoder.com/oceans-clip.ogg" webm="http://video-js.zencoder.com/oceans-clip.webm" poster="http://video-js.zencoder.com/oceans-clip.png" preload="auto" autoplay="true" width="640" height="264" id="movie-id" class="alignleft" controls="false" muted="true"][track kind="captions" src="http://example.com/path/to/captions.vtt" srclang="en" label="English" default="true"][/videojs] + [videojs rtmp="rtmp://cp67126.edgefcs.net/ondemand/&mp4:mediapm/ovp/content/test/video/spacealonehd_sounas_640_300.mp4" mp4="http://video-js.zencoder.com/oceans-clip.mp4" ogg="http://video-js.zencoder.com/oceans-clip.ogg" webm="http://video-js.zencoder.com/oceans-clip.webm" poster="http://video-js.zencoder.com/oceans-clip.png" preload="auto" autoplay="true" width="640" height="264" id="movie-id" class="alignleft" controls="false" muted="true"][track kind="captions" src="http://example.com/path/to/captions.vtt" srclang="en" label="English" default="true"][/videojs] ##Video.js Settings Screen @@ -119,6 +135,13 @@ Uncheck the *Use the [video] shortcode?* option __only__ if you are using WordPr == Changelog == += 4.11.3 = + +* Updated to use Video.js 4.11.3 +* Updated youtube tech to latest version (https://github.com/eXon/videojs-youtube) +* Change tech order if RTMP used to ['flash', 'html5'], defaults is ['html5','flash'] +* Fixed tinymce button (shortcode for youtube have added later without src) + = 4.5.0 = * Updated to use Video.js 4.5 diff --git a/video-js.php b/video-js.php index 6bb2ca6..570e49c 100755 --- a/video-js.php +++ b/video-js.php @@ -1,14 +1,14 @@ Dustin Lammiman, Steve Heffernan -Version: 4.5.0 +Version: 4.11.3 */ @@ -31,8 +31,8 @@ function register_videojs(){ wp_enqueue_style( 'videojs-plugin' ); if($options['videojs_cdn'] == 'on') { //use the cdn hosted version - wp_register_script( 'videojs', '//vjs.zencdn.net/4.5/video.js' ); - wp_register_style( 'videojs', '//vjs.zencdn.net/4.5/video-js.css' ); + wp_register_script( 'videojs', '//vjs.zencdn.net/4.11.3/video.js' ); + wp_register_style( 'videojs', '//vjs.zencdn.net/4.11.3/video-js.css' ); wp_enqueue_style( 'videojs' ); } else { //use the self hosted version wp_register_script( 'videojs', plugins_url( 'videojs/video.js' , __FILE__ ) ); @@ -70,28 +70,6 @@ function videojs_custom_colors() { } add_action( 'wp_head', 'videojs_custom_colors' ); - -/* Prevent mixed content warnings for the self-hosted version */ -function add_videojs_swf(){ - $options = get_option('videojs_options'); - if($options['videojs_cdn'] != 'on') { - echo ' - - '; - } else { - echo ' - - '; - } -} -add_action('wp_head','add_videojs_swf'); - - /* The [video] or [videojs] shortcode */ function video_shortcode($atts, $content=null){ add_videojs_header(); @@ -100,6 +78,7 @@ function video_shortcode($atts, $content=null){ extract(shortcode_atts(array( 'mp4' => '', + 'rtmp' => '', 'webm' => '', 'ogg' => '', 'youtube' => '', @@ -117,6 +96,11 @@ function video_shortcode($atts, $content=null){ $dataSetup = array(); + // Use self hosted version of swf + if($options['videojs_cdn'] != 'on') { + $dataSetup['flash']['swf'] = plugins_url( 'videojs/video-js.swf' , __FILE__ ); + } + // ID is required for multiple videos to work if ($id == '') $id = 'example_video_id_'.rand(); @@ -126,6 +110,14 @@ function video_shortcode($atts, $content=null){ $mp4_source = ' |