OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 // introduced as some encoded frames may not be | 61 // introduced as some encoded frames may not be |
62 // complete. | 62 // complete. |
63 }; | 63 }; |
64 | 64 |
65 class VideoCodingModule : public Module { | 65 class VideoCodingModule : public Module { |
66 public: | 66 public: |
67 enum SenderNackMode { kNackNone, kNackAll, kNackSelective }; | 67 enum SenderNackMode { kNackNone, kNackAll, kNackSelective }; |
68 | 68 |
69 enum ReceiverRobustness { kNone, kHardNack, kSoftNack, kReferenceSelection }; | 69 enum ReceiverRobustness { kNone, kHardNack, kSoftNack, kReferenceSelection }; |
70 | 70 |
71 // Create method for current interface, will be removed when the | |
72 // new jitter buffer is in place. | |
71 static VideoCodingModule* Create( | 73 static VideoCodingModule* Create( |
72 Clock* clock, | 74 Clock* clock, |
73 VideoEncoderRateObserver* encoder_rate_observer, | 75 VideoEncoderRateObserver* encoder_rate_observer, |
74 VCMQMSettingsCallback* qm_settings_callback); | 76 VCMQMSettingsCallback* qm_settings_callback); |
75 | 77 |
78 // Create method for the new jitter buffer. | |
stefan-webrtc
2016/03/10 14:20:40
I think you can remove these comments mentioning t
philipel
2016/03/10 16:39:27
Done.
| |
79 static VideoCodingModule* Create( | |
80 Clock* clock, | |
81 VideoEncoderRateObserver* encoder_rate_observer, | |
82 VCMQMSettingsCallback* qm_settings_callback, | |
83 ProcessThread* module_process_thread, | |
stefan-webrtc
2016/03/10 14:20:40
I think it's easier to simply have the VideoCoding
philipel
2016/03/10 16:39:27
:(((((((((((((((((((((((((((
| |
84 NackSender* nack_sender, | |
85 KeyFrameRequestSender* keyframe_request_sender); | |
86 | |
87 // Create method for current interface, will be removed when the | |
88 // new jitter buffer is in place. | |
76 static VideoCodingModule* Create(Clock* clock, EventFactory* event_factory); | 89 static VideoCodingModule* Create(Clock* clock, EventFactory* event_factory); |
77 | 90 |
91 // Create method for the new jitter buffer. | |
92 static VideoCodingModule* Create( | |
93 Clock* clock, | |
94 EventFactory* event_factory, | |
95 ProcessThread* module_process_thread, | |
96 NackSender* nack_sender, | |
97 KeyFrameRequestSender* keyframe_request_sender); | |
98 | |
78 // Get supported codec settings using codec type | 99 // Get supported codec settings using codec type |
79 // | 100 // |
80 // Input: | 101 // Input: |
81 // - codecType : The codec type to get settings for | 102 // - codecType : The codec type to get settings for |
82 // - codec : Memory where the codec settings will be stored | 103 // - codec : Memory where the codec settings will be stored |
83 // | 104 // |
84 // Return value : VCM_OK, on success | 105 // Return value : VCM_OK, on success |
85 // VCM_PARAMETER_ERROR if codec not supported | 106 // VCM_PARAMETER_ERROR if codec not supported |
86 static void Codec(VideoCodecType codecType, VideoCodec* codec); | 107 static void Codec(VideoCodecType codecType, VideoCodec* codec); |
87 | 108 |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
502 EncodedImageCallback* observer) = 0; | 523 EncodedImageCallback* observer) = 0; |
503 virtual void RegisterPostEncodeImageCallback( | 524 virtual void RegisterPostEncodeImageCallback( |
504 EncodedImageCallback* post_encode_callback) = 0; | 525 EncodedImageCallback* post_encode_callback) = 0; |
505 // Releases pending decode calls, permitting faster thread shutdown. | 526 // Releases pending decode calls, permitting faster thread shutdown. |
506 virtual void TriggerDecoderShutdown() = 0; | 527 virtual void TriggerDecoderShutdown() = 0; |
507 }; | 528 }; |
508 | 529 |
509 } // namespace webrtc | 530 } // namespace webrtc |
510 | 531 |
511 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ | 532 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ |
OLD | NEW |