content/common/gpu/media/vt_video_encode_accelerator_mac.cc - Issue 1886363002: Reland: Tie kWebRtcH264WithOpenH264FFmpeg and kEnableWebRtcHWH264Encoding flags on Mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/vt_video_encode_accelerator_mac.cc

Issue 1886363002: Reland: Tie kWebRtcH264WithOpenH264FFmpeg and kEnableWebRtcHWH264Encoding flags on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change to DLOGs. Created 4 years, 8 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

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/renderer/media/rtc_video_encoder_factory.cc » ('j') | content/renderer/media/rtc_video_encoder_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/vt_video_encode_accelerator_mac.cc

diff --git a/content/common/gpu/media/vt_video_encode_accelerator_mac.cc b/content/common/gpu/media/vt_video_encode_accelerator_mac.cc

index d48b92d50d441c70261cc94ba9f8dc04b8fe1680..7644d189a44d28fb078b579c3468f18e69f8bae2 100644

--- a/content/common/gpu/media/vt_video_encode_accelerator_mac.cc

+++ b/content/common/gpu/media/vt_video_encode_accelerator_mac.cc

@@ -6,6 +6,7 @@

#include <memory>

+#include "base/mac/mac_util.h"

#include "base/thread_task_runner_handle.h"

#include "media/base/mac/coremedia_glue.h"

#include "media/base/mac/corevideo_glue.h"

@@ -91,6 +92,11 @@ VTVideoEncodeAccelerator::GetSupportedProfiles() {

DLOG(ERROR) << "Failed creating VideoToolbox glue.";

return profiles;

}

+ if (!base::mac::IsOSMavericksOrLater()) {

+ DLOG(ERROR) << "VideoToolbox hardware encoder is supported on Mac OS 10.9 "

+ "and later.";

+ return profiles;

+ }

const bool rv = CreateCompressionSession(

media::video_toolbox::DictionaryWithKeysAndValues(nullptr, nullptr, 0),

gfx::Size(kDefaultResolutionWidth, kDefaultResolutionHeight), true);