Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: content/renderer/media/video_destination_handler.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/video_destination_handler.cc
===================================================================
--- content/renderer/media/video_destination_handler.cc (revision 213561)
+++ content/renderer/media/video_destination_handler.cc (working copy)
@@ -11,10 +11,10 @@
#include "base/rand_util.h"
#include "content/renderer/media/media_stream_dependency_factory.h"
#include "content/renderer/media/media_stream_registry_interface.h"
+#include "content/renderer/pepper/ppb_image_data_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
-#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
using cricket::CaptureState;
using cricket::VideoFormat;
@@ -85,6 +85,7 @@
void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data,
int64 time_stamp_ns) {
+#if defined(ENABLE_PLUGINS)
base::AutoLock auto_lock(lock_);
// This assumes the handler of the SignalFrameCaptured won't call Start/Stop.
// TODO(ronghuawu): Avoid the using of lock. One way is to post this call to
@@ -132,6 +133,7 @@
// This signals to libJingle that a new VideoFrame is available.
// libJingle have no assumptions on what thread this signal come from.
SignalFrameCaptured(this, &frame);
+#endif
}
// PpFrameWriterProxy is a helper class to make sure the user won't use
« no previous file with comments | « content/renderer/media/pepper_platform_video_decoder_impl.h ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698