Changeset 27328

Timestamp:

02/28/2014 09:27:40 PM (12 years ago)

Author:

wonderboymusic

Message:

• Videos should always render at the same aspect ratio.
• Don't force a pseudo-mime-type for .m4v files
• Uniformly adapt to $content_width when setting video dimensions on the front end
• Add the height attribute to the initial <video> in the video playlist JS template
• Add some defensive/responsive CSS for a/v on the Edit Media page

See #27243.

Location:

trunk/src

Files:

• wp-admin/css/media.css (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/media.php (modified) (6 diffs)

trunk/src/wp-admin/css/media.css

@@ -641 +641 @@
 }
 
+audio, video {
+    display: inline-block;
+    max-width: 100%;
+}
+
+.mejs-container {
+    width: 100%;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */

trunk/src/wp-admin/includes/media.php

@@ -2641 +2641 @@
 
         $meta = wp_get_attachment_metadata( $attachment_id );
-        $w = ! empty( $meta['width'] ) ? min( $meta['width'], 600 ) : 0;
-        $h = 0;
-        if ( ! empty( $meta['height'] ) )
-            $h = $meta['height'];
-        if ( $h && $w < $meta['width'] )
+        $w = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
+        $h = ! empty( $meta['height'] ) ? $meta['height'] : 0;
+        if ( $h && $w < $meta['width'] ) {
             $h = round( ( $meta['height'] * $w ) / $meta['width'] );
+        }
 
         $attr = array( 'src' => $att_url );
-
-        if ( ! empty( $meta['width' ] ) )
+        if ( ! empty( $w ) && ! empty( $h ) ) {
             $attr['width'] = $w;
-
-        if ( ! empty( $meta['height'] ) )
             $attr['height'] = $h;
+        }
 
         echo wp_video_shortcode( $attr );

trunk/src/wp-includes/media.php

@@ -1059 +1059 @@
 
     $outer = 22; // default padding and border of wrapper
+
+    $default_width = 640;
+    $default_height = 360;
+
     $theme_width = $content_width - $outer;
+    $theme_height = round( ( $default_height * $theme_width ) / $default_width );
+
     $data = compact( 'type', 'style' );
 
@@ -1091 +1097 @@
 
             if ( 'video' === $type ) {
-                $width = empty( $meta['width'] ) ? 640 : $meta['width'];
-                $height = empty( $meta['height'] ) ? 360 : $meta['height'];
-                $theme_height = round( ( $height * $theme_width ) / $width );
+                if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+                    $width = $meta['width'];
+                    $height = $meta['height'];
+                    $theme_height = round( ( $height * $theme_width ) / $width );
+                } else {
+                    $width = $default_width;
+                    $height = $default_height;
+                }
+
                 $track['dimensions'] = array(
                     'original' => compact( 'width', 'height' ),
@@ -1166 +1178 @@
     <div class="wp-playlist-current-item"></div>
     <?php endif ?>
-    <<?php echo $safe_type ?> controls="controls" preload="metadata" width="<?php echo (int) $theme_width ?>"></<?php echo $safe_type ?>>
+    <<?php echo $safe_type ?> controls="controls" preload="metadata" width="<?php
+        echo (int) $theme_width;
+    ?>"<?php if ( 'video' === $safe_type ):
+        echo ' height="', (int) $theme_height, '"';
+    endif; ?>></<?php echo $safe_type ?>>
     <div class="wp-playlist-next"></div>
     <div class="wp-playlist-prev"></div>
@@ -1445 +1461 @@
         'autoplay' => '',
         'preload'  => 'metadata',
+        'width'    => 640,
         'height'   => 360,
-        'width'    => empty( $content_width ) ? 640 : $content_width,
     );
 
@@ -1455 +1471 @@
     extract( $atts );
 
-    $w = $width;
-    $h = $height;
-    if ( is_admin() && $width > 600 )
-        $w = 600;
-    elseif ( ! is_admin() && $w > $defaults_atts['width'] )
-        $w = $defaults_atts['width'];
-
-    if ( $w < $width )
-        $height = round( ( $h * $w ) / $width );
-
-    $width = $w;
+    if ( is_admin() ) {
+        // shrink the video so it isn't huge in the admin
+        if ( $width > $defaults_atts['width'] ) {
+            $height = round( ( $height * $defaults_atts['width'] ) / $width );
+            $width = $defaults_atts['width'];
+        }
+    } else {
+        // if the video is bigger than the theme
+        if ( $width > $content_width ) {
+            $height = round( ( $height * $content_width ) / $width );
+            $width = $content_width;
+        }
+    }
 
     $yt_pattern = '#^https?://(:?www\.)?(:?youtube\.com/watch|youtu\.be/)#';
@@ -1546 +1564 @@
             } else {
                 $type = wp_check_filetype( $$fallback, wp_get_mime_types() );
-                // m4v sometimes shows up as video/mpeg which collides with mp4
-                if ( 'm4v' === $type['ext'] )
-                    $type['type'] = 'video/m4v';
             }
             $html .= sprintf( $source, $type['type'], esc_url( $$fallback ) );