mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update FrameSubscriber implementation

Browse source
This commit is contained in:
Heilig Benedek 2018-05-14 17:55:39 +02:00 • committed by Samuel Attard
parent ca8843102a
commit b9413fe59d
4 changed files with 65 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_web_contents.cc
View file

@ -1644,10 +1644,8 @@ void WebContents::BeginFrameSubscription(mate::Arguments* args) {
return;
}
auto* const view = web_contents()->GetRenderWidgetHostView();
if (view) {
frame_subscriber_.reset(new FrameSubscriber(isolate(), view, callback));
}
frame_subscriber_.reset(
new FrameSubscriber(isolate(), web_contents(), callback));
}
void WebContents::EndFrameSubscription() {

1
atom/browser/api/atom_api_web_contents.h
View file

@ -47,6 +47,7 @@ class AtomBrowserContext;
class AtomJavaScriptDialogManager;
class WebContentsZoomController;
class WebViewGuestDelegate;
class FrameSubscriber;
#if defined(ENABLE_OSR)
class OffScreenWebContentsView;

132
atom/browser/api/frame_subscriber.cc
View file

@ -5,108 +5,72 @@
#include "atom/browser/api/frame_subscriber.h"
#include "atom/common/native_mate_converters/gfx_converter.h"
#include "components/viz/host/host_frame_sink_manager.h"
#include "components/viz/common/frame_sinks/copy_output_request.h"
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
#include "components/viz/service/surfaces/surface_manager.h"
#include "content/browser/compositor/surface_utils.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "atom/common/node_includes.h"
#include "ui/gfx/geometry/rect_conversions.h"
namespace atom {
namespace api {
FrameSubscriber::FrameSubscriber(v8::Isolate* isolate,
content::RenderWidgetHostView* view,
content::WebContents* web_contents,
const FrameCaptureCallback& callback)
: isolate_(isolate),
view_(view),
callback_(callback),
video_consumer_binding_(this),
weak_factory_(this) {
video_capturer_ = CreateVideoCapturer();
video_capturer_->SetResolutionConstraints(
view_->GetViewBounds().size(),
view_->GetViewBounds().size(), true);
video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
media::COLOR_SPACE_UNSPECIFIED);
viz::mojom::FrameSinkVideoConsumerPtr consumer;
video_consumer_binding_.Bind(mojo::MakeRequest(&consumer));
video_capturer_->Start(std::move(consumer));
}
: content::WebContentsObserver(web_contents),
isolate_(isolate),
callback_(callback) {}
FrameSubscriber::~FrameSubscriber() = default;
void FrameSubscriber::OnFrameCaptured(
mojo::ScopedSharedBufferHandle buffer,
uint32_t buffer_size,
::media::mojom::VideoFrameInfoPtr info,
const gfx::Rect& update_rect,
const gfx::Rect& content_rect,
viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr callbacks) {
v8::Locker locker(isolate_);
v8::HandleScope handle_scope(isolate_);
gfx::Rect FrameSubscriber::GetDamageRect() {
auto* view = web_contents()->GetRenderWidgetHostView();
if (view == nullptr)
return gfx::Rect();
gfx::Size view_size = view_->GetViewBounds().size();
if (view_size != content_rect.size()) {
video_capturer_->SetResolutionConstraints(view_size, view_size, true);
video_capturer_->RequestRefreshFrame();
auto* view_base = static_cast<content::RenderWidgetHostViewBase*>(view);
viz::SurfaceManager* surface_manager =
content::GetFrameSinkManager()->surface_manager();
viz::Surface* surface =
surface_manager->GetSurfaceForId(view_base->GetCurrentSurfaceId());
if (surface == nullptr)
return gfx::Rect();
if (surface->HasActiveFrame()) {
const viz::CompositorFrame& frame = surface->GetActiveFrame();
viz::RenderPass* root_pass = frame.render_pass_list.back().get();
gfx::Size frame_size = root_pass->output_rect.size();
gfx::Rect damage_rect =
gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
damage_rect.Intersect(gfx::Rect(frame_size));
return gfx::ScaleToEnclosedRect(damage_rect,
1.0f / frame.device_scale_factor());
} else {
return gfx::Rect();
}
}
void FrameSubscriber::DidReceiveCompositorFrame() {
auto* view = web_contents()->GetRenderWidgetHostView();
if (view == nullptr)
return;
view->CopyFromSurface(
gfx::Rect(), view->GetViewBounds().size(),
base::BindOnce(&FrameSubscriber::Done, base::Unretained(this),
GetDamageRect()));
}
if (!buffer.is_valid()) {
callbacks->Done();
void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) {
if (frame.drawsNothing())
return;
}
mojo::ScopedSharedBufferMapping mapping = buffer->Map(buffer_size);
if (!mapping) {
return;
}
SkImageInfo image_info = SkImageInfo::MakeN32(
content_rect.width(), content_rect.height(), kPremul_SkAlphaType);
SkPixmap pixmap(image_info, mapping.get(),
media::VideoFrame::RowBytes(media::VideoFrame::kARGBPlane,
info->pixel_format,
info->coded_size.width()));
frame_.installPixels(pixmap);
size_t rgb_row_size = frame_.width() * frame_.bytesPerPixel();
v8::MaybeLocal<v8::Object> node_buffer =
node::Buffer::New(isolate_, rgb_row_size * frame_.height());
auto local_buffer = node_buffer.ToLocalChecked();
{
auto* source = static_cast<const unsigned char*>(frame_.getPixels());
auto* target = node::Buffer::Data(local_buffer);
for (int y = 0; y < frame_.height(); ++y) {
memcpy(target, source, rgb_row_size);
source += frame_.rowBytes();
target += rgb_row_size;
}
}
v8::Local<v8::Value> damage =
mate::Converter<gfx::Rect>::ToV8(isolate_, update_rect);
callback_.Run(local_buffer, damage);
shared_memory_mapping_ = std::move(mapping);
shared_memory_releaser_ = std::move(callbacks);
}
void FrameSubscriber::OnTargetLost(const viz::FrameSinkId& frame_sink_id) {}
void FrameSubscriber::OnStopped() {}
viz::mojom::FrameSinkVideoCapturerPtr FrameSubscriber::CreateVideoCapturer() {
auto* view_base = static_cast<content::RenderWidgetHostViewBase*>(view_);
viz::mojom::FrameSinkVideoCapturerPtr video_capturer;
content::GetHostFrameSinkManager()->CreateVideoCapturer(
mojo::MakeRequest(&video_capturer));
video_capturer->ChangeTarget(view_base->GetFrameSinkId());
return video_capturer;
const_cast<SkBitmap&>(frame).setAlphaType(kPremul_SkAlphaType);
v8::Local<v8::Value> damage_rect =
mate::Converter<gfx::Rect>::ToV8(isolate_, damage);
callback_.Run(gfx::Image::CreateFrom1xBitmap(frame), damage_rect);
}
} // namespace api

48
atom/browser/api/frame_subscriber.h
View file

@ -5,58 +5,38 @@
#ifndef ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
#define ATOM_BROWSER_API_FRAME_SUBSCRIBER_H_
#include "content/public/browser/web_contents.h"
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/render_widget_host_view.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "components/viz/common/frame_sinks/copy_output_result.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/gfx/image/image.h"
#include "v8/include/v8.h"
namespace atom {
namespace api {
class FrameSubscriber : public viz::mojom::FrameSinkVideoConsumer {
class WebContents;
class FrameSubscriber : public content::WebContentsObserver {
public:
using FrameCaptureCallback =
base::Callback<void(v8::Local<v8::Value>, v8::Local<v8::Value>)>;
base::Callback<void(const gfx::Image&, v8::Local<v8::Value>)>;
FrameSubscriber(v8::Isolate* isolate,
content::RenderWidgetHostView* view,
content::WebContents* web_contents,
const FrameCaptureCallback& callback);
~FrameSubscriber() override;
~FrameSubscriber();
private:
void OnFrameCaptured(
mojo::ScopedSharedBufferHandle buffer,
uint32_t buffer_size,
::media::mojom::VideoFrameInfoPtr info,
const gfx::Rect& update_rect,
const gfx::Rect& content_rect,
viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr callbacks) override;
void OnTargetLost(const viz::FrameSinkId& frame_sink_id) override;
void OnStopped() override;
viz::mojom::FrameSinkVideoCapturerPtr CreateVideoCapturer();
gfx::Rect GetDamageRect();
void DidReceiveCompositorFrame() override;
void Done(const gfx::Rect& damage, const SkBitmap& frame);
v8::Isolate* isolate_;
content::RenderWidgetHostView* view_;
FrameCaptureCallback callback_;
SkBitmap frame_;
// This object keeps the shared memory that backs |frame_| mapped.
mojo::ScopedSharedBufferMapping shared_memory_mapping_;
// This object prevents FrameSinkVideoCapturer from recycling the shared
// memory that backs |frame_|.
viz::mojom::FrameSinkVideoConsumerFrameCallbacksPtr shared_memory_releaser_;
viz::mojom::FrameSinkVideoCapturerPtr video_capturer_;
mojo::Binding<viz::mojom::FrameSinkVideoConsumer> video_consumer_binding_;
base::WeakPtrFactory<FrameSubscriber> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
};