Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 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 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 763 // Tests setting up and configuring multiple incoming streams. | 763 // Tests setting up and configuring multiple incoming streams. |
| 764 void AddRemoveRecvStreams() { | 764 void AddRemoveRecvStreams() { |
| 765 cricket::FakeVideoRenderer renderer1, renderer2; | 765 cricket::FakeVideoRenderer renderer1, renderer2; |
| 766 cricket::VideoSendParameters parameters; | 766 cricket::VideoSendParameters parameters; |
| 767 parameters.codecs.push_back(DefaultCodec()); | 767 parameters.codecs.push_back(DefaultCodec()); |
| 768 EXPECT_TRUE(channel_->SetSendParameters(parameters)); | 768 EXPECT_TRUE(channel_->SetSendParameters(parameters)); |
| 769 | 769 |
| 770 // Ensure we can't set the renderer on a non-existent stream. | 770 // Ensure we can't set the renderer on a non-existent stream. |
| 771 EXPECT_FALSE(channel_->SetRenderer(1, &renderer1)); | 771 EXPECT_FALSE(channel_->SetRenderer(1, &renderer1)); |
| 772 EXPECT_FALSE(channel_->SetRenderer(2, &renderer2)); | 772 EXPECT_FALSE(channel_->SetRenderer(2, &renderer2)); |
| 773 cricket::VideoRenderer* renderer; | |
| 774 EXPECT_FALSE(channel_->GetRenderer(1, &renderer)); | |
| 775 EXPECT_FALSE(channel_->GetRenderer(2, &renderer)); | |
| 776 | 773 |
| 777 // Ensure we can add streams. | 774 // Ensure we can add streams. |
| 778 EXPECT_TRUE(channel_->AddRecvStream( | 775 EXPECT_TRUE(channel_->AddRecvStream( |
| 779 cricket::StreamParams::CreateLegacy(1))); | 776 cricket::StreamParams::CreateLegacy(1))); |
| 780 EXPECT_TRUE(channel_->AddRecvStream( | 777 EXPECT_TRUE(channel_->AddRecvStream( |
| 781 cricket::StreamParams::CreateLegacy(2))); | 778 cricket::StreamParams::CreateLegacy(2))); |
| 782 EXPECT_TRUE(channel_->GetRenderer(1, &renderer)); | |
| 783 EXPECT_TRUE(renderer == NULL); | |
| 784 EXPECT_TRUE(channel_->GetRenderer(2, &renderer)); | |
| 785 EXPECT_TRUE(NULL == renderer); | |
| 786 | 779 |
| 787 // Ensure we can now set the renderers. | 780 // Ensure we can now set the renderers. |
| 788 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1)); | 781 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1)); |
| 789 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2)); | 782 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2)); |
| 790 EXPECT_TRUE(channel_->GetRenderer(1, &renderer)); | |
| 791 EXPECT_TRUE(&renderer1 == renderer); | |
| 792 EXPECT_TRUE(channel_->GetRenderer(2, &renderer)); | |
| 793 EXPECT_TRUE(&renderer2 == renderer); | |
| 794 | 783 |
| 795 // Ensure we can change the renderers if needed. | 784 // Ensure we can change the renderers if needed. |
| 796 EXPECT_TRUE(channel_->SetRenderer(1, &renderer2)); | 785 EXPECT_TRUE(channel_->SetRenderer(1, &renderer2)); |
| 797 EXPECT_TRUE(channel_->SetRenderer(2, &renderer1)); | 786 EXPECT_TRUE(channel_->SetRenderer(2, &renderer1)); |
| 798 EXPECT_TRUE(channel_->GetRenderer(1, &renderer)); | |
| 799 EXPECT_TRUE(&renderer2 == renderer); | |
| 800 EXPECT_TRUE(channel_->GetRenderer(2, &renderer)); | |
| 801 EXPECT_TRUE(&renderer1 == renderer); | |
| 802 | 787 |
| 803 EXPECT_TRUE(channel_->RemoveRecvStream(2)); | 788 EXPECT_TRUE(channel_->RemoveRecvStream(2)); |
| 804 EXPECT_TRUE(channel_->RemoveRecvStream(1)); | 789 EXPECT_TRUE(channel_->RemoveRecvStream(1)); |
| 805 EXPECT_FALSE(channel_->GetRenderer(1, &renderer)); | |
| 806 EXPECT_FALSE(channel_->GetRenderer(2, &renderer)); | |
| 807 } | 790 } |
| 808 | 791 |
| 809 // Tests setting up and configuring multiple incoming streams in a | 792 // Tests setting up and configuring multiple incoming streams in a |
| 810 // non-conference call. | 793 // non-conference call. |
| 811 void AddRemoveRecvStreamsNoConference() { | 794 void AddRemoveRecvStreamsNoConference() { |
|
pbos-webrtc
2016/01/20 13:28:16
Do these tests now check anything useful?
nisse-webrtc
2016/01/20 13:49:28
They check return values. Not sure if that's usefu
| |
| 812 cricket::FakeVideoRenderer renderer1, renderer2; | 795 cricket::FakeVideoRenderer renderer1, renderer2; |
| 813 // Ensure we can't set the renderer on a non-existent stream. | 796 // Ensure we can't set the renderer on a non-existent stream. |
| 814 EXPECT_FALSE(channel_->SetRenderer(1, &renderer1)); | 797 EXPECT_FALSE(channel_->SetRenderer(1, &renderer1)); |
| 815 EXPECT_FALSE(channel_->SetRenderer(2, &renderer2)); | 798 EXPECT_FALSE(channel_->SetRenderer(2, &renderer2)); |
| 816 cricket::VideoRenderer* renderer; | |
| 817 EXPECT_FALSE(channel_->GetRenderer(1, &renderer)); | |
| 818 EXPECT_FALSE(channel_->GetRenderer(2, &renderer)); | |
| 819 | 799 |
| 820 // Ensure we can add streams. | 800 // Ensure we can add streams. |
| 821 EXPECT_TRUE(channel_->AddRecvStream( | 801 EXPECT_TRUE(channel_->AddRecvStream( |
| 822 cricket::StreamParams::CreateLegacy(1))); | 802 cricket::StreamParams::CreateLegacy(1))); |
| 823 EXPECT_TRUE(channel_->AddRecvStream( | 803 EXPECT_TRUE(channel_->AddRecvStream( |
| 824 cricket::StreamParams::CreateLegacy(2))); | 804 cricket::StreamParams::CreateLegacy(2))); |
| 825 EXPECT_TRUE(channel_->GetRenderer(1, &renderer)); | |
| 826 // Verify the first AddRecvStream hook up to the default renderer. | |
| 827 EXPECT_TRUE(renderer == NULL); | |
| 828 EXPECT_TRUE(channel_->GetRenderer(2, &renderer)); | |
| 829 EXPECT_TRUE(NULL == renderer); | |
| 830 | 805 |
| 831 // Ensure we can now set the renderers. | 806 // Ensure we can now set the renderers. |
| 832 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1)); | 807 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1)); |
| 833 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2)); | 808 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2)); |
| 834 EXPECT_TRUE(channel_->GetRenderer(1, &renderer)); | |
| 835 EXPECT_TRUE(&renderer1 == renderer); | |
| 836 EXPECT_TRUE(channel_->GetRenderer(2, &renderer)); | |
| 837 EXPECT_TRUE(&renderer2 == renderer); | |
| 838 | 809 |
| 839 // Ensure we can change the renderers if needed. | 810 // Ensure we can change the renderers if needed. |
| 840 EXPECT_TRUE(channel_->SetRenderer(1, &renderer2)); | 811 EXPECT_TRUE(channel_->SetRenderer(1, &renderer2)); |
| 841 EXPECT_TRUE(channel_->SetRenderer(2, &renderer1)); | 812 EXPECT_TRUE(channel_->SetRenderer(2, &renderer1)); |
| 842 EXPECT_TRUE(channel_->GetRenderer(1, &renderer)); | |
| 843 EXPECT_TRUE(&renderer2 == renderer); | |
| 844 EXPECT_TRUE(channel_->GetRenderer(2, &renderer)); | |
| 845 EXPECT_TRUE(&renderer1 == renderer); | |
| 846 | 813 |
| 847 EXPECT_TRUE(channel_->RemoveRecvStream(2)); | 814 EXPECT_TRUE(channel_->RemoveRecvStream(2)); |
| 848 EXPECT_TRUE(channel_->RemoveRecvStream(1)); | 815 EXPECT_TRUE(channel_->RemoveRecvStream(1)); |
| 849 EXPECT_FALSE(channel_->GetRenderer(1, &renderer)); | |
| 850 EXPECT_FALSE(channel_->GetRenderer(2, &renderer)); | |
| 851 } | 816 } |
| 852 | 817 |
| 853 // Test that no frames are rendered after the receive stream have been | 818 // Test that no frames are rendered after the receive stream have been |
| 854 // removed. | 819 // removed. |
| 855 void AddRemoveRecvStreamAndRender() { | 820 void AddRemoveRecvStreamAndRender() { |
| 856 cricket::FakeVideoRenderer renderer1; | 821 cricket::FakeVideoRenderer renderer1; |
| 857 EXPECT_TRUE(SetDefaultCodec()); | 822 EXPECT_TRUE(SetDefaultCodec()); |
| 858 EXPECT_TRUE(SetSend(true)); | 823 EXPECT_TRUE(SetSend(true)); |
| 859 EXPECT_TRUE(channel_->AddRecvStream( | 824 EXPECT_TRUE(channel_->AddRecvStream( |
| 860 cricket::StreamParams::CreateLegacy(kSsrc))); | 825 cricket::StreamParams::CreateLegacy(kSsrc))); |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1467 rtc::scoped_ptr<C> channel_; | 1432 rtc::scoped_ptr<C> channel_; |
| 1468 cricket::FakeNetworkInterface network_interface_; | 1433 cricket::FakeNetworkInterface network_interface_; |
| 1469 cricket::FakeVideoRenderer renderer_; | 1434 cricket::FakeVideoRenderer renderer_; |
| 1470 cricket::VideoMediaChannel::Error media_error_; | 1435 cricket::VideoMediaChannel::Error media_error_; |
| 1471 | 1436 |
| 1472 // Used by test cases where 2 streams are run on the same channel. | 1437 // Used by test cases where 2 streams are run on the same channel. |
| 1473 cricket::FakeVideoRenderer renderer2_; | 1438 cricket::FakeVideoRenderer renderer2_; |
| 1474 }; | 1439 }; |
| 1475 | 1440 |
| 1476 #endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT | 1441 #endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT |
| OLD | NEW |