diff options
| author | wuchengli <wuchengli@chromium.org> | 2014-10-23 21:54:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 04:54:36 +0000 |
| commit | 6dd8cbfeb1b6df605d24988264c775af25ac595b (patch) | |
| tree | 9e85ed88b4b83471eeb7124cbee84d85cad19e91 /media | |
| parent | b9f5c40b0e3252fe2ba8fe1ce8ee347f9e0b78ab (diff) | |
| download | chromium_src-6dd8cbfeb1b6df605d24988264c775af25ac595b.zip chromium_src-6dd8cbfeb1b6df605d24988264c775af25ac595b.tar.gz chromium_src-6dd8cbfeb1b6df605d24988264c775af25ac595b.tar.bz2 | |
Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h.
gpu_info.h depended on media/video and media/ depended on gpu/.
gpu/ and media/ had a dependency cycle. Duplicate VEA::SupportedProfile
to gpu_info.h so gpu does not depend on media.
BUG=420801
TEST=Run apprtc loopback and ensure it uses HW encoder.
Review URL: https://codereview.chromium.org/668633002
Cr-Commit-Position: refs/heads/master@{#301048}
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/video_decoder_config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 0954e05..5d01d08 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -37,7 +37,8 @@ enum VideoCodec { }; // Video stream profile. This *must* match PP_VideoDecoder_Profile. -// (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) +// (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and +// gpu::VideoCodecProfile. enum VideoCodecProfile { // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, // for example), and keep the values for a particular format grouped |