Index: remoting/host/chromeos/aura_desktop_capturer.cc |
diff --git a/remoting/host/chromeos/aura_desktop_capturer.cc b/remoting/host/chromeos/aura_desktop_capturer.cc |
index caf6837430d03df22dfc29824a13bc3bbc89ea1d..3c989e2d0dd969eddf51579daa55f4836c8ab98f 100644 |
--- a/remoting/host/chromeos/aura_desktop_capturer.cc |
+++ b/remoting/host/chromeos/aura_desktop_capturer.cc |
@@ -40,8 +40,8 @@ SkiaBitmapDesktopFrame* SkiaBitmapDesktopFrame::Create( |
scoped_ptr<SkBitmap> bitmap) { |
webrtc::DesktopSize size(bitmap->width(), bitmap->height()); |
- DCHECK_EQ(kRGBA_8888_SkColorType, bitmap->info().colorType()) |
- << "DesktopFrame objects always hold RGBA data."; |
+ DCHECK_EQ(kBGRA_8888_SkColorType, bitmap->info().colorType()) |
+ << "DesktopFrame objects always hold BGRA data."; |
uint8_t* bitmap_data = reinterpret_cast<uint8_t*>(bitmap->getPixels()); |
@@ -116,4 +116,22 @@ void AuraDesktopCapturer::OnFrameCaptured( |
callback_->OnCaptureCompleted(frame.release()); |
} |
+bool AuraDesktopCapturer::GetScreenList(ScreenList* screens) { |
Wez
2014/10/17 17:57:59
Do you ever intend to implement these? If so then
kelvinp
2014/10/20 00:21:16
No plans for supporting multiple desktop on Chrome
Wez
2014/10/24 00:28:47
OK; as discussed let's revert this and take the hi
|
+ NOTIMPLEMENTED(); |
+ return false; |
+} |
+ |
+bool AuraDesktopCapturer::SelectScreen(webrtc::ScreenId id) { |
+ NOTIMPLEMENTED(); |
+ return false; |
+}; |
+ |
} // namespace remoting |
+ |
+namespace webrtc { |
Wez
2014/10/17 17:57:59
nit: Blank line between namespace and //static lin
kelvinp
2014/10/20 00:21:16
Done.
|
+// static |
+ScreenCapturer* ScreenCapturer::Create(const DesktopCaptureOptions& options) { |
+ return new remoting::AuraDesktopCapturer(); |
+} |
+ |
+} // namespace webrtc |