merge develop

Author: DavidCramer

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-video.php

@@ -52,14 +52,14 @@ class Video {
 	 *
 	 * @var string
 	 */
-	const PLAYER_VER = '1.3.3';
+	const PLAYER_VER = '1.4.0';
 
 	/**
 	 * Cloudinary Core Version.
 	 *
 	 * @var string
 	 */
-	const CORE_VER = '2.6.2';
+	const CORE_VER = '2.6.3';
 
 	/**
 	 * Meta key to store usable video transformations for an attachment.
@@ -220,6 +220,7 @@ public function filter_video_shortcode( $html, $attr ) {
 
 		if ( isset( $attr['autoplay'] ) ) {
 			$args['autoplay'] = 'true' === $attr['autoplay'];
+			$args['muted'] = 'true' === $attr['autoplay'];
 		}
 		if ( isset( $attr['loop'] ) ) {
 			$args['loop'] = 'true' === $attr['loop'];
@@ -285,6 +286,7 @@ public function filter_video_tags( $content ) {
 			// Enable Autoplay for this video.
 			if ( false !== strpos( $tag, 'autoplay' ) ) {
 				$args['autoplayMode'] = $this->config['video_autoplay_mode']; // if on, use defined mode.
+				$args['muted'] = 'always' === $this->config['video_autoplay_mode'];
 			}
 			// Enable Loop.
 			if ( false !== strpos( $tag, 'loop' ) ) {
@@ -348,7 +350,6 @@ public function print_video_scripts() {
 				$default       = array(
 					'publicId'    => $cloudinary_id,
 					'sourceTypes' => array( $video['format'] ), // @todo Make this based on eager items as mentioned above.
-					'controls'    => 'on' === $this->config['video_controls'] ? true : false,
 					'autoplay'    => 'off' !== $this->config['video_autoplay_mode'] ? true : false,
 					'loop'        => 'on' === $this->config['video_loop'] ? true : false,
 				);
@@ -363,9 +364,9 @@ public function print_video_scripts() {
 				if ( empty( $config['size'] ) && ! empty( $config['transformation'] ) && ! $this->media->get_crop_from_transformation( $config['transformation'] ) ) {
 					$config['fluid'] = true;
 				}
-
+				
+				$config['controls'] = 'on' === $this->config['video_controls'] ? true : false;
 				$cld_videos[ $instance ] = $config;
-
 			}
 
 			if ( empty( $cld_videos ) ) {

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-global-video-transformations.php

@@ -60,6 +60,12 @@
 			'condition' => array(
 				'video_player' => 'cld',
 			),
+			'description'       => sprintf(
+				// translators: Placeholders are <a> tags.
+				__( 'Please note that when choosing "always", the video will autoplay without sound (muted). This is a built-in browser feature and applies to all major browsers.%1$sRead more about muted autoplay%2$s', 'cloudinary' ),
+				'<br><a href="https://developers.google.com/web/updates/2016/07/autoplay" target="_blank">',
+				'</a>',
+			),
 		),
 
 		'video_loop'          => array(