| OLD | NEW |
| 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 "chromecast/common/media/cma_param_traits.h" | 5 #include "chromecast/common/media/cma_param_traits.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "chromecast/common/media/cma_param_traits_macros.h" | 11 #include "chromecast/common/media/cma_param_traits_macros.h" |
| 12 #include "content/public/common/common_param_traits.h" | 12 #include "content/public/common/common_param_traits.h" |
| 13 #include "ipc/ipc_message_macros.h" | 13 #include "ipc/ipc_message_macros.h" |
| 14 #include "media/base/audio_decoder_config.h" | 14 #include "media/base/audio_decoder_config.h" |
| 15 #include "media/base/encryption_scheme.h" | 15 #include "media/base/encryption_scheme.h" |
| 16 #include "media/base/video_decoder_config.h" | 16 #include "media/base/video_decoder_config.h" |
| 17 #include "ui/gfx/ipc/gfx_param_traits.h" | 17 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 18 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" |
| 18 | 19 |
| 19 // Note(gunsch): these are currently defined in content/, but not declared in | 20 // Note(gunsch): these are currently defined in content/, but not declared in |
| 20 // content/public/. These headers need to be forward-declared for chromecast/, | 21 // content/public/. These headers need to be forward-declared for chromecast/, |
| 21 // but without new implementations linked in. | 22 // but without new implementations linked in. |
| 22 // The correct long-term fix is to use Mojo instead of the content/ IPCs. | 23 // The correct long-term fix is to use Mojo instead of the content/ IPCs. |
| 23 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::ChannelLayout, | 24 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::ChannelLayout, |
| 24 media::ChannelLayout::CHANNEL_LAYOUT_NONE, | 25 media::ChannelLayout::CHANNEL_LAYOUT_NONE, |
| 25 media::ChannelLayout::CHANNEL_LAYOUT_MAX) | 26 media::ChannelLayout::CHANNEL_LAYOUT_MAX) |
| 26 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, | 27 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, |
| 27 media::VIDEO_CODEC_PROFILE_MIN, | 28 media::VIDEO_CODEC_PROFILE_MIN, |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 *r = media::EncryptionScheme::Pattern(encrypt_blocks, skip_blocks); | 159 *r = media::EncryptionScheme::Pattern(encrypt_blocks, skip_blocks); |
| 159 return true; | 160 return true; |
| 160 } | 161 } |
| 161 | 162 |
| 162 void ParamTraits<media::EncryptionScheme::Pattern>::Log( | 163 void ParamTraits<media::EncryptionScheme::Pattern>::Log( |
| 163 const param_type& p, std::string* l) { | 164 const param_type& p, std::string* l) { |
| 164 l->append(base::StringPrintf("<Pattern>")); | 165 l->append(base::StringPrintf("<Pattern>")); |
| 165 } | 166 } |
| 166 | 167 |
| 167 } // namespace IPC | 168 } // namespace IPC |
| OLD | NEW |