commit 665174fdbb4e0540eccb27cf7412348f1b65534c
author Yves Gerey <yvesg@webrtc.org> Tue Jun 19 15:03:05 2018 +0200
committer Yves Gerey <yvesg@webrtc.org> Tue Jun 19 14:00:39 2018 +0000
tree 34a9eb770e6de54c282f62ad0b65d2cd69c917f6
parent b602123a5aae1a9f0b6b581e611acf44eb525c08

Reformat the WebRTC code base

Running clang-format with chromium's style guide.

The goal is n-fold:
 * providing consistency and readability (that's what code guidelines are for)
 * preventing noise with presubmit checks and git cl format
 * building on the previous point: making it easier to automatically fix format issues
 * you name it

Please consider using git-hyper-blame to ignore this commit.

Bug: webrtc:9340
Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87
Reviewed-on: https://webrtc-review.googlesource.com/81185
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23660}

modules/video_coding/generic_decoder.cc

diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index 580bfc9..01500e7 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -32,8 +32,7 @@
       _clock->CurrentNtpInMilliseconds() - _clock->TimeInMilliseconds();
 }
 
-VCMDecodedFrameCallback::~VCMDecodedFrameCallback() {
-}
+VCMDecodedFrameCallback::~VCMDecodedFrameCallback() {}
 
 void VCMDecodedFrameCallback::SetUserReceiveCallback(
     VCMReceiveCallback* receiveCallback) {
@@ -141,8 +140,8 @@
     _timing->SetTimingFrameInfo(timing_frame_info);
   }
 
-  decodedImage.set_timestamp_us(
-      frameInfo->renderTimeMs * rtc::kNumMicrosecsPerMillisec);
+  decodedImage.set_timestamp_us(frameInfo->renderTimeMs *
+                                rtc::kNumMicrosecsPerMillisec);
   decodedImage.set_rotation(frameInfo->rotation);
   _receiveCallback->FrameToRender(decodedImage, qp, frameInfo->content_type);
 }
@@ -211,39 +210,39 @@
 }
 
 int32_t VCMGenericDecoder::Decode(const VCMEncodedFrame& frame, int64_t nowMs) {
-    TRACE_EVENT1("webrtc", "VCMGenericDecoder::Decode", "timestamp",
-                 frame.EncodedImage()._timeStamp);
-    _frameInfos[_nextFrameInfoIdx].decodeStartTimeMs = nowMs;
-    _frameInfos[_nextFrameInfoIdx].renderTimeMs = frame.RenderTimeMs();
-    _frameInfos[_nextFrameInfoIdx].rotation = frame.rotation();
-    _frameInfos[_nextFrameInfoIdx].timing = frame.video_timing();
-    // Set correctly only for key frames. Thus, use latest key frame
-    // content type. If the corresponding key frame was lost, decode will fail
-    // and content type will be ignored.
-    if (frame.FrameType() == kVideoFrameKey) {
-      _frameInfos[_nextFrameInfoIdx].content_type = frame.contentType();
-      _last_keyframe_content_type = frame.contentType();
-    } else {
-      _frameInfos[_nextFrameInfoIdx].content_type = _last_keyframe_content_type;
-    }
-    _callback->Map(frame.TimeStamp(), &_frameInfos[_nextFrameInfoIdx]);
+  TRACE_EVENT1("webrtc", "VCMGenericDecoder::Decode", "timestamp",
+               frame.EncodedImage()._timeStamp);
+  _frameInfos[_nextFrameInfoIdx].decodeStartTimeMs = nowMs;
+  _frameInfos[_nextFrameInfoIdx].renderTimeMs = frame.RenderTimeMs();
+  _frameInfos[_nextFrameInfoIdx].rotation = frame.rotation();
+  _frameInfos[_nextFrameInfoIdx].timing = frame.video_timing();
+  // Set correctly only for key frames. Thus, use latest key frame
+  // content type. If the corresponding key frame was lost, decode will fail
+  // and content type will be ignored.
+  if (frame.FrameType() == kVideoFrameKey) {
+    _frameInfos[_nextFrameInfoIdx].content_type = frame.contentType();
+    _last_keyframe_content_type = frame.contentType();
+  } else {
+    _frameInfos[_nextFrameInfoIdx].content_type = _last_keyframe_content_type;
+  }
+  _callback->Map(frame.TimeStamp(), &_frameInfos[_nextFrameInfoIdx]);
 
-    _nextFrameInfoIdx = (_nextFrameInfoIdx + 1) % kDecoderFrameMemoryLength;
-    int32_t ret = decoder_->Decode(frame.EncodedImage(), frame.MissingFrame(),
-                                   frame.CodecSpecific(), frame.RenderTimeMs());
+  _nextFrameInfoIdx = (_nextFrameInfoIdx + 1) % kDecoderFrameMemoryLength;
+  int32_t ret = decoder_->Decode(frame.EncodedImage(), frame.MissingFrame(),
+                                 frame.CodecSpecific(), frame.RenderTimeMs());
 
-    _callback->OnDecoderImplementationName(decoder_->ImplementationName());
-    if (ret < WEBRTC_VIDEO_CODEC_OK) {
-      RTC_LOG(LS_WARNING) << "Failed to decode frame with timestamp "
-                          << frame.TimeStamp() << ", error code: " << ret;
-      _callback->Pop(frame.TimeStamp());
-      return ret;
-    } else if (ret == WEBRTC_VIDEO_CODEC_NO_OUTPUT ||
-               ret == WEBRTC_VIDEO_CODEC_REQUEST_SLI) {
-        // No output
-        _callback->Pop(frame.TimeStamp());
-    }
+  _callback->OnDecoderImplementationName(decoder_->ImplementationName());
+  if (ret < WEBRTC_VIDEO_CODEC_OK) {
+    RTC_LOG(LS_WARNING) << "Failed to decode frame with timestamp "
+                        << frame.TimeStamp() << ", error code: " << ret;
+    _callback->Pop(frame.TimeStamp());
     return ret;
+  } else if (ret == WEBRTC_VIDEO_CODEC_NO_OUTPUT ||
+             ret == WEBRTC_VIDEO_CODEC_REQUEST_SLI) {
+    // No output
+    _callback->Pop(frame.TimeStamp());
+  }
+  return ret;
 }
 
 int32_t VCMGenericDecoder::RegisterDecodeCompleteCallback(