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

Unified Diff: remoting/client/plugin/pepper_view.cc

Issue 23677011: Byte-swap the video frame pixels before passing them to Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove FrameConsumerProxy::Attach Created 7 years, 3 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: remoting/client/plugin/pepper_view.cc
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index a0f6ac4b01943dc9d290c9b2bebe98b53536a708..50d7fc6da7f3304e4a47c84f9291525f9e5c3603 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -61,11 +61,10 @@ const size_t kMaxPendingBuffersCount = 2;
} // namespace
PepperView::PepperView(ChromotingInstance* instance,
- ClientContext* context,
- FrameProducer* producer)
+ ClientContext* context)
: instance_(instance),
context_(context),
- producer_(producer),
+ producer_(NULL),
merge_buffer_(NULL),
dips_to_device_scale_(1.0f),
dips_to_view_scale_(1.0f),
@@ -73,7 +72,6 @@ PepperView::PepperView(ChromotingInstance* instance,
is_initialized_(false),
frame_received_(false),
callback_factory_(this) {
- InitiateDrawing();
}
PepperView::~PepperView() {
@@ -150,7 +148,7 @@ void PepperView::SetView(const pp::View& view) {
if (view_changed) {
producer_->SetOutputSizeAndClip(view_size_, clip_area_);
- InitiateDrawing();
+ InitiateDrawing(producer_);
}
}
@@ -171,7 +169,7 @@ void PepperView::ApplyBuffer(const webrtc::DesktopSize& view_size,
// the properly scaled data.
if (!view_size_.equals(view_size)) {
FreeBuffer(buffer);
- InitiateDrawing();
+ InitiateDrawing(producer_);
} else {
FlushBuffer(clip_area, buffer, region);
}
@@ -187,7 +185,7 @@ void PepperView::ReturnBuffer(webrtc::DesktopFrame* buffer) {
producer_->DrawBuffer(buffer);
} else {
FreeBuffer(buffer);
- InitiateDrawing();
+ InitiateDrawing(producer_);
}
}
@@ -205,6 +203,19 @@ void PepperView::SetSourceSize(const webrtc::DesktopSize& source_size,
instance_->SetDesktopSize(source_size, source_dpi);
}
+FrameConsumer::PixelFormat PepperView::GetPixelFormat() {
+ return FORMAT_BGRA;
+}
+
+void PepperView::InitiateDrawing(FrameProducer* producer) {
+ producer_ = producer;
+ webrtc::DesktopFrame* buffer = AllocateBuffer();
+ while (buffer) {
+ producer_->DrawBuffer(buffer);
+ buffer = AllocateBuffer();
+ }
+}
+
webrtc::DesktopFrame* PepperView::AllocateBuffer() {
if (buffers_.size() >= kMaxPendingBuffersCount)
return NULL;
@@ -235,14 +246,6 @@ void PepperView::FreeBuffer(webrtc::DesktopFrame* buffer) {
delete buffer;
}
-void PepperView::InitiateDrawing() {
- webrtc::DesktopFrame* buffer = AllocateBuffer();
- while (buffer) {
- producer_->DrawBuffer(buffer);
- buffer = AllocateBuffer();
- }
-}
-
void PepperView::FlushBuffer(const webrtc::DesktopRect& clip_area,
webrtc::DesktopFrame* buffer,
const webrtc::DesktopRegion& region) {

Powered by Google App Engine
This is Rietveld 408576698