* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible).  So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
		
	
			
		
			
				
	
	
		
			141 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
// Copyright (c) 2019 GitHub, Inc.
 | 
						|
// Use of this source code is governed by the MIT license that can be
 | 
						|
// found in the LICENSE file.
 | 
						|
 | 
						|
#include "shell/browser/osr/osr_video_consumer.h"
 | 
						|
 | 
						|
#include <utility>
 | 
						|
 | 
						|
#include "media/base/video_frame_metadata.h"
 | 
						|
#include "media/capture/mojom/video_capture_types.mojom.h"
 | 
						|
#include "shell/browser/osr/osr_render_widget_host_view.h"
 | 
						|
#include "ui/gfx/skbitmap_operations.h"
 | 
						|
 | 
						|
namespace electron {
 | 
						|
 | 
						|
OffScreenVideoConsumer::OffScreenVideoConsumer(
 | 
						|
    OffScreenRenderWidgetHostView* view,
 | 
						|
    OnPaintCallback callback)
 | 
						|
    : callback_(callback),
 | 
						|
      view_(view),
 | 
						|
      video_capturer_(view->CreateVideoCapturer()) {
 | 
						|
  video_capturer_->SetResolutionConstraints(view_->SizeInPixels(),
 | 
						|
                                            view_->SizeInPixels(), true);
 | 
						|
  video_capturer_->SetAutoThrottlingEnabled(false);
 | 
						|
  video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
 | 
						|
  video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB,
 | 
						|
                             gfx::ColorSpace::CreateREC709());
 | 
						|
  SetFrameRate(view_->GetFrameRate());
 | 
						|
}
 | 
						|
 | 
						|
OffScreenVideoConsumer::~OffScreenVideoConsumer() = default;
 | 
						|
 | 
						|
void OffScreenVideoConsumer::SetActive(bool active) {
 | 
						|
  if (active) {
 | 
						|
    video_capturer_->Start(this);
 | 
						|
  } else {
 | 
						|
    video_capturer_->Stop();
 | 
						|
  }
 | 
						|
}
 | 
						|
 | 
						|
void OffScreenVideoConsumer::SetFrameRate(int frame_rate) {
 | 
						|
  video_capturer_->SetMinCapturePeriod(base::TimeDelta::FromSeconds(1) /
 | 
						|
                                       frame_rate);
 | 
						|
}
 | 
						|
 | 
						|
void OffScreenVideoConsumer::SizeChanged() {
 | 
						|
  video_capturer_->SetResolutionConstraints(view_->SizeInPixels(),
 | 
						|
                                            view_->SizeInPixels(), true);
 | 
						|
  video_capturer_->RequestRefreshFrame();
 | 
						|
}
 | 
						|
 | 
						|
void OffScreenVideoConsumer::OnFrameCaptured(
 | 
						|
    base::ReadOnlySharedMemoryRegion data,
 | 
						|
    ::media::mojom::VideoFrameInfoPtr info,
 | 
						|
    const gfx::Rect& content_rect,
 | 
						|
    mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
 | 
						|
        callbacks) {
 | 
						|
  if (!CheckContentRect(content_rect)) {
 | 
						|
    gfx::Size view_size = view_->SizeInPixels();
 | 
						|
    video_capturer_->SetResolutionConstraints(view_size, view_size, true);
 | 
						|
    video_capturer_->RequestRefreshFrame();
 | 
						|
    return;
 | 
						|
  }
 | 
						|
 | 
						|
  mojo::Remote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
 | 
						|
      callbacks_remote(std::move(callbacks));
 | 
						|
 | 
						|
  if (!data.IsValid()) {
 | 
						|
    callbacks_remote->Done();
 | 
						|
    return;
 | 
						|
  }
 | 
						|
  base::ReadOnlySharedMemoryMapping mapping = data.Map();
 | 
						|
  if (!mapping.IsValid()) {
 | 
						|
    DLOG(ERROR) << "Shared memory mapping failed.";
 | 
						|
    callbacks_remote->Done();
 | 
						|
    return;
 | 
						|
  }
 | 
						|
  if (mapping.size() <
 | 
						|
      media::VideoFrame::AllocationSize(info->pixel_format, info->coded_size)) {
 | 
						|
    DLOG(ERROR) << "Shared memory size was less than expected.";
 | 
						|
    callbacks_remote->Done();
 | 
						|
    return;
 | 
						|
  }
 | 
						|
 | 
						|
  // The SkBitmap's pixels will be marked as immutable, but the installPixels()
 | 
						|
  // API requires a non-const pointer. So, cast away the const.
 | 
						|
  void* const pixels = const_cast<void*>(mapping.memory());
 | 
						|
 | 
						|
  // Call installPixels() with a |releaseProc| that: 1) notifies the capturer
 | 
						|
  // that this consumer has finished with the frame, and 2) releases the shared
 | 
						|
  // memory mapping.
 | 
						|
  struct FramePinner {
 | 
						|
    // Keeps the shared memory that backs |frame_| mapped.
 | 
						|
    base::ReadOnlySharedMemoryMapping mapping;
 | 
						|
    // Prevents FrameSinkVideoCapturer from recycling the shared memory that
 | 
						|
    // backs |frame_|.
 | 
						|
    mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
 | 
						|
        releaser;
 | 
						|
  };
 | 
						|
 | 
						|
  SkBitmap bitmap;
 | 
						|
  bitmap.installPixels(
 | 
						|
      SkImageInfo::MakeN32(content_rect.width(), content_rect.height(),
 | 
						|
                           kPremul_SkAlphaType),
 | 
						|
      pixels,
 | 
						|
      media::VideoFrame::RowBytes(media::VideoFrame::kARGBPlane,
 | 
						|
                                  info->pixel_format, info->coded_size.width()),
 | 
						|
      [](void* addr, void* context) {
 | 
						|
        delete static_cast<FramePinner*>(context);
 | 
						|
      },
 | 
						|
      new FramePinner{std::move(mapping), callbacks_remote.Unbind()});
 | 
						|
  bitmap.setImmutable();
 | 
						|
 | 
						|
  absl::optional<gfx::Rect> update_rect = info->metadata.capture_update_rect;
 | 
						|
  if (!update_rect.has_value() || update_rect->IsEmpty()) {
 | 
						|
    update_rect = content_rect;
 | 
						|
  }
 | 
						|
 | 
						|
  callback_.Run(*update_rect, bitmap);
 | 
						|
}
 | 
						|
 | 
						|
void OffScreenVideoConsumer::OnStopped() {}
 | 
						|
 | 
						|
void OffScreenVideoConsumer::OnLog(const std::string& message) {}
 | 
						|
 | 
						|
bool OffScreenVideoConsumer::CheckContentRect(const gfx::Rect& content_rect) {
 | 
						|
  gfx::Size view_size = view_->SizeInPixels();
 | 
						|
  gfx::Size content_size = content_rect.size();
 | 
						|
 | 
						|
  if (std::abs(view_size.width() - content_size.width()) > 2) {
 | 
						|
    return false;
 | 
						|
  }
 | 
						|
 | 
						|
  if (std::abs(view_size.height() - content_size.height()) > 2) {
 | 
						|
    return false;
 | 
						|
  }
 | 
						|
 | 
						|
  return true;
 | 
						|
}
 | 
						|
 | 
						|
}  // namespace electron
 |