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

Side by Side Diff: talk/session/media/channel_unittest.cc

Issue 1437683005: Remove BundleFilter filtering of RTCP. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
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 1456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 ASSERT_TRUE(GetTransport2()); 1467 ASSERT_TRUE(GetTransport2());
1468 EXPECT_EQ(2U, GetTransport1()->channels().size()); 1468 EXPECT_EQ(2U, GetTransport1()->channels().size());
1469 EXPECT_EQ(expected_channels, GetTransport2()->channels().size()); 1469 EXPECT_EQ(expected_channels, GetTransport2()->channels().size());
1470 EXPECT_TRUE(SendAccept()); 1470 EXPECT_TRUE(SendAccept());
1471 EXPECT_EQ(expected_channels, GetTransport1()->channels().size()); 1471 EXPECT_EQ(expected_channels, GetTransport1()->channels().size());
1472 EXPECT_EQ(expected_channels, GetTransport2()->channels().size()); 1472 EXPECT_EQ(expected_channels, GetTransport2()->channels().size());
1473 EXPECT_TRUE(channel1_->bundle_filter()->FindPayloadType(pl_type1)); 1473 EXPECT_TRUE(channel1_->bundle_filter()->FindPayloadType(pl_type1));
1474 EXPECT_TRUE(channel2_->bundle_filter()->FindPayloadType(pl_type1)); 1474 EXPECT_TRUE(channel2_->bundle_filter()->FindPayloadType(pl_type1));
1475 EXPECT_FALSE(channel1_->bundle_filter()->FindPayloadType(pl_type2)); 1475 EXPECT_FALSE(channel1_->bundle_filter()->FindPayloadType(pl_type2));
1476 EXPECT_FALSE(channel2_->bundle_filter()->FindPayloadType(pl_type2)); 1476 EXPECT_FALSE(channel2_->bundle_filter()->FindPayloadType(pl_type2));
1477 // channel1 - should only have media_content2 as remote. i.e. kSsrc2
1478 EXPECT_TRUE(channel1_->bundle_filter()->FindStream(kSsrc2));
1479 EXPECT_FALSE(channel1_->bundle_filter()->FindStream(kSsrc1));
1480 // channel2 - should only have media_content1 as remote. i.e. kSsrc1
1481 EXPECT_TRUE(channel2_->bundle_filter()->FindStream(kSsrc1));
1482 EXPECT_FALSE(channel2_->bundle_filter()->FindStream(kSsrc2));
1483 1477
1484 // Both channels can receive pl_type1 only. 1478 // Both channels can receive pl_type1 only.
1485 EXPECT_TRUE(SendCustomRtp1(kSsrc1, ++sequence_number1_1, pl_type1)); 1479 EXPECT_TRUE(SendCustomRtp1(kSsrc1, ++sequence_number1_1, pl_type1));
1486 EXPECT_TRUE(CheckCustomRtp2(kSsrc1, sequence_number1_1, pl_type1)); 1480 EXPECT_TRUE(CheckCustomRtp2(kSsrc1, sequence_number1_1, pl_type1));
1487 EXPECT_TRUE(SendCustomRtp2(kSsrc2, ++sequence_number2_2, pl_type1)); 1481 EXPECT_TRUE(SendCustomRtp2(kSsrc2, ++sequence_number2_2, pl_type1));
1488 EXPECT_TRUE(CheckCustomRtp1(kSsrc2, sequence_number2_2, pl_type1)); 1482 EXPECT_TRUE(CheckCustomRtp1(kSsrc2, sequence_number2_2, pl_type1));
1489 EXPECT_TRUE(CheckNoRtp1()); 1483 EXPECT_TRUE(CheckNoRtp1());
1490 EXPECT_TRUE(CheckNoRtp2()); 1484 EXPECT_TRUE(CheckNoRtp2());
1491 1485
1492 // RTCP test 1486 // RTCP test
(...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after
2793 }; 2787 };
2794 rtc::Buffer payload(data, 3); 2788 rtc::Buffer payload(data, 3);
2795 cricket::SendDataResult result; 2789 cricket::SendDataResult result;
2796 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result)); 2790 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
2797 EXPECT_EQ(params.ssrc, 2791 EXPECT_EQ(params.ssrc,
2798 media_channel1_->last_sent_data_params().ssrc); 2792 media_channel1_->last_sent_data_params().ssrc);
2799 EXPECT_EQ("foo", media_channel1_->last_sent_data()); 2793 EXPECT_EQ("foo", media_channel1_->last_sent_data());
2800 } 2794 }
2801 2795
2802 // TODO(pthatcher): TestSetReceiver? 2796 // TODO(pthatcher): TestSetReceiver?
OLDNEW
« talk/session/media/bundlefilter.h ('K') | « talk/session/media/channel.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698