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

Side by Side Diff: content/common/gpu/media/vaapi_video_encode_accelerator.cc

Issue 603153002: vaapi: detect supported profiles in runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename to AreAttribsSupported and add va_lock_ to TryToSetVADisplayAttributeToLocalGPU Created 6 years, 2 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 | « no previous file | content/common/gpu/media/vaapi_wrapper.h » ('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 "content/common/gpu/media/vaapi_video_encode_accelerator.h" 5 #include "content/common/gpu/media/vaapi_video_encode_accelerator.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 }; 105 };
106 106
107 std::vector<media::VideoEncodeAccelerator::SupportedProfile> 107 std::vector<media::VideoEncodeAccelerator::SupportedProfile>
108 VaapiVideoEncodeAccelerator::GetSupportedProfiles() { 108 VaapiVideoEncodeAccelerator::GetSupportedProfiles() {
109 std::vector<SupportedProfile> profiles; 109 std::vector<SupportedProfile> profiles;
110 110
111 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 111 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
112 if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode)) 112 if (cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode))
113 return profiles; 113 return profiles;
114 114
115 SupportedProfile profile; 115 std::vector<media::VideoCodecProfile> hw_profiles =
116 profile.profile = media::H264PROFILE_MAIN; 116 VaapiWrapper::GetSupportedEncodeProfiles(
117 x_display_, base::Bind(&ReportToUMA, VAAPI_ERROR));
118
119 media::VideoEncodeAccelerator::SupportedProfile profile;
117 profile.max_resolution.SetSize(1920, 1088); 120 profile.max_resolution.SetSize(1920, 1088);
118 profile.max_framerate_numerator = kDefaultFramerate; 121 profile.max_framerate_numerator = kDefaultFramerate;
119 profile.max_framerate_denominator = 1; 122 profile.max_framerate_denominator = 1;
120 profiles.push_back(profile); 123 for (size_t i = 0; i < hw_profiles.size(); i++) {
121 124 profile.profile = hw_profiles[i];
122 // This is actually only constrained (see crbug.com/345569). 125 profiles.push_back(profile);
123 profile.profile = media::H264PROFILE_BASELINE; 126 }
124 profiles.push_back(profile);
125
126 profile.profile = media::H264PROFILE_HIGH;
127 profiles.push_back(profile);
128
129 return profiles; 127 return profiles;
130 } 128 }
131 129
132 static unsigned int Log2OfPowerOf2(unsigned int x) { 130 static unsigned int Log2OfPowerOf2(unsigned int x) {
133 CHECK_GT(x, 0u); 131 CHECK_GT(x, 0u);
134 DCHECK_EQ(x & (x - 1), 0u); 132 DCHECK_EQ(x & (x - 1), 0u);
135 133
136 int log = 0; 134 int log = 0;
137 while (x) { 135 while (x) {
138 x >>= 1; 136 x >>= 1;
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 } 1059 }
1062 1060
1063 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob() 1061 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
1064 : coded_buffer(VA_INVALID_ID), keyframe(false) { 1062 : coded_buffer(VA_INVALID_ID), keyframe(false) {
1065 } 1063 }
1066 1064
1067 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() { 1065 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
1068 } 1066 }
1069 1067
1070 } // namespace content 1068 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/media/vaapi_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698