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

Unified Diff: talk/media/webrtc/nullwebrtcvideoengine_unittest.cc

Issue 1621453005: Fix compilation if HAVE_WEBRTC_VIDEO is not defined. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed wrong filename in gyp Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/nullwebrtcvideoengine.h ('k') | talk/media/webrtc/webrtcmediaengine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/nullwebrtcvideoengine_unittest.cc
diff --git a/talk/media/base/turnutils.h b/talk/media/webrtc/nullwebrtcvideoengine_unittest.cc
similarity index 61%
copy from talk/media/base/turnutils.h
copy to talk/media/webrtc/nullwebrtcvideoengine_unittest.cc
index 47fcebef6eadd198dfdf0f6fb7d635d913ff6516..34e4af5e9e9f08ff91bb69560ff4303206387795 100644
--- a/talk/media/base/turnutils.h
+++ b/talk/media/webrtc/nullwebrtcvideoengine_unittest.cc
@@ -25,23 +25,32 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TALK_MEDIA_BASE_TURNUTILS_H_
-#define TALK_MEDIA_BASE_TURNUTILS_H_
+#include "testing/gtest/include/gtest/gtest.h"
-#include <cstddef>
-#include <cstdint>
+#include "talk/media/webrtc/nullwebrtcvideoengine.h"
+#include "talk/media/webrtc/webrtcvoiceengine.h"
namespace cricket {
-struct PacketOptions;
+class WebRtcMediaEngineNullVideo
+ : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
+ public:
+ WebRtcMediaEngineNullVideo(webrtc::AudioDeviceModule* adm,
+ WebRtcVideoEncoderFactory* encoder_factory,
+ WebRtcVideoDecoderFactory* decoder_factory) {
+ voice_.SetAudioDeviceModule(adm);
+ video_.SetExternalDecoderFactory(decoder_factory);
+ video_.SetExternalEncoderFactory(encoder_factory);
+ }
+};
-// Finds data location within a TURN Channel Message or TURN Send Indication
-// message.
-bool UnwrapTurnPacket(const uint8_t* packet,
- size_t packet_size,
- size_t* content_position,
- size_t* content_size);
+// Simple test to check if NullWebRtcVideoEngine implements the methods
+// required by CompositeMediaEngine.
+TEST(NullWebRtcVideoEngineTest, CheckInterface) {
+ WebRtcMediaEngineNullVideo engine(nullptr, nullptr, nullptr);
-} // namespace cricket
+ EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
+ engine.Terminate();
+}
-#endif // TALK_MEDIA_BASE_TURNUTILS_H_
+} // namespace cricket
« no previous file with comments | « talk/media/webrtc/nullwebrtcvideoengine.h ('k') | talk/media/webrtc/webrtcmediaengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698