<!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>[210974] trunk/Source/ThirdParty/libwebrtc</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/210974">210974</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-20 11:41:55 -0800 (Fri, 20 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] libwebrtc H.264 codec is using VTB only for IOS
https://bugs.webkit.org/show_bug.cgi?id=167245
Patch by Youenn Fablet <youennf@gmail.com> on 2017-01-20
Reviewed by Alex Christensen.
* Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc: Removing WEBRTC_IOS flag.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartylibwebrtcChangeLog">trunk/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjcFrameworkClassesvideotoolboxvideocodecfactorycc">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (210973 => 210974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-01-20 18:43:44 UTC (rev 210973)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-01-20 19:41:55 UTC (rev 210974)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-01-20 Youenn Fablet <youennf@gmail.com>
+
+ [WebRTC] libwebrtc H.264 codec is using VTB only for IOS
+ https://bugs.webkit.org/show_bug.cgi?id=167245
+
+ Reviewed by Alex Christensen.
+
+ * Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc: Removing WEBRTC_IOS flag.
+
</ins><span class="cx"> 2017-01-19 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Upload libwebrtc code base
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjcFrameworkClassesvideotoolboxvideocodecfactorycc"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc (210973 => 210974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc 2017-01-20 18:43:44 UTC (rev 210973)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc 2017-01-20 19:41:55 UTC (rev 210974)
</span><span class="lines">@@ -12,10 +12,8 @@
</span><span class="cx"> #include "webrtc/base/logging.h"
</span><span class="cx"> #include "webrtc/common_video/h264/profile_level_id.h"
</span><span class="cx"> #include "webrtc/media/base/codec.h"
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h"
</span><span class="cx"> #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h"
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // TODO(kthelgason): delete this when CreateVideoDecoder takes
</span><span class="cx"> // a cricket::VideoCodec instead of webrtc::VideoCodecType.
</span><span class="lines">@@ -38,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() {
</span><span class="cx"> // Hardware H264 encoding only supported on iOS for now.
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> // TODO(magjed): Push Constrained High profile as well when negotiation is
</span><span class="cx"> // ready, http://crbug/webrtc/6337.
</span><span class="cx"> cricket::VideoCodec constrained_baseline(cricket::kH264CodecName);
</span><span class="lines">@@ -52,7 +49,6 @@
</span><span class="cx"> constrained_baseline.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1");
</span><span class="cx"> constrained_baseline.SetParam(cricket::kH264FmtpPacketizationMode, "1");
</span><span class="cx"> supported_codecs_.push_back(constrained_baseline);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VideoToolboxVideoEncoderFactory::~VideoToolboxVideoEncoderFactory() {}
</span><span class="lines">@@ -59,12 +55,10 @@
</span><span class="cx">
</span><span class="cx"> VideoEncoder* VideoToolboxVideoEncoderFactory::CreateVideoEncoder(
</span><span class="cx"> const cricket::VideoCodec& codec) {
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> if (FindMatchingCodec(supported_codecs_, codec)) {
</span><span class="cx"> LOG(LS_INFO) << "Creating HW encoder for " << codec.name;
</span><span class="cx"> return new H264VideoToolboxEncoder(codec);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> LOG(LS_INFO) << "No HW encoder found for codec " << codec.name;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -71,10 +65,8 @@
</span><span class="cx">
</span><span class="cx"> void VideoToolboxVideoEncoderFactory::DestroyVideoEncoder(
</span><span class="cx"> VideoEncoder* encoder) {
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> delete encoder;
</span><span class="cx"> encoder = nullptr;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const std::vector<cricket::VideoCodec>&
</span><span class="lines">@@ -85,9 +77,7 @@
</span><span class="cx"> // VideoToolboxVideoDecoderFactory
</span><span class="cx">
</span><span class="cx"> VideoToolboxVideoDecoderFactory::VideoToolboxVideoDecoderFactory() {
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> supported_codecs_.push_back(cricket::VideoCodec("H264"));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VideoToolboxVideoDecoderFactory::~VideoToolboxVideoDecoderFactory() {}
</span><span class="lines">@@ -95,12 +85,10 @@
</span><span class="cx"> VideoDecoder* VideoToolboxVideoDecoderFactory::CreateVideoDecoder(
</span><span class="cx"> VideoCodecType type) {
</span><span class="cx"> const auto codec = cricket::VideoCodec(NameFromCodecType(type));
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> if (FindMatchingCodec(supported_codecs_, codec)) {
</span><span class="cx"> LOG(LS_INFO) << "Creating HW decoder for " << codec.name;
</span><span class="cx"> return new H264VideoToolboxDecoder();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> LOG(LS_INFO) << "No HW decoder found for codec " << codec.name;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -107,10 +95,8 @@
</span><span class="cx">
</span><span class="cx"> void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder(
</span><span class="cx"> VideoDecoder* decoder) {
</span><del>-#if defined(WEBRTC_IOS)
</del><span class="cx"> delete decoder;
</span><span class="cx"> decoder = nullptr;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace webrtc
</span></span></pre>
</div>
</div>
</body>
</html>