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

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

Issue 1291163007: Don't set V bit in flexible mode (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 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 | « webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc ('k') | 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
11 #include <vector> 11 #include <vector>
12 12
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 #include "webrtc/base/bind.h" 15 #include "webrtc/base/bind.h"
16 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/call.h" 19 #include "webrtc/call.h"
20 #include "webrtc/frame_callback.h" 20 #include "webrtc/frame_callback.h"
21 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
mflodman 2015/08/31 14:09:06 Alphabetic order.
philipel 2015/09/01 12:26:26 Done.
21 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" 22 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
22 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" 23 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
23 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" 24 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
24 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
25 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 27 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
26 #include "webrtc/system_wrappers/interface/event_wrapper.h" 28 #include "webrtc/system_wrappers/interface/event_wrapper.h"
27 #include "webrtc/system_wrappers/interface/logging.h" 29 #include "webrtc/system_wrappers/interface/logging.h"
28 #include "webrtc/system_wrappers/interface/ref_count.h" 30 #include "webrtc/system_wrappers/interface/ref_count.h"
29 #include "webrtc/system_wrappers/interface/sleep.h" 31 #include "webrtc/system_wrappers/interface/sleep.h"
30 #include "webrtc/system_wrappers/interface/thread_wrapper.h" 32 #include "webrtc/system_wrappers/interface/thread_wrapper.h"
31 #include "webrtc/test/call_test.h" 33 #include "webrtc/test/call_test.h"
32 #include "webrtc/test/configurable_frame_size_encoder.h" 34 #include "webrtc/test/configurable_frame_size_encoder.h"
33 #include "webrtc/test/fake_texture_frame.h" 35 #include "webrtc/test/fake_texture_frame.h"
34 #include "webrtc/test/null_transport.h" 36 #include "webrtc/test/null_transport.h"
(...skipping 1753 matching lines...) Expand 10 before | Expand all | Expand 10 after
1788 VideoSendStream* send_stream, 1790 VideoSendStream* send_stream,
1789 const std::vector<VideoReceiveStream*>& receive_streams) override { 1791 const std::vector<VideoReceiveStream*>& receive_streams) override {
1790 send_stream_ = send_stream; 1792 send_stream_ = send_stream;
1791 } 1793 }
1792 1794
1793 VideoSendStream* send_stream_; 1795 VideoSendStream* send_stream_;
1794 } test; 1796 } test;
1795 1797
1796 RunBaseTest(&test); 1798 RunBaseTest(&test);
1797 } 1799 }
1800
1801 class VP9HeaderObeserver : public test::SendTest {
1802 public:
1803 VP9HeaderObeserver()
1804 : SendTest(VideoSendStreamTest::kDefaultTimeoutMs),
1805 vp9_encoder_(VP9Encoder::Create()),
1806 vp9_settings_(VideoEncoder::GetDefaultVp9Settings()) {}
1807
1808 virtual void ModifyConfigsHook(
1809 VideoSendStream::Config* send_config,
1810 std::vector<VideoReceiveStream::Config>* receive_configs,
1811 VideoEncoderConfig* encoder_config) {}
1812
1813 virtual void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) = 0;
1814
1815 private:
1816 const int kVp9PayloadType = 105;
1817
1818 void ModifyConfigs(VideoSendStream::Config* send_config,
1819 std::vector<VideoReceiveStream::Config>* receive_configs,
1820 VideoEncoderConfig* encoder_config) override {
1821 encoder_config->encoder_specific_settings = &vp9_settings_;
1822 send_config->encoder_settings.encoder = vp9_encoder_.get();
1823 send_config->encoder_settings.payload_name = "VP9";
1824 send_config->encoder_settings.payload_type = kVp9PayloadType;
1825 ModifyConfigsHook(send_config, receive_configs, encoder_config);
1826 }
1827
1828 void PerformTest() override {
1829 EXPECT_EQ(kEventSignaled, Wait())
1830 << "Test timed out waiting for VP9 packet";
1831 }
1832
1833 Action OnSendRtp(const uint8_t* packet, size_t length) override {
1834 RTPHeader header;
1835 EXPECT_TRUE(parser_->Parse(packet, length, &header));
1836
1837 if (header.payloadType == kVp9PayloadType) {
1838 RtpDepacketizerVp9 vp9depacketizer;
1839 RtpDepacketizer::ParsedPayload vp9payload;
1840 const uint8_t* vp9_packet = packet + header.headerLength;
1841 size_t payload_length =
1842 length - header.headerLength - header.paddingLength;
1843
1844 bool parse_vp9header_successful =
1845 vp9depacketizer.Parse(&vp9payload, vp9_packet, payload_length);
1846 bool is_vp9_codec_type =
1847 vp9payload.type.Video.codec == RtpVideoCodecTypes::kRtpVideoVp9;
1848 EXPECT_TRUE(parse_vp9header_successful);
1849 EXPECT_TRUE(is_vp9_codec_type);
1850
1851 RTPVideoHeaderVP9* vp9videoHeader =
1852 &vp9payload.type.Video.codecHeader.VP9;
1853 if (parse_vp9header_successful && is_vp9_codec_type) {
1854 InspectHeader(vp9videoHeader);
1855 } else {
1856 observation_complete_->Set();
1857 }
1858 }
1859
1860 return SEND_PACKET;
1861 }
1862
1863 protected:
1864 rtc::scoped_ptr<VP9Encoder> vp9_encoder_;
1865 VideoCodecVP9 vp9_settings_;
1866 };
1867
1868 TEST_F(VideoSendStreamTest, VP9NoFlexMode) {
1869 class NoFlexibleMode : public VP9HeaderObeserver {
1870 void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override {
1871 EXPECT_FALSE(vp9videoHeader->flexible_mode);
1872 observation_complete_->Set();
1873 }
1874 } test;
1875
1876 RunBaseTest(&test);
1877 }
1878
1879 TEST_F(VideoSendStreamTest, VP9FlexMode) {
1880 class FlexibleMode : public VP9HeaderObeserver {
1881 void ModifyConfigsHook(
1882 VideoSendStream::Config* send_config,
1883 std::vector<VideoReceiveStream::Config>* receive_configs,
1884 VideoEncoderConfig* encoder_config) override {
1885 vp9_settings_.flexibleMode = true;
1886 }
1887
1888 void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override {
1889 EXPECT_TRUE(vp9videoHeader->flexible_mode);
1890 observation_complete_->Set();
1891 }
1892
1893 } test;
1894
1895 RunBaseTest(&test);
1896 }
1897
1798 } // namespace webrtc 1898 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698