Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: webrtc/video/video_send_stream_tests.cc

Issue 1315803004: Disable race dependent test (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include <algorithm> // max 10 #include <algorithm> // max
(...skipping 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after
1869 class NoFlexibleMode : public VP9HeaderObeserver { 1869 class NoFlexibleMode : public VP9HeaderObeserver {
1870 void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override { 1870 void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override {
1871 EXPECT_FALSE(vp9videoHeader->flexible_mode); 1871 EXPECT_FALSE(vp9videoHeader->flexible_mode);
1872 observation_complete_->Set(); 1872 observation_complete_->Set();
1873 } 1873 }
1874 } test; 1874 } test;
1875 1875
1876 RunBaseTest(&test); 1876 RunBaseTest(&test);
1877 } 1877 }
1878 1878
1879 TEST_F(VideoSendStreamTest, VP9FlexMode) { 1879 TEST_F(VideoSendStreamTest, DISABLED_VP9FlexMode) {
1880 class FlexibleMode : public VP9HeaderObeserver { 1880 class FlexibleMode : public VP9HeaderObeserver {
1881 void ModifyConfigsHook( 1881 void ModifyConfigsHook(
1882 VideoSendStream::Config* send_config, 1882 VideoSendStream::Config* send_config,
1883 std::vector<VideoReceiveStream::Config>* receive_configs, 1883 std::vector<VideoReceiveStream::Config>* receive_configs,
1884 VideoEncoderConfig* encoder_config) override { 1884 VideoEncoderConfig* encoder_config) override {
1885 vp9_settings_.flexibleMode = true; 1885 vp9_settings_.flexibleMode = true;
1886 } 1886 }
1887 1887
1888 void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override { 1888 void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override {
1889 EXPECT_TRUE(vp9videoHeader->flexible_mode); 1889 EXPECT_TRUE(vp9videoHeader->flexible_mode);
1890 observation_complete_->Set(); 1890 observation_complete_->Set();
1891 } 1891 }
1892 1892
1893 } test; 1893 } test;
1894 1894
1895 RunBaseTest(&test); 1895 RunBaseTest(&test);
1896 } 1896 }
1897 1897
1898 } // namespace webrtc 1898 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698