| Index: webrtc/video/video_send_stream_tests.cc
|
| diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
|
| index 095ff4ece36b3fffc6b495614cd31ee5626eabce..489782e43ba9e86e637e56580619cff92aceae09 100644
|
| --- a/webrtc/video/video_send_stream_tests.cc
|
| +++ b/webrtc/video/video_send_stream_tests.cc
|
| @@ -1538,8 +1538,8 @@ class VideoCodecConfigObserver : public test::SendTest,
|
| template <>
|
| void VideoCodecConfigObserver<VideoCodecH264>::VerifyCodecSpecifics(
|
| const VideoCodec& config) const {
|
| - EXPECT_EQ(0, memcmp(&config.codecSpecific.H264, &encoder_settings_,
|
| - sizeof(encoder_settings_)));
|
| + EXPECT_EQ(
|
| + 0, memcmp(&config.H264(), &encoder_settings_, sizeof(encoder_settings_)));
|
| }
|
| template <>
|
| void VideoCodecConfigObserver<VideoCodecVP8>::VerifyCodecSpecifics(
|
| @@ -1547,7 +1547,7 @@ void VideoCodecConfigObserver<VideoCodecVP8>::VerifyCodecSpecifics(
|
| // Check that the number of temporal layers has propagated properly to
|
| // VideoCodec.
|
| EXPECT_EQ(kVideoCodecConfigObserverNumberOfTemporalLayers,
|
| - config.codecSpecific.VP8.numberOfTemporalLayers);
|
| + config.VP8().numberOfTemporalLayers);
|
|
|
| for (unsigned char i = 0; i < config.numberOfSimulcastStreams; ++i) {
|
| EXPECT_EQ(kVideoCodecConfigObserverNumberOfTemporalLayers,
|
| @@ -1559,8 +1559,8 @@ void VideoCodecConfigObserver<VideoCodecVP8>::VerifyCodecSpecifics(
|
| VideoCodecVP8 encoder_settings = encoder_settings_;
|
| encoder_settings.numberOfTemporalLayers =
|
| kVideoCodecConfigObserverNumberOfTemporalLayers;
|
| - EXPECT_EQ(0, memcmp(&config.codecSpecific.VP8, &encoder_settings,
|
| - sizeof(encoder_settings_)));
|
| + EXPECT_EQ(
|
| + 0, memcmp(&config.VP8(), &encoder_settings, sizeof(encoder_settings_)));
|
| }
|
| template <>
|
| void VideoCodecConfigObserver<VideoCodecVP9>::VerifyCodecSpecifics(
|
| @@ -1568,7 +1568,7 @@ void VideoCodecConfigObserver<VideoCodecVP9>::VerifyCodecSpecifics(
|
| // Check that the number of temporal layers has propagated properly to
|
| // VideoCodec.
|
| EXPECT_EQ(kVideoCodecConfigObserverNumberOfTemporalLayers,
|
| - config.codecSpecific.VP9.numberOfTemporalLayers);
|
| + config.VP9().numberOfTemporalLayers);
|
|
|
| for (unsigned char i = 0; i < config.numberOfSimulcastStreams; ++i) {
|
| EXPECT_EQ(kVideoCodecConfigObserverNumberOfTemporalLayers,
|
| @@ -1580,8 +1580,8 @@ void VideoCodecConfigObserver<VideoCodecVP9>::VerifyCodecSpecifics(
|
| VideoCodecVP9 encoder_settings = encoder_settings_;
|
| encoder_settings.numberOfTemporalLayers =
|
| kVideoCodecConfigObserverNumberOfTemporalLayers;
|
| - EXPECT_EQ(0, memcmp(&config.codecSpecific.VP9, &encoder_settings,
|
| - sizeof(encoder_settings_)));
|
| + EXPECT_EQ(
|
| + 0, memcmp(&(config.VP9()), &encoder_settings, sizeof(encoder_settings_)));
|
| }
|
|
|
| TEST_F(VideoSendStreamTest, EncoderSetupPropagatesVp8Config) {
|
|
|