Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: media/cast/sender/video_encoder.cc

Issue 1801343002: Revert of H264 HW encode using VideoToolbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « media/cast/sender/h264_vt_encoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/cast/sender/video_encoder.h" 5 #include "media/cast/sender/video_encoder.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "media/cast/sender/external_video_encoder.h" 8 #include "media/cast/sender/external_video_encoder.h"
9 #include "media/cast/sender/video_encoder_impl.h" 9 #include "media/cast/sender/video_encoder_impl.h"
10 10
11 #if defined(OS_MACOSX) 11 #if defined(OS_MACOSX)
12 #include "media/cast/sender/h264_vt_encoder.h" 12 #include "media/cast/sender/h264_vt_encoder.h"
13 #endif 13 #endif
14 14
15 namespace media { 15 namespace media {
16 namespace cast { 16 namespace cast {
17 17
18 // static 18 // static
19 scoped_ptr<VideoEncoder> VideoEncoder::Create( 19 scoped_ptr<VideoEncoder> VideoEncoder::Create(
20 const scoped_refptr<CastEnvironment>& cast_environment, 20 const scoped_refptr<CastEnvironment>& cast_environment,
21 const VideoSenderConfig& video_config, 21 const VideoSenderConfig& video_config,
22 const StatusChangeCallback& status_change_cb, 22 const StatusChangeCallback& status_change_cb,
23 const CreateVideoEncodeAcceleratorCallback& create_vea_cb, 23 const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
24 const CreateVideoEncodeMemoryCallback& create_video_encode_memory_cb) { 24 const CreateVideoEncodeMemoryCallback& create_video_encode_memory_cb) {
25 // On MacOS or IOS, attempt to use the system VideoToolbox library to 25 // On MacOS or IOS, attempt to use the system VideoToolbox library to
26 // perform optimized H.264 encoding. 26 // perform optimized H.264 encoding.
27 #if defined(OS_MACOSX) || defined(OS_IOS) 27 #if defined(OS_MACOSX) || defined(OS_IOS)
28 if (H264VideoToolboxEncoder::IsSupported(video_config)) { 28 if (!video_config.use_external_encoder &&
29 H264VideoToolboxEncoder::IsSupported(video_config)) {
29 return scoped_ptr<VideoEncoder>(new H264VideoToolboxEncoder( 30 return scoped_ptr<VideoEncoder>(new H264VideoToolboxEncoder(
30 cast_environment, video_config, status_change_cb)); 31 cast_environment, video_config, status_change_cb));
31 } 32 }
32 #endif // defined(OS_MACOSX) 33 #endif // defined(OS_MACOSX)
33 34
34 #if !defined(OS_IOS) 35 #if !defined(OS_IOS)
35 // If the system provides a hardware-accelerated encoder, use it. 36 // If the system provides a hardware-accelerated encoder, use it.
36 if (ExternalVideoEncoder::IsSupported(video_config)) { 37 if (ExternalVideoEncoder::IsSupported(video_config)) {
37 return scoped_ptr<VideoEncoder>(new SizeAdaptableExternalVideoEncoder( 38 return scoped_ptr<VideoEncoder>(new SizeAdaptableExternalVideoEncoder(
38 cast_environment, 39 cast_environment,
(...skipping 18 matching lines...) Expand all
57 58
58 scoped_ptr<VideoFrameFactory> VideoEncoder::CreateVideoFrameFactory() { 59 scoped_ptr<VideoFrameFactory> VideoEncoder::CreateVideoFrameFactory() {
59 return nullptr; 60 return nullptr;
60 } 61 }
61 62
62 void VideoEncoder::EmitFrames() { 63 void VideoEncoder::EmitFrames() {
63 } 64 }
64 65
65 } // namespace cast 66 } // namespace cast
66 } // namespace media 67 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/h264_vt_encoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698