OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
522 std::vector<webrtc::RtpExtension> send_rtp_extensions_; | 522 std::vector<webrtc::RtpExtension> send_rtp_extensions_; |
523 | 523 |
524 WebRtcVoiceMediaChannel* voice_channel_; | 524 WebRtcVoiceMediaChannel* voice_channel_; |
525 const int voice_channel_id_; | 525 const int voice_channel_id_; |
526 WebRtcVideoEncoderFactory* const external_encoder_factory_; | 526 WebRtcVideoEncoderFactory* const external_encoder_factory_; |
527 WebRtcVideoDecoderFactory* const external_decoder_factory_; | 527 WebRtcVideoDecoderFactory* const external_decoder_factory_; |
528 std::vector<VideoCodecSettings> recv_codecs_; | 528 std::vector<VideoCodecSettings> recv_codecs_; |
529 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 529 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
530 webrtc::Call::Config::BitrateConfig bitrate_config_; | 530 webrtc::Call::Config::BitrateConfig bitrate_config_; |
531 VideoOptions options_; | 531 VideoOptions options_; |
532 // Whether we have ever processed options. | |
533 bool options_set_ = false; | |
pbos-webrtc
2015/07/14 03:58:33
Undo this one as well.
| |
532 }; | 534 }; |
533 | 535 |
534 } // namespace cricket | 536 } // namespace cricket |
535 | 537 |
536 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 538 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ |
OLD | NEW |