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

Side by Side Diff: webrtc/modules/video_coding/jitter_buffer.cc

Issue 3007253002: Remove typedefs.h from webrtc/ root (part 1)
Patch Set: backwards compatible FALLTHROUGH #define Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/modules/video_coding/jitter_buffer.h" 10 #include "webrtc/modules/video_coding/jitter_buffer.h"
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 } 742 }
743 case kCompleteSession: { 743 case kCompleteSession: {
744 if (previous_state != kStateDecodable && 744 if (previous_state != kStateDecodable &&
745 previous_state != kStateComplete) { 745 previous_state != kStateComplete) {
746 CountFrame(*frame); 746 CountFrame(*frame);
747 if (continuous) { 747 if (continuous) {
748 // Signal that we have a complete session. 748 // Signal that we have a complete session.
749 frame_event_->Set(); 749 frame_event_->Set();
750 } 750 }
751 } 751 }
752 FALLTHROUGH(); 752 RTC_FALLTHROUGH();
753 } 753 }
754 // Note: There is no break here - continuing to kDecodableSession. 754 // Note: There is no break here - continuing to kDecodableSession.
755 case kDecodableSession: { 755 case kDecodableSession: {
756 *retransmitted = (frame->GetNackCount() > 0); 756 *retransmitted = (frame->GetNackCount() > 0);
757 if (continuous) { 757 if (continuous) {
758 decodable_frames_.InsertFrame(frame); 758 decodable_frames_.InsertFrame(frame);
759 FindAndInsertContinuousFrames(*frame); 759 FindAndInsertContinuousFrames(*frame);
760 } else { 760 } else {
761 incomplete_frames_.InsertFrame(frame); 761 incomplete_frames_.InsertFrame(frame);
762 // If NACKs are enabled, keyframes are triggered by |GetNackList|. 762 // If NACKs are enabled, keyframes are triggered by |GetNackList|.
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 } 1298 }
1299 return true; 1299 return true;
1300 } 1300 }
1301 1301
1302 void VCMJitterBuffer::RecycleFrameBuffer(VCMFrameBuffer* frame) { 1302 void VCMJitterBuffer::RecycleFrameBuffer(VCMFrameBuffer* frame) {
1303 frame->Reset(); 1303 frame->Reset();
1304 free_frames_.push_back(frame); 1304 free_frames_.push_back(frame);
1305 } 1305 }
1306 1306
1307 } // namespace webrtc 1307 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc ('k') | webrtc/modules/video_coding/rtp_frame_reference_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698