Ticket #23926: 23926.2.diff

wp-admin/includes/media.php

@@ -224 +224 @@
         $title = $name;
         $content = '';
 
+        if ( preg_match( '#^audio#', $type ) ) {
+                $meta = wp_read_audio_metadata( $file );
+                if ( ! empty( $meta['title'] ) )
+                        $title = $meta['title'];
+
+                $content = trim( sprintf(
+                        '%s%s%s.',
+                        ! empty( $title ) ? '"' . $title . '"' : '',
+                        ! empty( $meta['album'] ) ? sprintf( ' %s %s', __( 'from' ), $meta['album'] ) : '',
+                        ! empty( $meta['artist'] ) ? sprintf( ' %s %s', __( 'by' ), $meta['artist'] ) : ''
+                ) );
+
+                if ( ! empty( $meta['year'] ) )
+                        $content .= sprintf( ' %s %d.', __( 'Released:' ), $meta['year'] );
+
+                if ( ! empty( $meta['track_number'] ) ) {
+                        list( $track, $length ) = explode( '/', $meta['track_number'] );
+                        $content .= sprintf( ' %s %d %s %d.', __( 'Track' ), $track, __( 'of' ), $length );
+                }
+
+                if ( ! empty( $meta['genre'] ) )
+                        $content .= sprintf( ' %s %s.', __( 'Genre:' ), $meta['genre'] );
+
+        } elseif ( preg_match( '#^video#', $type ) ) {
+                $meta = wp_read_video_metadata( $file );
         // use image exif/iptc data for title and caption defaults if possible
-        if ( $image_meta = @wp_read_image_metadata($file) ) {
+        } elseif ( $image_meta = @wp_read_image_metadata( $file ) ) {
                 if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
                         $title = $image_meta['title'];
                 if ( trim( $image_meta['caption'] ) )
@@ -2313 +2338 @@
         elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'video/' ) ):
 
                 $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 ( $w < $meta['width'] )
+                        $h = ceil( $w * 0.6 );
+
                 $shortcode = sprintf( '[video src="%s"%s%s]',
                         $att_url,
-                        empty( $meta['width'] ) ? '' : sprintf( ' width="%d"', $meta['width'] ),
-                        empty( $meta['height'] ) ? '' : sprintf( ' height="%d"', $meta['height'] )
+                        empty( $meta['width'] ) ? '' : sprintf( ' width="%d"', $w ),
+                        empty( $meta['height'] ) ? '' : sprintf( ' height="%d"', $h )
                 );
                 echo do_shortcode( $shortcode );
 
@@ -2390 +2422 @@
                 ?></strong>
         </div>
 
-<?php if ( $media_dims ) : ?>
+<?php
+        if ( preg_match( '#^audio|video#', $post->post_mime_type ) ):
+
+                if ( ! empty( $meta['mime_type'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Mime-type:' ); ?> <strong><?php echo $meta['mime_type']; ?></strong>
+                </div>
+        <?php
+                endif;
+
+                if ( ! empty( $meta['bitrate'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Bitrate:' ); ?> <strong><?php
+                                echo $meta['bitrate'] / 1000, 'kb/s';
+
+                                if ( ! empty( $meta['bitrate_mode'] ) )
+                                        echo ' ', strtoupper( $meta['bitrate_mode'] );
+
+                        ?></strong>
+                </div>
+        <?php
+                endif;
+
+                if ( ! empty( $meta['audio']['dataformat'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Audio Format:' ); ?> <strong><?php echo $meta['audio']['dataformat']; ?></strong>
+                </div>
+        <?php
+                endif;
+
+                if ( ! empty( $meta['audio']['codec'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Audio Codec:' ); ?> <strong><?php echo $meta['audio']['codec']; ?></strong>
+                </div>
+        <?php
+                endif;
+
+                if ( ! empty( $meta['year'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Year:' ); ?> <strong><?php echo $meta['year']; ?></strong>
+                </div>
+        <?php
+                endif;
+
+                if ( ! empty( $meta['genre'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Genre:' ); ?> <strong><?php echo $meta['genre']; ?></strong>
+                </div>
+        <?php
+                endif;
+
+                if ( ! empty( $meta['length_formatted'] ) ) : ?>
+                <div class="misc-pub-section">
+                        <?php _e( 'Length:' ); ?> <strong><?php echo $meta['length_formatted']; ?></strong>
+                </div>
+        <?php
+                endif;
+
+        endif;
+
+        if ( $media_dims ) : ?>
         <div class="misc-pub-section">
                 <?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
         </div>