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

Side by Side Diff: talk/app/webrtc/videosource.h

Issue 1660103003: Delete FrameInput method and FrameInputWrapper class. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed Per's comments. Added dummy FrameInput. 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
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 static rtc::scoped_refptr<VideoSource> Create( 67 static rtc::scoped_refptr<VideoSource> Create(
68 cricket::ChannelManager* channel_manager, 68 cricket::ChannelManager* channel_manager,
69 cricket::VideoCapturer* capturer, 69 cricket::VideoCapturer* capturer,
70 const webrtc::MediaConstraintsInterface* constraints, 70 const webrtc::MediaConstraintsInterface* constraints,
71 bool remote); 71 bool remote);
72 72
73 SourceState state() const override { return state_; } 73 SourceState state() const override { return state_; }
74 bool remote() const override { return remote_; } 74 bool remote() const override { return remote_; }
75 75
76 virtual const cricket::VideoOptions* options() const { return &options_; } 76 virtual const cricket::VideoOptions* options() const { return &options_; }
77 virtual cricket::VideoRenderer* FrameInput(); 77 // TODO(nisse): Dummy implementation. Delete as soon as chrome's
78 // MockVideoSource is updated.
79 virtual cricket::VideoRenderer* FrameInput() { return nullptr; }
78 80
79 virtual cricket::VideoCapturer* GetVideoCapturer() { 81 virtual cricket::VideoCapturer* GetVideoCapturer() {
80 return video_capturer_.get(); 82 return video_capturer_.get();
81 } 83 }
82 84
83 void Stop() override; 85 void Stop() override;
84 void Restart() override; 86 void Restart() override;
85 87
86 // |output| will be served video frames as long as the underlying capturer 88 // |output| will be served video frames as long as the underlying capturer
87 // is running video frames. 89 // is running video frames.
(...skipping 20 matching lines...) Expand all
108 110
109 cricket::VideoFormat format_; 111 cricket::VideoFormat format_;
110 cricket::VideoOptions options_; 112 cricket::VideoOptions options_;
111 SourceState state_; 113 SourceState state_;
112 const bool remote_; 114 const bool remote_;
113 }; 115 };
114 116
115 } // namespace webrtc 117 } // namespace webrtc
116 118
117 #endif // TALK_APP_WEBRTC_VIDEOSOURCE_H_ 119 #endif // TALK_APP_WEBRTC_VIDEOSOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698