| 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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 AllocatedDecoder(webrtc::VideoDecoder* decoder, | 424 AllocatedDecoder(webrtc::VideoDecoder* decoder, |
| 425 webrtc::VideoCodecType type, | 425 webrtc::VideoCodecType type, |
| 426 bool external); | 426 bool external); |
| 427 webrtc::VideoDecoder* decoder; | 427 webrtc::VideoDecoder* decoder; |
| 428 // Decoder wrapped into a fallback decoder to permit software fallback. | 428 // Decoder wrapped into a fallback decoder to permit software fallback. |
| 429 webrtc::VideoDecoder* external_decoder; | 429 webrtc::VideoDecoder* external_decoder; |
| 430 webrtc::VideoCodecType type; | 430 webrtc::VideoCodecType type; |
| 431 bool external; | 431 bool external; |
| 432 }; | 432 }; |
| 433 | 433 |
| 434 void SetSize(int width, int height); | |
| 435 void RecreateWebRtcStream(); | 434 void RecreateWebRtcStream(); |
| 436 | 435 |
| 437 AllocatedDecoder CreateOrReuseVideoDecoder( | 436 AllocatedDecoder CreateOrReuseVideoDecoder( |
| 438 std::vector<AllocatedDecoder>* old_decoder, | 437 std::vector<AllocatedDecoder>* old_decoder, |
| 439 const VideoCodec& codec); | 438 const VideoCodec& codec); |
| 440 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders); | 439 void ClearDecoders(std::vector<AllocatedDecoder>* allocated_decoders); |
| 441 | 440 |
| 442 std::string GetCodecNameFromPayloadType(int payload_type); | 441 std::string GetCodecNameFromPayloadType(int payload_type); |
| 443 | 442 |
| 444 webrtc::Call* const call_; | 443 webrtc::Call* const call_; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 VideoOptions options_; | 528 VideoOptions options_; |
| 530 // TODO(deadbeef): Don't duplicate information between | 529 // TODO(deadbeef): Don't duplicate information between |
| 531 // send_params/recv_params, rtp_extensions, options, etc. | 530 // send_params/recv_params, rtp_extensions, options, etc. |
| 532 VideoSendParameters send_params_; | 531 VideoSendParameters send_params_; |
| 533 VideoRecvParameters recv_params_; | 532 VideoRecvParameters recv_params_; |
| 534 }; | 533 }; |
| 535 | 534 |
| 536 } // namespace cricket | 535 } // namespace cricket |
| 537 | 536 |
| 538 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 537 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |