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

Side by Side Diff: talk/app/webrtc/videotrack_unittest.cc

Issue 1668473003: Delete backwards compatibility cruft from cricket::VideoFrame and VideoSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 | « talk/app/webrtc/videosourceinterface.h ('k') | talk/media/base/videoframe.h » ('j') | 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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // Test that disabling the track results in blacked out frames. 113 // Test that disabling the track results in blacked out frames.
114 TEST_F(VideoTrackTest, DisableTrackBlackout) { 114 TEST_F(VideoTrackTest, DisableTrackBlackout) {
115 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer( 115 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer(
116 new FakeVideoTrackRenderer(video_track_.get())); 116 new FakeVideoTrackRenderer(video_track_.get()));
117 117
118 cricket::VideoRenderer* renderer_input = 118 cricket::VideoRenderer* renderer_input =
119 video_track_->GetSource()->FrameInput(); 119 video_track_->GetSource()->FrameInput();
120 ASSERT_FALSE(renderer_input == NULL); 120 ASSERT_FALSE(renderer_input == NULL);
121 121
122 cricket::WebRtcVideoFrame frame; 122 cricket::WebRtcVideoFrame frame;
123 frame.InitToBlack(100, 200, 1, 1, 0); 123 frame.InitToBlack(100, 200, 0);
124 // Make it not all-black 124 // Make it not all-black
125 frame.GetUPlane()[0] = 0; 125 frame.GetUPlane()[0] = 0;
126 126
127 renderer_input->RenderFrame(&frame); 127 renderer_input->RenderFrame(&frame);
128 EXPECT_EQ(1, renderer->num_rendered_frames()); 128 EXPECT_EQ(1, renderer->num_rendered_frames());
129 EXPECT_FALSE(renderer->black_frame()); 129 EXPECT_FALSE(renderer->black_frame());
130 EXPECT_EQ(100, renderer->width()); 130 EXPECT_EQ(100, renderer->width());
131 EXPECT_EQ(200, renderer->height()); 131 EXPECT_EQ(200, renderer->height());
132 132
133 video_track_->set_enabled(false); 133 video_track_->set_enabled(false);
134 renderer_input->RenderFrame(&frame); 134 renderer_input->RenderFrame(&frame);
135 EXPECT_EQ(2, renderer->num_rendered_frames()); 135 EXPECT_EQ(2, renderer->num_rendered_frames());
136 EXPECT_TRUE(renderer->black_frame()); 136 EXPECT_TRUE(renderer->black_frame());
137 EXPECT_EQ(100, renderer->width()); 137 EXPECT_EQ(100, renderer->width());
138 EXPECT_EQ(200, renderer->height()); 138 EXPECT_EQ(200, renderer->height());
139 139
140 video_track_->set_enabled(true); 140 video_track_->set_enabled(true);
141 renderer_input->RenderFrame(&frame); 141 renderer_input->RenderFrame(&frame);
142 EXPECT_EQ(3, renderer->num_rendered_frames()); 142 EXPECT_EQ(3, renderer->num_rendered_frames());
143 EXPECT_FALSE(renderer->black_frame()); 143 EXPECT_FALSE(renderer->black_frame());
144 EXPECT_EQ(100, renderer->width()); 144 EXPECT_EQ(100, renderer->width());
145 EXPECT_EQ(200, renderer->height()); 145 EXPECT_EQ(200, renderer->height());
146 } 146 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/videosourceinterface.h ('k') | talk/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698