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

Side by Side Diff: talk/media/webrtc/webrtcvideocapturer.cc

Issue 1439823002: Remove webrtc/modules/video_{capture,render}/include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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/media/webrtc/webrtcvideocapturer.h ('k') | webrtc/modules/video_capture/BUILD.gn » ('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 2011 Google Inc. 3 * Copyright 2011 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 26 matching lines...) Expand all
37 #include "webrtc/base/arraysize.h" 37 #include "webrtc/base/arraysize.h"
38 #include "webrtc/base/bind.h" 38 #include "webrtc/base/bind.h"
39 #include "webrtc/base/checks.h" 39 #include "webrtc/base/checks.h"
40 #include "webrtc/base/criticalsection.h" 40 #include "webrtc/base/criticalsection.h"
41 #include "webrtc/base/logging.h" 41 #include "webrtc/base/logging.h"
42 #include "webrtc/base/safe_conversions.h" 42 #include "webrtc/base/safe_conversions.h"
43 #include "webrtc/base/thread.h" 43 #include "webrtc/base/thread.h"
44 #include "webrtc/base/timeutils.h" 44 #include "webrtc/base/timeutils.h"
45 45
46 #include "webrtc/base/win32.h" // Need this to #include the impl files. 46 #include "webrtc/base/win32.h" // Need this to #include the impl files.
47 #include "webrtc/modules/video_capture/include/video_capture_factory.h" 47 #include "webrtc/modules/video_capture/video_capture_factory.h"
48 #include "webrtc/system_wrappers/include/field_trial.h" 48 #include "webrtc/system_wrappers/include/field_trial.h"
49 49
50 namespace cricket { 50 namespace cricket {
51 51
52 struct kVideoFourCCEntry { 52 struct kVideoFourCCEntry {
53 uint32_t fourcc; 53 uint32_t fourcc;
54 webrtc::RawVideoType webrtc_type; 54 webrtc::RawVideoType webrtc_type;
55 }; 55 };
56 56
57 // This indicates our format preferences and defines a mapping between 57 // This indicates our format preferences and defines a mapping between
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 // Convert units from VideoFrame RenderTimeMs to CapturedFrame (nanoseconds). 438 // Convert units from VideoFrame RenderTimeMs to CapturedFrame (nanoseconds).
439 time_stamp = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec; 439 time_stamp = sample.render_time_ms() * rtc::kNumNanosecsPerMillisec;
440 data_size = rtc::checked_cast<uint32_t>(length); 440 data_size = rtc::checked_cast<uint32_t>(length);
441 data = buffer; 441 data = buffer;
442 rotation = sample.rotation(); 442 rotation = sample.rotation();
443 } 443 }
444 444
445 } // namespace cricket 445 } // namespace cricket
446 446
447 #endif // HAVE_WEBRTC_VIDEO 447 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideocapturer.h ('k') | webrtc/modules/video_capture/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698