commit e12778cb3a7c35b4d3b9d25104841dccd67dc59b
author Niels Möller <nisse@webrtc.org> Thu Feb 07 17:52:50 2019
committer Commit Bot <commit-bot@chromium.org> Thu Feb 07 21:26:43 2019
tree 8ce56d556aa87e7ab5b3f58722d97be682c21371
parent f9a5561de712eaa86da585d944ea112345efb97d

Update VP9EncoderImpl to use EncodedImage::Allocate

Bug: webrtc:9378
Change-Id: I009138b4dc50c4ceb8f94fee6a958bbfa4d7e326
Reviewed-on: https://webrtc-review.googlesource.com/c/121771
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26593}

modules/video_coding/codecs/vp9/vp9_impl.cc

diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc
index 5feca0b..b882a4e 100644
--- a/modules/video_coding/codecs/vp9/vp9_impl.cc
+++ b/modules/video_coding/codecs/vp9/vp9_impl.cc
@@ -185,10 +185,7 @@
 int VP9EncoderImpl::Release() {
   int ret_val = WEBRTC_VIDEO_CODEC_OK;
 
-  if (encoded_image_.buffer() != nullptr) {
-    delete[] encoded_image_.buffer();
-    encoded_image_.set_buffer(nullptr, 0);
-  }
+  encoded_image_.Allocate(0);
   if (encoder_ != nullptr) {
     if (inited_) {
       if (vpx_codec_destroy(encoder_)) {
@@ -390,12 +387,9 @@
   is_svc_ = (num_spatial_layers_ > 1 || num_temporal_layers_ > 1);
 
   // Allocate memory for encoded image
-  if (encoded_image_.data() != nullptr) {
-    delete[] encoded_image_.data();
-  }
   size_t frame_capacity =
       CalcBufferSize(VideoType::kI420, codec_.width, codec_.height);
-  encoded_image_.set_buffer(new uint8_t[frame_capacity], frame_capacity);
+  encoded_image_.Allocate(frame_capacity);
   encoded_image_._completeFrame = true;
   // Populate encoder configuration with default values.
   if (vpx_codec_enc_config_default(vpx_codec_vp9_cx(), config_, 0)) {
@@ -1266,9 +1260,7 @@
   }
 
   if (pkt->data.frame.sz > encoded_image_.capacity()) {
-    delete[] encoded_image_.buffer();
-    encoded_image_.set_buffer(new uint8_t[pkt->data.frame.sz],
-                              pkt->data.frame.sz);
+    encoded_image_.Allocate(pkt->data.frame.sz);
   }
   memcpy(encoded_image_.data(), pkt->data.frame.buf, pkt->data.frame.sz);
   encoded_image_.set_size(pkt->data.frame.sz);