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

Side by Side Diff: talk/media/webrtc/webrtcvoiceengine.h

Issue 1181653002: Base A/V synchronization on sync_labels. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 5 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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 // When the default channel (voe_channel) is used for sending, it is 437 // When the default channel (voe_channel) is used for sending, it is
438 // contained in send_channels_, otherwise not. 438 // contained in send_channels_, otherwise not.
439 ChannelMap send_channels_; 439 ChannelMap send_channels_;
440 std::vector<RtpHeaderExtension> send_extensions_; 440 std::vector<RtpHeaderExtension> send_extensions_;
441 uint32 default_receive_ssrc_; 441 uint32 default_receive_ssrc_;
442 // Note the default channel (voe_channel()) can reside in both 442 // Note the default channel (voe_channel()) can reside in both
443 // receive_channels_ and send_channels_ in non-conference mode and in that 443 // receive_channels_ and send_channels_ in non-conference mode and in that
444 // case it will only be there if a non-zero default_receive_ssrc_ is set. 444 // case it will only be there if a non-zero default_receive_ssrc_ is set.
445 ChannelMap receive_channels_; // for multiple sources 445 ChannelMap receive_channels_; // for multiple sources
446 std::map<uint32, webrtc::AudioReceiveStream*> receive_streams_; 446 std::map<uint32, webrtc::AudioReceiveStream*> receive_streams_;
447 std::map<uint32, StreamParams> receive_stream_params_;
447 // receive_channels_ can be read from WebRtc callback thread. Access from 448 // receive_channels_ can be read from WebRtc callback thread. Access from
448 // the WebRtc thread must be synchronized with edits on the worker thread. 449 // the WebRtc thread must be synchronized with edits on the worker thread.
449 // Reads on the worker thread are ok. 450 // Reads on the worker thread are ok.
450 //
451 std::vector<RtpHeaderExtension> receive_extensions_; 451 std::vector<RtpHeaderExtension> receive_extensions_;
452 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 452 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
453 453
454 // Do not lock this on the VoE media processor thread; potential for deadlock 454 // Do not lock this on the VoE media processor thread; potential for deadlock
455 // exists. 455 // exists.
456 mutable rtc::CriticalSection receive_channels_cs_; 456 mutable rtc::CriticalSection receive_channels_cs_;
457 }; 457 };
458 458
459 } // namespace cricket 459 } // namespace cricket
460 460
461 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 461 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698