Chromium Code Reviews| Index: media/cast/cast_config.h |
| diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h |
| index 432e90482f5e613a55a12d540c37b433c3dc4b2e..3c024db570244806210aab5264d6e8356cdf2ac1 100644 |
| --- a/media/cast/cast_config.h |
| +++ b/media/cast/cast_config.h |
| @@ -15,13 +15,55 @@ |
| #include "base/memory/shared_memory.h" |
| #include "base/single_thread_task_runner.h" |
| #include "base/time/time.h" |
| -#include "media/cast/net/cast_transport_config.h" |
| +//#include "media/cast/net/cast_transport_config.h" |
| namespace media { |
| class VideoEncodeAccelerator; |
| namespace cast { |
| +enum Codec { |
|
Wez
2016/10/29 21:24:18
As per crbug.com/530839, do these really belong he
miu
2016/10/31 02:10:34
Not entirely sure. I wanted to plan all this out b
|
| + CODEC_UNKNOWN, |
| + CODEC_AUDIO_OPUS, |
| + CODEC_AUDIO_PCM16, |
| + CODEC_AUDIO_AAC, |
| + CODEC_AUDIO_REMOTE, |
| + CODEC_VIDEO_FAKE, |
| + CODEC_VIDEO_VP8, |
| + CODEC_VIDEO_H264, |
| + CODEC_VIDEO_REMOTE, |
| + CODEC_LAST = CODEC_VIDEO_REMOTE |
| +}; |
| + |
| +// Describes the content being transported over RTP streams. |
| +enum class RtpPayloadType { |
| + UNKNOWN = -1, |
| + |
| + // Cast Streaming will encode raw audio frames using one of its available |
| + // codec implementations, and transport encoded data in the RTP stream. |
| + FIRST = 96, |
| + AUDIO_OPUS = 96, |
| + AUDIO_AAC = 97, |
| + AUDIO_PCM16 = 98, |
| + |
| + // Audio frame data is not modified, and should be transported reliably and |
| + // in-sequence. No assumptions about the data can be made. |
| + REMOTE_AUDIO = 99, |
| + |
| + AUDIO_LAST = REMOTE_AUDIO, |
| + |
| + // Cast Streaming will encode raw video frames using one of its available |
| + // codec implementations, and transport encoded data in the RTP stream. |
| + VIDEO_VP8 = 100, |
| + VIDEO_H264 = 101, |
| + |
| + // Video frame data is not modified, and should be transported reliably and |
| + // in-sequence. No assumptions about the data can be made. |
| + REMOTE_VIDEO = 102, |
| + |
| + LAST = REMOTE_VIDEO |
| +}; |
| + |
| // TODO(miu): Eliminate these after moving "default config" into the top-level |
| // media/cast directory. http://crbug.com/530839 |
| enum SuggestedDefaults { |