<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12043] sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2: WordPress.TV: Don't link to the mp4 formats which have no audio, expose the original uploaded file, and add these to the WordPress.tv/api/videos.json API.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12043">12043</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12043","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-02 05:03:46 +0000 (Fri, 02 Sep 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordPress.TV: Don't link to the mp4 formats which have no audio, expose the original uploaded file, and add these to the WordPress.tv/api/videos.json API.
Fixes <a href="http://meta.trac.wordpress.org/ticket/6000">#6000</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2pluginswordpresstvrestwordpresstvrestphp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-rest/wordpresstv-rest.php</a></li>
<li><a href="#sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2sidebarsinglephp">sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2pluginswordpresstvrestwordpresstvrestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-rest/wordpresstv-rest.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-rest/wordpresstv-rest.php 2022-09-02 05:01:33 UTC (rev 12042)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-rest/wordpresstv-rest.php 2022-09-02 05:03:46 UTC (rev 12043)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,9 +96,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'location' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'producer' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mp4' => array(),
- 'ogg' => array(),
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mp4' => array(),
+ 'ogg' => array(),
+ 'original' => false,
+ ),
+ 'subtitles' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( [ 'speakers', 'event', 'language', 'tags', 'category' ] as $tax ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,20 +146,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_videos = array_keys( find_all_videopress_shortcodes( $post->post_content ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_videos ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_video = video_get_info_by_guid( $post_videos[0] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $api_data = video_get_single_response( $post_video );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ogg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Original uploaded file, may vary in format.
+ $video['video']['original'] = $api_data['original'];
+
+ // Ogg - No longer generated as of May 2021
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $link = video_highest_resolution_ogg( $post_video ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $video['video']['ogg']['low'] = $link;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // MP4
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // MP4 - Audio no longer available in all formats
</ins><span class="cx" style="display: block; padding: 0 10px"> $mp4_formats = array( 'low' => 'fmt_std', 'med' => 'fmt_dvd', 'high' => 'fmt_hd' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $mp4_formats as $mp4_field => $mp4_format ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $link = video_url_by_format( $post_video, $mp4_format ) ) {
- $video['video']['mp4'][ $mp4_field ] = $link;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if HLS transcoded, no audio, no need to link to it.
+ if ( ! empty( $api_data['files'][ str_replace( 'fmt_', '', $mp4_format ) ]['hls'] ) ) {
+ continue;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $video['video']['mp4'][ $mp4_field ] = video_url_by_format( $post_video, $mp4_format );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Expose the subtitles
+ $video['subtitles'] = (array) $api_data['subtitles'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response['videos'][] = $video;
</span></span></pre></div>
<a id="sitestrunkwordpresstvpublic_htmlwpcontentthemeswptv2sidebarsinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php 2022-09-02 05:01:33 UTC (rev 12042)
+++ sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php 2022-09-02 05:03:46 UTC (rev 12043)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,14 +25,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'find_all_videopress_shortcodes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $videos = array_keys( find_all_videopress_shortcodes( $originalcontent ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $videos ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $video = video_get_info_by_guid( $videos[0] );
- $formats = array( 'fmt_std' => 'Low', 'fmt_dvd' => 'Med', 'fmt_hd' => 'High', 'fmt1_ogg' => 'Low' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $video = video_get_info_by_guid( $videos[0] );
+ $api_data = video_get_single_response( $video );
+ $formats = array( 'fmt_std' => 'Low', 'fmt_dvd' => 'Med', 'fmt_hd' => 'High', 'fmt1_ogg' => 'Low' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $mp4_links = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ogg_link = NULL;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ogg_link = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $formats as $format => $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'fmt1_ogg' == $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = video_highest_resolution_ogg( $video );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Check if HLS transcoded, no audio, no need to link to it.
+ if ( ! empty( $api_data['files'][ str_replace( 'fmt_', '', $format ) ]['hls'] ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = video_url_by_format( $video, $format );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,6 +55,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $api_data['original'] ) ) {
+ $mp4_links[] = "<a href='{$api_data['original']}'>Original</a>";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $mp4_links ) || ! empty( $ogg_link ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h5>Download</h5>
</span></span></pre>
</div>
</div>
</body>
</html>