Format almost everything.
This CL was generated by running git ls-files | grep -P "(\.h|\.cc)$" | grep -v 'sdk/' | grep -v 'rtc_base/ssl_' | \ grep -v 'fake_rtc_certificate_generator.h' | grep -v 'modules/audio_device/win/' | \ grep -v 'system_wrappers/source/clock.cc' | grep -v 'rtc_base/trace_event.h' | \ grep -v 'modules/audio_coding/codecs/ilbc/' | grep -v 'screen_capturer_mac.h' | \ grep -v 'spl_inl_mips.h' | grep -v 'data_size_unittest.cc' | grep -v 'timestamp_unittest.cc' \ | xargs clang-format -i ; git cl format Most of these changes are clang-format grouping and reordering includes differently. Bug: webrtc:9340 Change-Id: Ic83ddbc169bfacd21883e381b5181c3dd4fe8a63 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144051 Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28505}
This commit is contained in:
@ -57,8 +57,9 @@ enum H264DecoderImplEvent {
|
||||
|
||||
} // namespace
|
||||
|
||||
int H264DecoderImpl::AVGetBuffer2(
|
||||
AVCodecContext* context, AVFrame* av_frame, int flags) {
|
||||
int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context,
|
||||
AVFrame* av_frame,
|
||||
int flags) {
|
||||
// Set in |InitDecode|.
|
||||
H264DecoderImpl* decoder = static_cast<H264DecoderImpl*>(context->opaque);
|
||||
// DCHECK values set in |InitDecode|.
|
||||
@ -164,8 +165,7 @@ H264DecoderImpl::~H264DecoderImpl() {
|
||||
int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
|
||||
int32_t number_of_cores) {
|
||||
ReportInit();
|
||||
if (codec_settings &&
|
||||
codec_settings->codecType != kVideoCodecH264) {
|
||||
if (codec_settings && codec_settings->codecType != kVideoCodecH264) {
|
||||
ReportError();
|
||||
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
|
||||
}
|
||||
@ -368,8 +368,7 @@ void H264DecoderImpl::ReportInit() {
|
||||
if (has_reported_init_)
|
||||
return;
|
||||
RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event",
|
||||
kH264DecoderEventInit,
|
||||
kH264DecoderEventMax);
|
||||
kH264DecoderEventInit, kH264DecoderEventMax);
|
||||
has_reported_init_ = true;
|
||||
}
|
||||
|
||||
@ -377,8 +376,7 @@ void H264DecoderImpl::ReportError() {
|
||||
if (has_reported_error_)
|
||||
return;
|
||||
RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event",
|
||||
kH264DecoderEventError,
|
||||
kH264DecoderEventMax);
|
||||
kH264DecoderEventError, kH264DecoderEventMax);
|
||||
has_reported_error_ = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user