Rename EncodedImage::_buffer --> buffer_, and make private
Bug: webrtc:9378 Change-Id: I0a0636077b270a7c73bafafb958132fa648aca70 Reviewed-on: https://webrtc-review.googlesource.com/c/117722 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26294}
This commit is contained in:
@ -249,9 +249,9 @@ VideoProcessor::~VideoProcessor() {
|
||||
|
||||
// Deal with manual memory management of EncodedImage's.
|
||||
for (size_t i = 0; i < num_simulcast_or_spatial_layers_; ++i) {
|
||||
uint8_t* buffer = merged_encoded_frames_.at(i)._buffer;
|
||||
if (buffer) {
|
||||
delete[] buffer;
|
||||
uint8_t* data = merged_encoded_frames_.at(i).data();
|
||||
if (data) {
|
||||
delete[] data;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -575,7 +575,7 @@ const webrtc::EncodedImage* VideoProcessor::BuildAndStoreSuperframe(
|
||||
RTC_CHECK(copied_buffer);
|
||||
|
||||
if (base_image.size()) {
|
||||
RTC_CHECK(base_image._buffer);
|
||||
RTC_CHECK(base_image.data());
|
||||
memcpy(copied_buffer, base_image.data(), base_image.size());
|
||||
}
|
||||
memcpy(copied_buffer + base_image.size(), encoded_image.data(),
|
||||
|
||||
Reference in New Issue
Block a user