OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2009 Google Inc. | 3 * Copyright 2009 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 1862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1873 } | 1873 } |
1874 }; | 1874 }; |
1875 | 1875 |
1876 // override to add NULL parameter | 1876 // override to add NULL parameter |
1877 template<> | 1877 template<> |
1878 cricket::VideoChannel* ChannelTest<VideoTraits>::CreateChannel( | 1878 cricket::VideoChannel* ChannelTest<VideoTraits>::CreateChannel( |
1879 rtc::Thread* thread, cricket::MediaEngineInterface* engine, | 1879 rtc::Thread* thread, cricket::MediaEngineInterface* engine, |
1880 cricket::FakeVideoMediaChannel* ch, cricket::BaseSession* session, | 1880 cricket::FakeVideoMediaChannel* ch, cricket::BaseSession* session, |
1881 bool rtcp) { | 1881 bool rtcp) { |
1882 cricket::VideoChannel* channel = new cricket::VideoChannel( | 1882 cricket::VideoChannel* channel = new cricket::VideoChannel( |
1883 thread, engine, ch, session, cricket::CN_VIDEO, rtcp); | 1883 thread, ch, session, cricket::CN_VIDEO, rtcp); |
1884 if (!channel->Init()) { | 1884 if (!channel->Init()) { |
1885 delete channel; | 1885 delete channel; |
1886 channel = NULL; | 1886 channel = NULL; |
1887 } | 1887 } |
1888 return channel; | 1888 return channel; |
1889 } | 1889 } |
1890 | 1890 |
1891 // override to add 0 parameter | 1891 // override to add 0 parameter |
1892 template<> | 1892 template<> |
1893 bool ChannelTest<VideoTraits>::AddStream1(int id) { | 1893 bool ChannelTest<VideoTraits>::AddStream1(int id) { |
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2874 }; | 2874 }; |
2875 rtc::Buffer payload(data, 3); | 2875 rtc::Buffer payload(data, 3); |
2876 cricket::SendDataResult result; | 2876 cricket::SendDataResult result; |
2877 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result)); | 2877 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result)); |
2878 EXPECT_EQ(params.ssrc, | 2878 EXPECT_EQ(params.ssrc, |
2879 media_channel1_->last_sent_data_params().ssrc); | 2879 media_channel1_->last_sent_data_params().ssrc); |
2880 EXPECT_EQ("foo", media_channel1_->last_sent_data()); | 2880 EXPECT_EQ("foo", media_channel1_->last_sent_data()); |
2881 } | 2881 } |
2882 | 2882 |
2883 // TODO(pthatcher): TestSetReceiver? | 2883 // TODO(pthatcher): TestSetReceiver? |
OLD | NEW |