OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 int dh, | 59 int dh, |
60 uint8_t* sample, | 60 uint8_t* sample, |
61 size_t sample_size, | 61 size_t sample_size, |
62 int64_t time_stamp_ns, | 62 int64_t time_stamp_ns, |
63 webrtc::VideoRotation rotation); | 63 webrtc::VideoRotation rotation); |
64 | 64 |
65 bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation); | 65 bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation); |
66 | 66 |
67 void InitToEmptyBuffer(int w, int h, int64_t time_stamp_ns); | 67 void InitToEmptyBuffer(int w, int h, int64_t time_stamp_ns); |
68 | 68 |
69 // TODO(nisse): Old signature. Delete after chrome is updated. | |
70 void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height, | |
71 int64_t time_stamp_ns) { | |
72 InitToEmptyBuffer(w, h, time_stamp_ns); | |
73 } | |
74 | |
75 bool InitToBlack(int w, int h, int64_t time_stamp_ns) override; | 69 bool InitToBlack(int w, int h, int64_t time_stamp_ns) override; |
76 // Needed to inherit the InitToBlack wrapper method with 5 | |
77 // arguments. | |
78 using VideoFrame::InitToBlack; | |
79 | 70 |
80 // From base class VideoFrame. | 71 // From base class VideoFrame. |
81 bool Reset(uint32_t format, | 72 bool Reset(uint32_t format, |
82 int w, | 73 int w, |
83 int h, | 74 int h, |
84 int dw, | 75 int dw, |
85 int dh, | 76 int dh, |
86 uint8_t* sample, | 77 uint8_t* sample, |
87 size_t sample_size, | 78 size_t sample_size, |
88 int64_t time_stamp_ns, | 79 int64_t time_stamp_ns, |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 webrtc::VideoRotation rotation_; | 129 webrtc::VideoRotation rotation_; |
139 | 130 |
140 // This is mutable as the calculation is expensive but once calculated, it | 131 // This is mutable as the calculation is expensive but once calculated, it |
141 // remains const. | 132 // remains const. |
142 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_; | 133 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_; |
143 }; | 134 }; |
144 | 135 |
145 } // namespace cricket | 136 } // namespace cricket |
146 | 137 |
147 #endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_ | 138 #endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_ |
OLD | NEW |