| 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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 }; | 450 }; |
| 451 | 451 |
| 452 void SetSize(int width, int height); | 452 void SetSize(int width, int height); |
| 453 void RecreateWebRtcStream(); | 453 void RecreateWebRtcStream(); |
| 454 | 454 |
| 455 AllocatedDecoder CreateOrReuseVideoDecoder( | 455 AllocatedDecoder CreateOrReuseVideoDecoder( |
| 456 std::vector<AllocatedDecoder>* old_decoder, | 456 std::vector<AllocatedDecoder>* old_decoder, |
| 457 const VideoCodec& codec); | 457 const VideoCodec& codec); |
| 458 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders); | 458 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders); |
| 459 | 459 |
| 460 std::string GetCodecNameFromPayloadType(int payload_type); |
| 461 |
| 460 webrtc::Call* const call_; | 462 webrtc::Call* const call_; |
| 461 const std::vector<uint32> ssrcs_; | 463 const std::vector<uint32> ssrcs_; |
| 462 const std::vector<SsrcGroup> ssrc_groups_; | 464 const std::vector<SsrcGroup> ssrc_groups_; |
| 463 | 465 |
| 464 webrtc::VideoReceiveStream* stream_; | 466 webrtc::VideoReceiveStream* stream_; |
| 465 const bool default_stream_; | 467 const bool default_stream_; |
| 466 webrtc::VideoReceiveStream::Config config_; | 468 webrtc::VideoReceiveStream::Config config_; |
| 467 | 469 |
| 468 WebRtcVideoDecoderFactory* const external_decoder_factory_; | 470 WebRtcVideoDecoderFactory* const external_decoder_factory_; |
| 469 std::vector<AllocatedDecoder> allocated_decoders_; | 471 std::vector<AllocatedDecoder> allocated_decoders_; |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 WebRtcVideoDecoderFactory* const external_decoder_factory_; | 542 WebRtcVideoDecoderFactory* const external_decoder_factory_; |
| 541 std::vector<VideoCodecSettings> recv_codecs_; | 543 std::vector<VideoCodecSettings> recv_codecs_; |
| 542 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 544 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
| 543 webrtc::Call::Config::BitrateConfig bitrate_config_; | 545 webrtc::Call::Config::BitrateConfig bitrate_config_; |
| 544 VideoOptions options_; | 546 VideoOptions options_; |
| 545 }; | 547 }; |
| 546 | 548 |
| 547 } // namespace cricket | 549 } // namespace cricket |
| 548 | 550 |
| 549 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 551 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |