Chromium Code Reviews| Index: media/cast/cast_config.h |
| diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h |
| index 71073f43e5ba218636d1cd05a01565dbce8147b2..3a69d1edca2550176c6d994000e5578733f77965 100644 |
| --- a/media/cast/cast_config.h |
| +++ b/media/cast/cast_config.h |
| @@ -53,6 +53,9 @@ struct AudioSenderConfig { |
| int channels; |
| int bitrate; |
| AudioCodec codec; |
| + |
| + std::string aes_key; // Binary strings of size kAesKeySize. |
| + std::string aes_iv_mask; // Binary strings of size kAesKeySize. |
|
wtc
2013/11/15 20:13:37
Nit: also change "strings" to "string" in these tw
pwestin
2013/11/15 22:11:10
Done.
|
| }; |
| struct VideoSenderConfig { |
| @@ -83,6 +86,9 @@ struct VideoSenderConfig { |
| int max_number_of_video_buffers_used; // Max value depend on codec. |
| VideoCodec codec; |
| int number_of_cores; |
| + |
| + std::string aes_key; // Binary string of size kAesKeySize. |
| + std::string aes_iv_mask; // Binary string of size kAesKeySize. |
| }; |
| struct AudioReceiverConfig { |
| @@ -103,6 +109,9 @@ struct AudioReceiverConfig { |
| int frequency; |
| int channels; |
| AudioCodec codec; |
| + |
| + std::string aes_key; // Binary string of size kAesKeySize. |
| + std::string aes_iv_mask; // Binary string of size kAesKeySize. |
| }; |
| struct VideoReceiverConfig { |
| @@ -126,6 +135,9 @@ struct VideoReceiverConfig { |
| // from catching up after a glitch. |
| bool decoder_faster_than_max_frame_rate; |
| VideoCodec codec; |
| + |
| + std::string aes_key; // Binary string of size kAesKeySize. |
| + std::string aes_iv_mask; // Binary string of size kAesKeySize. |
| }; |
| struct I420VideoPlane { |
| @@ -150,7 +162,7 @@ struct EncodedVideoFrame { |
| bool key_frame; |
| uint8 frame_id; |
| uint8 last_referenced_frame_id; |
| - std::vector<uint8> data; |
| + std::string data; |
| }; |
| struct PcmAudioFrame { |
| @@ -170,7 +182,7 @@ struct EncodedAudioFrame { |
| uint8 frame_id; // Needed to release the frame. Not used send side. |
| int samples; // Needed send side to advance the RTP timestamp. |
| // Not used receive side. |
| - std::vector<uint8> data; |
| + std::string data; |
| }; |
| typedef std::vector<uint8> Packet; |