| Index: content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| index bf4668356254e8084713d0648b78ec98766178c3..3552dc3b7371d2a8587fa8707fcb12227a9d3604 100644
|
| --- a/content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| +++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc
|
| @@ -30,6 +30,8 @@
|
| #endif
|
| #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
|
| #include "content/common/gpu/media/android_video_encode_accelerator.h"
|
| +#elif defined(OS_MACOSX)
|
| +#include "content/common/gpu/media/vt_video_encode_accelerator_mac.h"
|
| #endif
|
|
|
| namespace content {
|
| @@ -201,6 +203,7 @@ GpuVideoEncodeAccelerator::CreateVEAFps() {
|
| create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateV4L2VEA);
|
| create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateVaapiVEA);
|
| create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateAndroidVEA);
|
| + create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateVTVEA);
|
| return create_vea_fps;
|
| }
|
|
|
| @@ -238,6 +241,18 @@ GpuVideoEncodeAccelerator::CreateAndroidVEA() {
|
| return encoder;
|
| }
|
|
|
| +// static
|
| +scoped_ptr<media::VideoEncodeAccelerator>
|
| +GpuVideoEncodeAccelerator::CreateVTVEA() {
|
| + scoped_ptr<media::VideoEncodeAccelerator> encoder;
|
| +#if defined(OS_MACOSX)
|
| + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
| + if (!cmd_line->HasSwitch(switches::kDisableVTAcceleratedVideoEncode))
|
| + encoder.reset(new VTVideoEncodeAccelerator());
|
| +#endif // defined(OS_MACOSX)
|
| + return encoder;
|
| +}
|
| +
|
| void GpuVideoEncodeAccelerator::OnEncode(
|
| const AcceleratedVideoEncoderMsg_Encode_Params& params) {
|
| DVLOG(3) << "GpuVideoEncodeAccelerator::OnEncode: frame_id = "
|
|
|