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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 // the first frame to know that you gave a bad codec parameter could make | 312 // the first frame to know that you gave a bad codec parameter could make |
313 // debugging hard). | 313 // debugging hard). |
314 // TODO(pbos): Consider setting up encoders lazily. | 314 // TODO(pbos): Consider setting up encoders lazily. |
315 Dimensions() : width(176), height(144), is_screencast(false) {} | 315 Dimensions() : width(176), height(144), is_screencast(false) {} |
316 int width; | 316 int width; |
317 int height; | 317 int height; |
318 bool is_screencast; | 318 bool is_screencast; |
319 }; | 319 }; |
320 | 320 |
321 union VideoEncoderSettings { | 321 union VideoEncoderSettings { |
| 322 webrtc::VideoCodecH264 h264; |
322 webrtc::VideoCodecVP8 vp8; | 323 webrtc::VideoCodecVP8 vp8; |
323 webrtc::VideoCodecVP9 vp9; | 324 webrtc::VideoCodecVP9 vp9; |
324 }; | 325 }; |
325 | 326 |
326 static std::vector<webrtc::VideoStream> CreateVideoStreams( | 327 static std::vector<webrtc::VideoStream> CreateVideoStreams( |
327 const VideoCodec& codec, | 328 const VideoCodec& codec, |
328 const VideoOptions& options, | 329 const VideoOptions& options, |
329 int max_bitrate_bps, | 330 int max_bitrate_bps, |
330 size_t num_streams); | 331 size_t num_streams); |
331 static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams( | 332 static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams( |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 VideoOptions options_; | 530 VideoOptions options_; |
530 // TODO(deadbeef): Don't duplicate information between | 531 // TODO(deadbeef): Don't duplicate information between |
531 // send_params/recv_params, rtp_extensions, options, etc. | 532 // send_params/recv_params, rtp_extensions, options, etc. |
532 VideoSendParameters send_params_; | 533 VideoSendParameters send_params_; |
533 VideoRecvParameters recv_params_; | 534 VideoRecvParameters recv_params_; |
534 }; | 535 }; |
535 | 536 |
536 } // namespace cricket | 537 } // namespace cricket |
537 | 538 |
538 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 539 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ |
OLD | NEW |