<!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>[181006] trunk/Source/WebCore</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 { 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">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181006">181006</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-03-04 11:26:22 -0800 (Wed, 04 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] YouTube playback at 1.5x speed has audible distortion
https://bugs.webkit.org/show_bug.cgi?id=142280
Reviewed by Eric Carlson.
Use the high-quality AVAudioTimePitchAlgorithmSpectral algorithm for the
AVSampleBufferAudioRenderer rather than its default value of
AVAudioTimePitchAlgorithmTimeDomain.
Drive-by fix:
Might as well add support for MediaPlayer::setPreservesPitch() while we're
changing the audio pitch algorithm. If preservesPitch() is false use the
AVAudioTimePitchAlgorithmVarispeed algorithm in both AVFObjC-based media players
(MediaPlayerPrivateAVFoundationObjC & MediaPlayerPrivateMediaSourceAVFObjC).
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setPreservesPitch):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setRateDouble): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setPreservesPitch):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181005 => 181006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-04 19:22:59 UTC (rev 181005)
+++ trunk/Source/WebCore/ChangeLog 2015-03-04 19:26:22 UTC (rev 181006)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-03-04 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] YouTube playback at 1.5x speed has audible distortion
+ https://bugs.webkit.org/show_bug.cgi?id=142280
+
+ Reviewed by Eric Carlson.
+
+ Use the high-quality AVAudioTimePitchAlgorithmSpectral algorithm for the
+ AVSampleBufferAudioRenderer rather than its default value of
+ AVAudioTimePitchAlgorithmTimeDomain.
+
+ Drive-by fix:
+
+ Might as well add support for MediaPlayer::setPreservesPitch() while we're
+ changing the audio pitch algorithm. If preservesPitch() is false use the
+ AVAudioTimePitchAlgorithmVarispeed algorithm in both AVFObjC-based media players
+ (MediaPlayerPrivateAVFoundationObjC & MediaPlayerPrivateMediaSourceAVFObjC).
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setPreservesPitch):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setRateDouble): Deleted.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setPreservesPitch):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer):
+
+2015-03-04 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> [MSE][EME][Mac] Calling close on a MediaKeysSession will cause many decoding errors to be emitted
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142285
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (181005 => 181006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-03-04 19:22:59 UTC (rev 181005)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-03-04 19:26:22 UTC (rev 181006)
</span><span class="lines">@@ -178,6 +178,7 @@
</span><span class="cx"> virtual void checkPlayability();
</span><span class="cx"> virtual void setRateDouble(double) override;
</span><span class="cx"> virtual double rate() const;
</span><ins>+ void setPreservesPitch(bool) override;
</ins><span class="cx"> virtual void seekToTime(const MediaTime&, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance);
</span><span class="cx"> virtual unsigned long long totalBytes() const;
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> platformBufferedTimeRanges() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (181005 => 181006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-03-04 19:22:59 UTC (rev 181005)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-03-04 19:26:22 UTC (rev 181006)
</span><span class="lines">@@ -182,6 +182,8 @@
</span><span class="cx"> SOFT_LINK_CLASS(CoreImage, CIContext)
</span><span class="cx"> SOFT_LINK_CLASS(CoreImage, CIImage)
</span><span class="cx">
</span><ins>+SOFT_LINK_POINTER(AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString*)
+SOFT_LINK_POINTER(AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString*)
</ins><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicVisual, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicAudible, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaTypeClosedCaption, NSString *)
</span><span class="lines">@@ -206,6 +208,8 @@
</span><span class="cx"> #define AVAssetImageGenerator getAVAssetImageGeneratorClass()
</span><span class="cx"> #define AVMetadataItem getAVMetadataItemClass()
</span><span class="cx">
</span><ins>+#define AVAudioTimePitchAlgorithmSpectral getAVAudioTimePitchAlgorithmSpectral()
+#define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed()
</ins><span class="cx"> #define AVMediaCharacteristicVisual getAVMediaCharacteristicVisual()
</span><span class="cx"> #define AVMediaCharacteristicAudible getAVMediaCharacteristicAudible()
</span><span class="cx"> #define AVMediaTypeClosedCaption getAVMediaTypeClosedCaption()
</span><span class="lines">@@ -962,6 +966,8 @@
</span><span class="cx"> for (NSString *keyName in itemKVOProperties())
</span><span class="cx"> [m_avPlayerItem.get() addObserver:m_objcObserver.get() forKeyPath:keyName options:options context:(void *)MediaPlayerAVFoundationObservationContextPlayerItem];
</span><span class="cx">
</span><ins>+ [m_avPlayerItem setAudioTimePitchAlgorithm:(player()->preservesPitch() ? AVAudioTimePitchAlgorithmSpectral : AVAudioTimePitchAlgorithmVarispeed)];
+
</ins><span class="cx"> if (m_avPlayer)
</span><span class="cx"> setAVPlayerItem(m_avPlayerItem.get());
</span><span class="cx">
</span><span class="lines">@@ -969,7 +975,7 @@
</span><span class="cx"> AtomicString value;
</span><span class="cx"> if (player()->doesHaveAttribute("data-youtube-id", &value))
</span><span class="cx"> [m_avPlayerItem.get() setDataYouTubeID: value];
</span><del>- #endif
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
</span><span class="cx"> const NSTimeInterval legibleOutputAdvanceInterval = 2;
</span><span class="lines">@@ -1320,7 +1326,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setRateDouble(double rate)
</span><del>-
</del><span class="cx"> {
</span><span class="cx"> setDelayCallbacks(true);
</span><span class="cx"> m_cachedRate = rate;
</span><span class="lines">@@ -1336,6 +1341,12 @@
</span><span class="cx"> return m_cachedRate;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundationObjC::setPreservesPitch(bool preservesPitch)
+{
+ if (m_avPlayerItem)
+ [m_avPlayerItem setAudioTimePitchAlgorithm:(preservesPitch ? AVAudioTimePitchAlgorithmSpectral : AVAudioTimePitchAlgorithmVarispeed)];
+}
+
</ins><span class="cx"> std::unique_ptr<PlatformTimeRanges> MediaPlayerPrivateAVFoundationObjC::platformBufferedTimeRanges() const
</span><span class="cx"> {
</span><span class="cx"> auto timeRanges = std::make_unique<PlatformTimeRanges>();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (181005 => 181006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-03-04 19:22:59 UTC (rev 181005)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-03-04 19:26:22 UTC (rev 181006)
</span><span class="lines">@@ -131,6 +131,8 @@
</span><span class="cx"> virtual bool seeking() const override;
</span><span class="cx"> virtual void setRateDouble(double) override;
</span><span class="cx">
</span><ins>+ void setPreservesPitch(bool) override;
+
</ins><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> seekable() const override;
</span><span class="cx"> virtual MediaTime maxMediaTimeSeekable() const override;
</span><span class="cx"> virtual MediaTime minMediaTimeSeekable() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (181005 => 181006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-03-04 19:22:59 UTC (rev 181005)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-03-04 19:26:22 UTC (rev 181006)
</span><span class="lines">@@ -62,7 +62,12 @@
</span><span class="cx"> SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVStreamSession);
</span><span class="cx"> SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVVideoPerformanceMetrics)
</span><span class="cx">
</span><ins>+SOFT_LINK_CONSTANT(AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString*)
+SOFT_LINK_CONSTANT(AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString*)
</ins><span class="cx"> SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef)
</span><ins>+
+#define AVAudioTimePitchAlgorithmSpectral getAVAudioTimePitchAlgorithmSpectral()
+#define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed()
</ins><span class="cx"> #define kCMTimebaseNotification_EffectiveRateChanged getkCMTimebaseNotification_EffectiveRateChanged()
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="lines">@@ -91,6 +96,7 @@
</span><span class="cx"> @interface AVSampleBufferAudioRenderer : NSObject
</span><span class="cx"> - (void)setVolume:(float)volume;
</span><span class="cx"> - (void)setMuted:(BOOL)muted;
</span><ins>+@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="lines">@@ -470,6 +476,13 @@
</span><span class="cx"> [m_synchronizer setRate:m_rate];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateMediaSourceAVFObjC::setPreservesPitch(bool preservesPitch)
+{
+ NSString *algorithm = preservesPitch ? AVAudioTimePitchAlgorithmSpectral : AVAudioTimePitchAlgorithmVarispeed;
+ for (auto& renderer : m_sampleBufferAudioRenderers)
+ [renderer setAudioTimePitchAlgorithm:algorithm];
+}
+
</ins><span class="cx"> MediaPlayer::NetworkState MediaPlayerPrivateMediaSourceAVFObjC::networkState() const
</span><span class="cx"> {
</span><span class="cx"> return m_networkState;
</span><span class="lines">@@ -772,6 +785,7 @@
</span><span class="cx">
</span><span class="cx"> [audioRenderer setMuted:m_player->muted()];
</span><span class="cx"> [audioRenderer setVolume:m_player->volume()];
</span><ins>+ [audioRenderer setAudioTimePitchAlgorithm:(m_player->preservesPitch() ? AVAudioTimePitchAlgorithmSpectral : AVAudioTimePitchAlgorithmVarispeed)];
</ins><span class="cx">
</span><span class="cx"> [m_synchronizer addRenderer:audioRenderer];
</span><span class="cx"> m_player->client().mediaPlayerRenderingModeChanged(m_player);
</span></span></pre>
</div>
</div>
</body>
</html>