OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ |
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ | 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 virtual int32_t Release() OVERRIDE; | 62 virtual int32_t Release() OVERRIDE; |
63 virtual int32_t SetChannelParameters(uint32_t packet_loss, int rtt) OVERRIDE; | 63 virtual int32_t SetChannelParameters(uint32_t packet_loss, int rtt) OVERRIDE; |
64 virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) OVERRIDE; | 64 virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) OVERRIDE; |
65 | 65 |
66 private: | 66 private: |
67 class Impl; | 67 class Impl; |
68 friend class RTCVideoEncoder::Impl; | 68 friend class RTCVideoEncoder::Impl; |
69 | 69 |
70 // Return an encoded output buffer to WebRTC. | 70 // Return an encoded output buffer to WebRTC. |
71 void ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image, | 71 void ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image, |
72 int32 bitstream_buffer_id); | 72 int32 bitstream_buffer_id, |
| 73 uint16 picture_id); |
73 | 74 |
74 void NotifyError(int32_t error); | 75 void NotifyError(int32_t error); |
75 | 76 |
76 void RecordInitEncodeUMA(int32_t init_retval); | 77 void RecordInitEncodeUMA(int32_t init_retval); |
77 | 78 |
78 base::ThreadChecker thread_checker_; | 79 base::ThreadChecker thread_checker_; |
79 | 80 |
80 // The video codec type, as reported to WebRTC. | 81 // The video codec type, as reported to WebRTC. |
81 const webrtc::VideoCodecType video_codec_type_; | 82 const webrtc::VideoCodecType video_codec_type_; |
82 | 83 |
(...skipping 19 matching lines...) Expand all Loading... |
102 // RTCVideoEncoder. | 103 // RTCVideoEncoder. |
103 // NOTE: Weak pointers must be invalidated before all other member variables. | 104 // NOTE: Weak pointers must be invalidated before all other member variables. |
104 base::WeakPtrFactory<RTCVideoEncoder> weak_factory_; | 105 base::WeakPtrFactory<RTCVideoEncoder> weak_factory_; |
105 | 106 |
106 DISALLOW_COPY_AND_ASSIGN(RTCVideoEncoder); | 107 DISALLOW_COPY_AND_ASSIGN(RTCVideoEncoder); |
107 }; | 108 }; |
108 | 109 |
109 } // namespace content | 110 } // namespace content |
110 | 111 |
111 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ | 112 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_ENCODER_H_ |
OLD | NEW |