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

Side by Side Diff: talk/session/media/srtpfilter.cc

Issue 1505053002: Revert of "Create rtc::AtomicInt POD struct." (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 | « no previous file | webrtc/base/atomicops.h » ('j') | webrtc/base/atomicops.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2009 Google Inc. 3 * Copyright 2009 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 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 } 477 }
478 478
479 /////////////////////////////////////////////////////////////////////////////// 479 ///////////////////////////////////////////////////////////////////////////////
480 // SrtpSession 480 // SrtpSession
481 481
482 #ifdef HAVE_SRTP 482 #ifdef HAVE_SRTP
483 483
484 bool SrtpSession::inited_ = false; 484 bool SrtpSession::inited_ = false;
485 485
486 // This lock protects SrtpSession::inited_ and SrtpSession::sessions_. 486 // This lock protects SrtpSession::inited_ and SrtpSession::sessions_.
487 rtc::GlobalLockPod SrtpSession::lock_ = {{0}}; 487 rtc::GlobalLockPod SrtpSession::lock_;
488 488
489 SrtpSession::SrtpSession() 489 SrtpSession::SrtpSession()
490 : session_(NULL), 490 : session_(NULL),
491 rtp_auth_tag_len_(0), 491 rtp_auth_tag_len_(0),
492 rtcp_auth_tag_len_(0), 492 rtcp_auth_tag_len_(0),
493 srtp_stat_(new SrtpStat()), 493 srtp_stat_(new SrtpStat()),
494 last_send_seq_num_(-1) { 494 last_send_seq_num_(-1) {
495 { 495 {
496 rtc::GlobalLockScope ls(&lock_); 496 rtc::GlobalLockScope ls(&lock_);
497 sessions()->push_back(this); 497 sessions()->push_back(this);
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 SrtpNotAvailable(__FUNCTION__); 941 SrtpNotAvailable(__FUNCTION__);
942 } 942 }
943 943
944 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) { 944 void SrtpStat::HandleSrtpResult(const SrtpStat::FailureKey& key) {
945 SrtpNotAvailable(__FUNCTION__); 945 SrtpNotAvailable(__FUNCTION__);
946 } 946 }
947 947
948 #endif // HAVE_SRTP 948 #endif // HAVE_SRTP
949 949
950 } // namespace cricket 950 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/atomicops.h » ('j') | webrtc/base/atomicops.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698