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

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

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Address comments Created 5 years 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 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 16 matching lines...) Expand all
27 27
28 #include <string> 28 #include <string>
29 29
30 #include "talk/app/webrtc/remotevideocapturer.h" 30 #include "talk/app/webrtc/remotevideocapturer.h"
31 #include "talk/app/webrtc/test/fakevideotrackrenderer.h" 31 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
32 #include "talk/app/webrtc/videosource.h" 32 #include "talk/app/webrtc/videosource.h"
33 #include "talk/app/webrtc/videotrack.h" 33 #include "talk/app/webrtc/videotrack.h"
34 #include "talk/media/base/fakemediaengine.h" 34 #include "talk/media/base/fakemediaengine.h"
35 #include "talk/media/webrtc/webrtcvideoframe.h" 35 #include "talk/media/webrtc/webrtcvideoframe.h"
36 #include "talk/session/media/channelmanager.h" 36 #include "talk/session/media/channelmanager.h"
37 #include "webrtc/audio/audio_sink.h"
37 #include "webrtc/base/gunit.h" 38 #include "webrtc/base/gunit.h"
38 #include "webrtc/base/scoped_ptr.h" 39 #include "webrtc/base/scoped_ptr.h"
39 40
40 using webrtc::FakeVideoTrackRenderer; 41 using webrtc::FakeVideoTrackRenderer;
41 using webrtc::VideoSource; 42 using webrtc::VideoSource;
42 using webrtc::VideoTrack; 43 using webrtc::VideoTrack;
43 using webrtc::VideoTrackInterface; 44 using webrtc::VideoTrackInterface;
44 45
45 namespace { 46 namespace {
46 47
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 103
103 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 104 EXPECT_EQ(2, renderer_1->num_rendered_frames());
104 EXPECT_EQ(1, renderer_2->num_rendered_frames()); 105 EXPECT_EQ(1, renderer_2->num_rendered_frames());
105 106
106 video_track_->RemoveRenderer(renderer_1.get()); 107 video_track_->RemoveRenderer(renderer_1.get());
107 renderer_input->RenderFrame(&frame); 108 renderer_input->RenderFrame(&frame);
108 109
109 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 110 EXPECT_EQ(2, renderer_1->num_rendered_frames());
110 EXPECT_EQ(2, renderer_2->num_rendered_frames()); 111 EXPECT_EQ(2, renderer_2->num_rendered_frames());
111 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698