zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of place basictypes.h with stdint.h for int_t types. (patchset #1 id:1 of https://codereview.webrtc.org/2603203003/ )

Browse Source 
Reason for revert:
Doing a reland where systeminfo.cc includes basictypes.h so that CPU_X86 etc. are defined when they are checked/used.

Original issue's description:
> Revert of Replace basictypes.h with stdint.h for int_t types. (patchset #1 id:1 of https://codereview.webrtc.org/2604043002/ )
>
> Reason for revert:
> Very likely cause of Chromium import bot breakage (unused function '__cpuid'), TBD why.
>
> Original issue's description:
> > Replace basictypes.h with stdint.h for int_t types.
> >
> > Removes basictypes.h for types that only makes use of it for fixed-size-int
> > typedefs and replaces it with stdint.h.
> >
> > BUG=webrtc:6853
> > R=tommi@webrtc.org
> >
> > Review-Url: https://codereview.webrtc.org/2604043002
> > Cr-Commit-Position: refs/heads/master@{#15867}
> > Committed: 7fd1a75300
>
> TBR=tommi@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6853
>
> Review-Url: https://codereview.webrtc.org/2603203003
> Cr-Commit-Position: refs/heads/master@{#15869}
> Committed: 7eb0e23bcf

BUG=webrtc:6853
TBR=tommi@webrtc.org

Review-Url: https://codereview.webrtc.org/2609783002
Cr-Commit-Position: refs/heads/master@{#15873}
This commit is contained in:
pbos
2017-01-02 08:42:32 -08:00
committed by Commit bot
parent 6769c49418
commit c7c26a0e64
32 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/api/rtpreceiver.h
View File

@ -15,13 +15,14 @@
#ifndef WEBRTC_API_RTPRECEIVER_H_ #ifndef WEBRTC_API_RTPRECEIVER_H_
#define WEBRTC_API_RTPRECEIVER_H_ #define WEBRTC_API_RTPRECEIVER_H_
#include <stdint.h>
#include <string> #include <string>
#include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/remoteaudiosource.h" #include "webrtc/api/remoteaudiosource.h"
#include "webrtc/api/videotracksource.h" #include "webrtc/api/videotracksource.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h" #include "webrtc/base/sigslot.h"
#include "webrtc/media/base/videobroadcaster.h" #include "webrtc/media/base/videobroadcaster.h"
#include "webrtc/pc/channel.h" #include "webrtc/pc/channel.h"

4
webrtc/base/byteorder_unittest.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "webrtc/base/byteorder.h" #include <stdint.h>
#include "webrtc/base/basictypes.h" #include "webrtc/base/byteorder.h"
#include "webrtc/base/gunit.h" #include "webrtc/base/gunit.h"
namespace rtc { namespace rtc {

3
webrtc/base/network.h
View File

@ -11,13 +11,14 @@
#ifndef WEBRTC_BASE_NETWORK_H_ #ifndef WEBRTC_BASE_NETWORK_H_
#define WEBRTC_BASE_NETWORK_H_ #define WEBRTC_BASE_NETWORK_H_
#include <stdint.h>
#include <deque> #include <deque>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/ipaddress.h" #include "webrtc/base/ipaddress.h"
#include "webrtc/base/networkmonitor.h" #include "webrtc/base/networkmonitor.h"
#include "webrtc/base/messagehandler.h" #include "webrtc/base/messagehandler.h"

3
webrtc/base/rtccertificate.h
View File

@ -11,9 +11,10 @@
#ifndef WEBRTC_BASE_RTCCERTIFICATE_H_ #ifndef WEBRTC_BASE_RTCCERTIFICATE_H_
#define WEBRTC_BASE_RTCCERTIFICATE_H_ #define WEBRTC_BASE_RTCCERTIFICATE_H_
#include <stdint.h>
#include <memory> #include <memory>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/refcount.h" #include "webrtc/base/refcount.h"
#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/base/sslidentity.h" #include "webrtc/base/sslidentity.h"

1
webrtc/base/systeminfo.cc
View File

@ -27,6 +27,7 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#include "webrtc/base/basictypes.h"
#include "webrtc/base/common.h" #include "webrtc/base/common.h"
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
#include "webrtc/base/stringutils.h" #include "webrtc/base/stringutils.h"

4
webrtc/base/systeminfo.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_BASE_SYSTEMINFO_H__ #ifndef WEBRTC_BASE_SYSTEMINFO_H__
#define WEBRTC_BASE_SYSTEMINFO_H__ #define WEBRTC_BASE_SYSTEMINFO_H__
#include <string> #include <stdint.h>
#include "webrtc/base/basictypes.h" #include <string>
namespace rtc { namespace rtc {

4
webrtc/base/task.h
View File

@ -11,8 +11,10 @@
#ifndef WEBRTC_BASE_TASK_H__ #ifndef WEBRTC_BASE_TASK_H__
#define WEBRTC_BASE_TASK_H__ #define WEBRTC_BASE_TASK_H__
#include <stdint.h>
#include <string> #include <string>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h" #include "webrtc/base/sigslot.h"
#include "webrtc/base/taskparent.h" #include "webrtc/base/taskparent.h"

3
webrtc/base/taskrunner.h
View File

@ -11,9 +11,10 @@
#ifndef WEBRTC_BASE_TASKRUNNER_H__ #ifndef WEBRTC_BASE_TASKRUNNER_H__
#define WEBRTC_BASE_TASKRUNNER_H__ #define WEBRTC_BASE_TASKRUNNER_H__
#include <stdint.h>
#include <vector> #include <vector>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h" #include "webrtc/base/sigslot.h"
#include "webrtc/base/taskparent.h" #include "webrtc/base/taskparent.h"

3
webrtc/base/timedelta.h
View File

@ -11,7 +11,8 @@
#ifndef WEBRTC_BASE_TIMEDELTA_H_ #ifndef WEBRTC_BASE_TIMEDELTA_H_
#define WEBRTC_BASE_TIMEDELTA_H_ #define WEBRTC_BASE_TIMEDELTA_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/base/timeutils.h" #include "webrtc/base/timeutils.h"
// Convenience class to convert between different units of relative time. // Convenience class to convert between different units of relative time.

3
webrtc/base/timestampaligner.h
View File

@ -11,7 +11,8 @@
#ifndef WEBRTC_BASE_TIMESTAMPALIGNER_H_ #ifndef WEBRTC_BASE_TIMESTAMPALIGNER_H_
#define WEBRTC_BASE_TIMESTAMPALIGNER_H_ #define WEBRTC_BASE_TIMESTAMPALIGNER_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
namespace rtc { namespace rtc {

4
webrtc/base/timeutils.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_BASE_TIMEUTILS_H_ #ifndef WEBRTC_BASE_TIMEUTILS_H_
#define WEBRTC_BASE_TIMEUTILS_H_ #define WEBRTC_BASE_TIMEUTILS_H_
#include <ctime> #include <stdint.h>
#include <time.h> #include <time.h>
#include "webrtc/base/basictypes.h" #include <ctime>
namespace rtc { namespace rtc {

3
webrtc/base/window.h
View File

@ -11,7 +11,8 @@
#ifndef WEBRTC_BASE_WINDOW_H_ #ifndef WEBRTC_BASE_WINDOW_H_
#define WEBRTC_BASE_WINDOW_H_ #define WEBRTC_BASE_WINDOW_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/base/stringencode.h" #include "webrtc/base/stringencode.h"
// Define platform specific window types. // Define platform specific window types.

2
webrtc/call/flexfec_receive_stream.h
View File

@ -11,6 +11,8 @@
#ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ #ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_
#define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ #define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_
#include <stdint.h>
#include <string> #include <string>
#include <vector> #include <vector>

3
webrtc/call/flexfec_receive_stream_unittest.cc
View File

@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <stdint.h>
#include "webrtc/base/array_view.h" #include "webrtc/base/array_view.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/call/flexfec_receive_stream_impl.h" #include "webrtc/call/flexfec_receive_stream_impl.h"
#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h"

4
webrtc/examples/peerconnection/client/defaults.h
View File

@ -12,9 +12,9 @@
#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_
#pragma once #pragma once
#include <string> #include <stdint.h>
#include "webrtc/base/basictypes.h" #include <string>
extern const char kAudioLabel[]; extern const char kAudioLabel[];
extern const char kVideoLabel[]; extern const char kVideoLabel[];

3
webrtc/media/base/streamparams.h
View File

@ -26,12 +26,13 @@
#ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ #ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
#define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ #define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_
#include <stdint.h>
#include <algorithm> #include <algorithm>
#include <set> #include <set>
#include <string> #include <string>
#include <vector> #include <vector>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
namespace cricket { namespace cricket {

3
webrtc/media/base/videocapturer.h
View File

@ -13,12 +13,13 @@
#ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ #ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
#define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ #define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
#include <stdint.h>
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
#include "webrtc/base/criticalsection.h" #include "webrtc/base/criticalsection.h"
#include "webrtc/media/base/videosourceinterface.h" #include "webrtc/media/base/videosourceinterface.h"

3
webrtc/media/base/videocommon.h
View File

@ -13,9 +13,10 @@
#ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT #ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT
#define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ #define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_
#include <stdint.h>
#include <string> #include <string>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/timeutils.h" #include "webrtc/base/timeutils.h"
namespace cricket { namespace cricket {

3
webrtc/media/devices/gtkvideorenderer.h
View File

@ -14,9 +14,10 @@
#ifndef WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_ #ifndef WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
#define WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_ #define WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_
#include <stdint.h>
#include <memory> #include <memory>
#include "webrtc/base/basictypes.h"
#include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosinkinterface.h"
typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h

3
webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h
View File

@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/base/criticalsection.h" #include "webrtc/base/criticalsection.h"
#include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/include/module_common_types.h"

3
webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h
View File

@ -10,7 +10,8 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/common_video/rotation.h" #include "webrtc/common_video/rotation.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"

3
webrtc/modules/rtp_rtcp/source/time_util.h
View File

@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/system_wrappers/include/ntp_time.h" #include "webrtc/system_wrappers/include/ntp_time.h"
namespace webrtc { namespace webrtc {

4
webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
View File

@ -10,8 +10,10 @@
#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" #include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h"
#include <stdint.h>
#include <vector> #include <vector>
#include "webrtc/base/basictypes.h"
#include "webrtc/test/gtest.h" #include "webrtc/test/gtest.h"
namespace webrtc { namespace webrtc {

4
webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
View File

@ -9,8 +9,8 @@
*/ */
#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h" #include <stdint.h>
namespace webrtc { namespace webrtc {

3
webrtc/modules/video_coding/utility/simulcast_rate_allocator.h
View File

@ -11,10 +11,11 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_ #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
#include <stdint.h>
#include <map> #include <map>
#include <memory> #include <memory>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
#include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/common_video/include/video_bitrate_allocator.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"

2
webrtc/p2p/base/candidate.h
View File

@ -13,6 +13,7 @@
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include <stdint.h>
#include <algorithm> #include <algorithm>
#include <iomanip> #include <iomanip>
@ -20,7 +21,6 @@
#include <string> #include <string>
#include "webrtc/p2p/base/p2pconstants.h" #include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/helpers.h" #include "webrtc/base/helpers.h"
#include "webrtc/base/network.h" #include "webrtc/base/network.h"
#include "webrtc/base/socketaddress.h" #include "webrtc/base/socketaddress.h"

3
webrtc/p2p/stunprober/stunprober_unittest.cc
View File

@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <stdint.h>
#include <memory> #include <memory>
#include "webrtc/base/asyncresolverinterface.h" #include "webrtc/base/asyncresolverinterface.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/bind.h" #include "webrtc/base/bind.h"
#include "webrtc/base/checks.h" #include "webrtc/base/checks.h"
#include "webrtc/base/gunit.h" #include "webrtc/base/gunit.h"

3
webrtc/pc/currentspeakermonitor.h
View File

@ -14,9 +14,10 @@
#ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ #ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
#define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ #define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
#include <stdint.h>
#include <map> #include <map>
#include "webrtc/base/basictypes.h"
#include "webrtc/base/sigslot.h" #include "webrtc/base/sigslot.h"
namespace cricket { namespace cricket {

3
webrtc/pc/externalhmac.h
View File

@ -28,7 +28,8 @@
// functions and the corresponding authentication id using // functions and the corresponding authentication id using
// crypto_kernel_replace_auth_type function. // crypto_kernel_replace_auth_type function.
#include "webrtc/base/basictypes.h" #include <stdint.h>
#ifdef HAVE_SRTP #ifdef HAVE_SRTP
#include "third_party/libsrtp/crypto/include/auth.h" #include "third_party/libsrtp/crypto/include/auth.h"
#endif // HAVE_SRTP #endif // HAVE_SRTP

3
webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
View File

@ -13,10 +13,11 @@
#include "webrtc/base/networkmonitor.h" #include "webrtc/base/networkmonitor.h"
#include <stdint.h>
#include <map> #include <map>
#include "webrtc/sdk/android/src/jni/jni_helpers.h" #include "webrtc/sdk/android/src/jni/jni_helpers.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/thread_checker.h" #include "webrtc/base/thread_checker.h"
namespace webrtc_jni { namespace webrtc_jni {

3
webrtc/system_wrappers/include/ntp_time.h
View File

@ -10,7 +10,8 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/clock.h"
namespace webrtc { namespace webrtc {

3
webrtc/test/frame_utils.h
View File

@ -10,7 +10,8 @@
#ifndef WEBRTC_TEST_FRAME_UTILS_H_ #ifndef WEBRTC_TEST_FRAME_UTILS_H_
#define WEBRTC_TEST_FRAME_UTILS_H_ #define WEBRTC_TEST_FRAME_UTILS_H_
#include "webrtc/base/basictypes.h" #include <stdint.h>
#include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/scoped_ref_ptr.h"
namespace webrtc { namespace webrtc {