| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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. | 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, | 70 void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height, |
| 71 int64_t time_stamp_ns) { | 71 int64_t time_stamp_ns) { |
| 72 InitToEmptyBuffer(w, h, time_stamp_ns); | 72 InitToEmptyBuffer(w, h, time_stamp_ns); |
| 73 } | 73 } |
| 74 | 74 |
| 75 bool InitToBlack(int w, int h, int64_t time_stamp_ns) override; | 75 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; |
| 76 | 79 |
| 77 // From base class VideoFrame. | 80 // From base class VideoFrame. |
| 78 bool Reset(uint32_t format, | 81 bool Reset(uint32_t format, |
| 79 int w, | 82 int w, |
| 80 int h, | 83 int h, |
| 81 int dw, | 84 int dw, |
| 82 int dh, | 85 int dh, |
| 83 uint8_t* sample, | 86 uint8_t* sample, |
| 84 size_t sample_size, | 87 size_t sample_size, |
| 85 int64_t time_stamp_ns, | 88 int64_t time_stamp_ns, |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 webrtc::VideoRotation rotation_; | 138 webrtc::VideoRotation rotation_; |
| 136 | 139 |
| 137 // This is mutable as the calculation is expensive but once calculated, it | 140 // This is mutable as the calculation is expensive but once calculated, it |
| 138 // remains const. | 141 // remains const. |
| 139 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_; | 142 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_; |
| 140 }; | 143 }; |
| 141 | 144 |
| 142 } // namespace cricket | 145 } // namespace cricket |
| 143 | 146 |
| 144 #endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_ | 147 #endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_ |
| OLD | NEW |