talk/app/webrtc/java/jni/androidvideocapturer_jni.h - Issue 1345433002: Add RTC_ prefix to contructormagic macros.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: talk/app/webrtc/java/jni/androidvideocapturer_jni.h

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Formatting fix. Created 5 years, 3 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/dtmfsender.h ('k') | talk/app/webrtc/jsepicecandidate.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * libjingle	2 * libjingle

3 * Copyright 2015 Google Inc.	3 * Copyright 2015 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 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 // AndroidVideoCapturerDelegate::Start	95 // AndroidVideoCapturerDelegate::Start

96 // until AndroidVideoCapturerDelegate::Stop.	96 // until AndroidVideoCapturerDelegate::Stop.

97 rtc::CriticalSection capturer_lock_;	97 rtc::CriticalSection capturer_lock_;

98 webrtc::AndroidVideoCapturer* capturer_ GUARDED_BY(capturer_lock_);	98 webrtc::AndroidVideoCapturer* capturer_ GUARDED_BY(capturer_lock_);

99 // \|invoker_\| is used to communicate with \|capturer_\| on the thread Start() is	99 // \|invoker_\| is used to communicate with \|capturer_\| on the thread Start() is

100 // called on.	100 // called on.

101 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);	101 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);

102	102

103 static jobject application_context_;	103 static jobject application_context_;

104	104

105 DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);	105 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);

106 };	106 };

107	107

108 } // namespace webrtc_jni	108 } // namespace webrtc_jni

109	109

110 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_	110 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_

OLD	NEW