OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/jni/jni_frame_consumer.h" | 5 #include "remoting/client/jni/jni_frame_consumer.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
10 #include "remoting/client/frame_producer.h" | 10 #include "remoting/client/frame_producer.h" |
(...skipping 23 matching lines...) Expand all Loading... | |
34 JNIEnv* env = base::android::AttachCurrentThread(); | 34 JNIEnv* env = base::android::AttachCurrentThread(); |
35 buffer_ = env->NewDirectByteBuffer(data(), stride()*height); | 35 buffer_ = env->NewDirectByteBuffer(data(), stride()*height); |
36 } | 36 } |
37 | 37 |
38 DirectDesktopFrame::~DirectDesktopFrame() {} | 38 DirectDesktopFrame::~DirectDesktopFrame() {} |
39 | 39 |
40 } // namespace | 40 } // namespace |
41 | 41 |
42 namespace remoting { | 42 namespace remoting { |
43 | 43 |
44 JniFrameConsumer::JniFrameConsumer() | 44 JniFrameConsumer::JniFrameConsumer(ChromotingJni* jni_environment) |
45 : provide_buffer_(true), | 45 : in_dtor_(false), |
46 frame_producer_(NULL) { | 46 frame_producer_(NULL), |
47 jni_environment_(jni_environment) { | |
47 } | 48 } |
48 | 49 |
49 JniFrameConsumer::~JniFrameConsumer() { | 50 JniFrameConsumer::~JniFrameConsumer() { |
50 // Stop giving the producer a buffer to work with. | 51 // Stop giving the producer a buffer to work with. |
51 provide_buffer_ = false; | 52 in_dtor_ = true; |
52 | 53 |
53 // Don't destroy the object until we've deleted the buffer. | 54 // Don't destroy the object until we've deleted the buffer. |
54 base::WaitableEvent done_event(true, false); | 55 base::WaitableEvent done_event(true, false); |
55 frame_producer_->RequestReturnBuffers( | 56 frame_producer_->RequestReturnBuffers( |
56 base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done_event))); | 57 base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done_event))); |
57 done_event.Wait(); | 58 done_event.Wait(); |
58 } | 59 } |
59 | 60 |
60 void JniFrameConsumer::set_frame_producer(FrameProducer* producer) { | 61 void JniFrameConsumer::set_frame_producer(FrameProducer* producer) { |
61 frame_producer_ = producer; | 62 frame_producer_ = producer; |
62 } | 63 } |
63 | 64 |
64 void JniFrameConsumer::ApplyBuffer(const SkISize& view_size, | 65 void JniFrameConsumer::ApplyBuffer(const SkISize& view_size, |
65 const SkIRect& clip_area, | 66 const SkIRect& clip_area, |
66 webrtc::DesktopFrame* buffer, | 67 webrtc::DesktopFrame* buffer, |
67 const SkRegion& region) { | 68 const SkRegion& region) { |
68 DCHECK(ChromotingJni::GetInstance()-> | 69 DCHECK(jni_environment_->display_task_runner()->BelongsToCurrentThread()); |
69 display_task_runner()->BelongsToCurrentThread()); | |
70 | 70 |
71 ChromotingJni::GetInstance()->RedrawCanvas(); | 71 jni_environment_->RedrawCanvas(); |
72 | 72 |
73 if (view_size.width() > view_size_.width() || | 73 if (view_size.width() > view_size_.width() || |
74 view_size.height() > view_size_.height()) { | 74 view_size.height() > view_size_.height()) { |
75 LOG(INFO) << "Existing buffer is too small"; | 75 LOG(INFO) << "Existing buffer is too small"; |
76 view_size_ = view_size; | 76 view_size_ = view_size; |
77 delete buffer; | 77 delete buffer; |
Wez
2013/07/23 03:53:06
Rather than explicitly delete, assign |buffer| to
solb
2013/07/23 19:01:10
Done.
| |
78 AllocateBuffer(); | 78 AllocateBuffer(); |
79 } | 79 } |
80 | 80 |
81 // Supply |frame_producer_| with a buffer to render the next frame into. | 81 // Supply |frame_producer_| with a buffer to render the next frame into. |
82 if (provide_buffer_) | 82 if (!in_dtor_) |
83 frame_producer_->DrawBuffer(buffer); | 83 frame_producer_->DrawBuffer(buffer); |
84 else | |
85 delete buffer; | |
84 } | 86 } |
85 | 87 |
86 void JniFrameConsumer::ReturnBuffer(webrtc::DesktopFrame* buffer) { | 88 void JniFrameConsumer::ReturnBuffer(webrtc::DesktopFrame* buffer) { |
87 DCHECK(ChromotingJni::GetInstance()-> | 89 DCHECK(jni_environment_->display_task_runner()->BelongsToCurrentThread()); |
88 display_task_runner()->BelongsToCurrentThread()); | |
89 LOG(INFO) << "Returning image buffer"; | 90 LOG(INFO) << "Returning image buffer"; |
90 delete buffer; | 91 delete buffer; |
91 } | 92 } |
92 | 93 |
93 void JniFrameConsumer::SetSourceSize(const SkISize& source_size, | 94 void JniFrameConsumer::SetSourceSize(const SkISize& source_size, |
94 const SkIPoint& dpi) { | 95 const SkIPoint& dpi) { |
95 DCHECK(ChromotingJni::GetInstance()-> | 96 DCHECK(jni_environment_->display_task_runner()->BelongsToCurrentThread()); |
96 display_task_runner()->BelongsToCurrentThread()); | |
97 | 97 |
98 // We currently render the desktop 1:1 and perform pan/zoom scaling | 98 // We currently render the desktop 1:1 and perform pan/zoom scaling |
99 // and cropping on the managed canvas. | 99 // and cropping on the managed canvas. |
100 view_size_ = source_size; | 100 view_size_ = source_size; |
101 clip_area_ = SkIRect::MakeSize(view_size_); | 101 clip_area_ = SkIRect::MakeSize(view_size_); |
102 frame_producer_->SetOutputSizeAndClip(view_size_, clip_area_); | 102 frame_producer_->SetOutputSizeAndClip(view_size_, clip_area_); |
103 | 103 |
104 // Unless being destructed, allocate buffer and start drawing frames onto it. | 104 // Unless being destructed, allocate buffer and start drawing frames onto it. |
105 frame_producer_->RequestReturnBuffers(base::Bind( | 105 frame_producer_->RequestReturnBuffers(base::Bind( |
106 &JniFrameConsumer::AllocateBuffer, base::Unretained(this))); | 106 &JniFrameConsumer::AllocateBuffer, base::Unretained(this))); |
107 } | 107 } |
108 | 108 |
109 void JniFrameConsumer::AllocateBuffer() { | 109 void JniFrameConsumer::AllocateBuffer() { |
110 // Only do anything if we're not being destructed. | 110 // Only do anything if we're not being destructed. |
111 if (provide_buffer_) { | 111 if (!in_dtor_) { |
112 if (!ChromotingJni::GetInstance()-> | 112 if (!jni_environment_->display_task_runner()->BelongsToCurrentThread()) { |
113 display_task_runner()->BelongsToCurrentThread()) { | 113 jni_environment_->display_task_runner()->PostTask(FROM_HERE, |
114 ChromotingJni::GetInstance()->display_task_runner()->PostTask(FROM_HERE, | |
115 base::Bind(&JniFrameConsumer::AllocateBuffer, | 114 base::Bind(&JniFrameConsumer::AllocateBuffer, |
116 base::Unretained(this))); | 115 base::Unretained(this))); |
117 return; | 116 return; |
118 } | 117 } |
119 | 118 |
120 DirectDesktopFrame* buffer = new DirectDesktopFrame(view_size_.width(), | 119 DirectDesktopFrame* buffer = new DirectDesktopFrame(view_size_.width(), |
121 view_size_.height()); | 120 view_size_.height()); |
122 | 121 |
123 // Update Java's reference to the buffer and record of its dimensions. | 122 // Update Java's reference to the buffer and record of its dimensions. |
124 ChromotingJni::GetInstance()->UpdateImageBuffer( | 123 jni_environment_->UpdateImageBuffer(view_size_.width(), |
125 view_size_.width(), | 124 view_size_.height(), |
126 view_size_.height(), | 125 buffer->buffer()); |
127 buffer->buffer()); | |
128 | 126 |
129 frame_producer_->DrawBuffer(buffer); | 127 frame_producer_->DrawBuffer(buffer); |
130 } | 128 } |
131 } | 129 } |
132 | 130 |
133 } // namespace remoting | 131 } // namespace remoting |
OLD | NEW |