Chromium Code Reviews| Index: media/cast/net/cast_transport_config.h |
| diff --git a/media/cast/net/cast_transport_config.h b/media/cast/net/cast_transport_config.h |
| index abace7f8ca8e76a58714a18920b57519518ff00f..81b7c655546da69652b9b06ba9abd46258d0c186 100644 |
| --- a/media/cast/net/cast_transport_config.h |
| +++ b/media/cast/net/cast_transport_config.h |
| @@ -13,54 +13,13 @@ |
| #include "base/callback.h" |
| #include "base/stl_util.h" |
| +#include "media/cast/cast_config.h" |
| #include "media/cast/common/rtp_time.h" |
| #include "media/cast/net/cast_transport_defines.h" |
|
Wez
2016/10/29 21:24:18
nit It was a little strange that this was cast_tra
miu
2016/10/31 02:10:34
A lot of things need to move around. The media/cas
|
| namespace media { |
| namespace cast { |
| -enum Codec { |
| - 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 |
| -}; |
| - |
| struct CastTransportRtpConfig { |
| CastTransportRtpConfig(); |
| ~CastTransportRtpConfig(); |