Roll WebRTC 8955:8956, Libjingle 8954:8956

WebRTC 8955:8956
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/a4d326e..9e4853a

Libjingle 8954:8956
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/57c1e6f..32d6efb

TBR=perkj

Review URL: https://codereview.chromium.org/1071123002

Cr-Commit-Position: refs/heads/master@{#324424}

8 files changed, 14 insertions, 65 deletions

diff --git a/DEPS b/DEPS
index 7c0d690..4bcbb10 100644
--- a/DEPS
+++ b/DEPS
@@ -210,7 +210,7 @@ deps = {
    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '104f872faf2cd809cdada885a1e39be85e5b3316',
 
   'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '57c1e6f69d0d01c9188b52e931229fcb114dcaee',
+    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '32d6efbe909b1fec430fa71d9dbc2bbc30c873c2',
 
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215
@@ -234,7 +234,7 @@ deps = {
    Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
 
   'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a4d326e1b39ac32371b9bcd4f9189e38cc33ddb9',
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '9e4853a2a1222020ac574bb2362d48348e44d220',
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index b35ed8f..5491340 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -626,8 +626,6 @@
       'renderer/media/media_stream_video_source.h',
       'renderer/media/media_stream_video_track.cc',
       'renderer/media/media_stream_video_track.h',
-      'renderer/media/native_handle_impl.cc',
-      'renderer/media/native_handle_impl.h',
       'renderer/media/peer_connection_identity_service.cc',
       'renderer/media/peer_connection_identity_service.h',
       'renderer/media/peer_connection_tracker.cc',
diff --git a/content/renderer/media/native_handle_impl.cc b/content/renderer/media/native_handle_impl.cc
deleted file mode 100644
index 3988e39..0000000
--- a/content/renderer/media/native_handle_impl.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/renderer/media/native_handle_impl.h"
-
-namespace content {
-
-NativeHandleImpl::NativeHandleImpl(scoped_refptr<media::VideoFrame> frame)
-    : frame_(frame) {}
-
-NativeHandleImpl::~NativeHandleImpl() {}
-
-void* NativeHandleImpl::GetHandle() { return frame_.get(); }
-
-}  // namespace content
diff --git a/content/renderer/media/native_handle_impl.h b/content/renderer/media/native_handle_impl.h
deleted file mode 100644
index 20a4f03..0000000
--- a/content/renderer/media/native_handle_impl.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_RENDERER_MEDIA_NATIVE_HANDLE_IMPL_H_
-#define CONTENT_RENDERER_MEDIA_NATIVE_HANDLE_IMPL_H_
-
-#include "base/memory/ref_counted.h"
-#include "media/base/video_frame.h"
-#include "third_party/webrtc/common_video/interface/native_handle.h"
-
-namespace content {
-
-class NativeHandleImpl : public webrtc::NativeHandle {
- public:
-  // Wraps a video frame in the handle.
-  explicit NativeHandleImpl(scoped_refptr<media::VideoFrame> frame);
-  ~NativeHandleImpl() override;
-
-  // Retrieves the video frame in the handle. The frame is still ref-counted by
-  // the handle. The ref count decreases when NativeHandleImpl is destroyed.
-  void* GetHandle() override;
-
- private:
-  scoped_refptr<media::VideoFrame> frame_;
-
-  DISALLOW_COPY_AND_ASSIGN(NativeHandleImpl);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_MEDIA_NATIVE_HANDLE_IMPL_H_
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
index 73d63f1..74c85e5 100644
--- a/content/renderer/media/rtc_video_decoder.cc
+++ b/content/renderer/media/rtc_video_decoder.cc
@@ -13,14 +13,17 @@
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task_runner_util.h"
-#include "content/renderer/media/native_handle_impl.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/webrtc/base/bind.h"
 #include "third_party/webrtc/system_wrappers/interface/ref_count.h"
 #include "third_party/webrtc/video_frame.h"
 
+static void ReleaseFrame(scoped_refptr<media::VideoFrame> frame) {
+}
+
 namespace content {
 
 const int32 RTCVideoDecoder::ID_LAST = 0x3FFFFFFF;
@@ -388,13 +391,13 @@ void RTCVideoDecoder::PictureReady(const media::Picture& picture) {
   DCHECK(inserted);
 
   // Create a WebRTC video frame.
-  webrtc::RefCountImpl<NativeHandleImpl>* handle =
-      new webrtc::RefCountImpl<NativeHandleImpl>(frame);
-  webrtc::I420VideoFrame decoded_image(handle,
+  webrtc::I420VideoFrame decoded_image(frame.get(),
                                        picture.visible_rect().width(),
                                        picture.visible_rect().height(),
                                        timestamp,
-                                       0);
+                                       0,
+                                       webrtc::kVideoRotation_0,
+                                       rtc::Bind(&ReleaseFrame, frame));
 
   // Invoke decode callback. WebRTC expects no callback after Reset or Release.
   {
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
index e3b2c4d..a151647 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -10,7 +10,6 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event.h"
-#include "content/renderer/media/native_handle_impl.h"
 #include "content/renderer/media/webrtc/track_observer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
@@ -71,9 +70,8 @@ void MediaStreamRemoteVideoSource::RemoteVideoSourceDelegate::RenderFrame(
 
   scoped_refptr<media::VideoFrame> video_frame;
   if (incoming_frame->GetNativeHandle() != NULL) {
-    NativeHandleImpl* handle =
-        static_cast<NativeHandleImpl*>(incoming_frame->GetNativeHandle());
-    video_frame = static_cast<media::VideoFrame*>(handle->GetHandle());
+    video_frame =
+        static_cast<media::VideoFrame*>(incoming_frame->GetNativeHandle());
     video_frame->set_timestamp(timestamp);
   } else {
     const cricket::VideoFrame* frame =
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index 024c2b1..370de9a 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -65,9 +65,7 @@ class VideoFrameWrapper : public webrtc::VideoFrameBuffer {
     return frame_->stride(WebRtcToMediaPlaneType(type));
   }
 
-  rtc::scoped_refptr<webrtc::NativeHandle> native_handle() const override {
-    return nullptr;
-  }
+  void* native_handle() const override { return nullptr; }
 
   ~VideoFrameWrapper() override {}
   friend class rtc::RefCountedObject<VideoFrameWrapper>;
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 09bb613..32ff4e0 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://code.google.com/p/webrtc/
 Version: unknown
-Revision: 8954
+Revision: 8956
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes