commit 2449d7aa78282a74ba297fc67d01517d344122cc
author Niels Möller <nisse@webrtc.org> Mon Sep 30 08:18:16 2019
committer Commit Bot <commit-bot@chromium.org> Mon Sep 30 09:48:26 2019
tree eafffde3174ebebcd3a693e11496a65e476b8e05
parent fbf75a78914b1444a95d42ee559bbd2a01cdefd8

Refactor legacy FrameBuffer to use EncodedImageBuffer::Realloc

Preparation for deleting VCMEncodedFrame::VerifyAndAllocate and
EncodedImage::Allocate.

Bug: webrtc:9378
Change-Id: If7c16061962bbd58c3e7d5720189854e00a3d7bf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154570
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29339}

api/video/encoded_image.cc

diff --git a/api/video/encoded_image.cc b/api/video/encoded_image.cc
index 55970fc..72f88d2 100644
--- a/api/video/encoded_image.cc
+++ b/api/video/encoded_image.cc
@@ -52,6 +52,11 @@
 }
 
 void EncodedImageBuffer::Realloc(size_t size) {
+  // Calling realloc with size == 0 is equivalent to free, and returns nullptr.
+  // Which is confusing on systems where malloc(0) doesn't return a nullptr.
+  // More specifically, it breaks expectations of
+  // VCMSessionInfo::UpdateDataPointers.
+  RTC_DCHECK(size > 0);
   buffer_ = static_cast<uint8_t*>(realloc(buffer_, size));
   size_ = size;
 }

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 b379e79..bbc1f71 100644
--- a/modules/video_coding/codecs/vp9/vp9_impl.cc
+++ b/modules/video_coding/codecs/vp9/vp9_impl.cc
@@ -266,7 +266,6 @@
 int VP9EncoderImpl::Release() {
   int ret_val = WEBRTC_VIDEO_CODEC_OK;
 
-  encoded_image_.Allocate(0);
   if (encoder_ != nullptr) {
     if (inited_) {
       if (vpx_codec_destroy(encoder_)) {

modules/video_coding/frame_buffer.cc

diff --git a/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc
index c49cde6..755acb2 100644
--- a/modules/video_coding/frame_buffer.cc
+++ b/modules/video_coding/frame_buffer.cc
@@ -101,7 +101,7 @@
   uint32_t requiredSizeBytes =
       size() + packet.sizeBytes +
       (packet.insertStartCode ? kH264StartCodeLengthBytes : 0);
-  if (requiredSizeBytes >= capacity()) {
+  if (requiredSizeBytes > capacity()) {
     const uint8_t* prevBuffer = data();
     const uint32_t increments =
         requiredSizeBytes / kBufferIncStepSizeBytes +
@@ -112,7 +112,15 @@
                            "big.";
       return kSizeError;
     }
-    VerifyAndAllocate(newSize);
+    if (data() == nullptr) {
+      encoded_image_buffer_ = EncodedImageBuffer::Create(newSize);
+      SetEncodedData(encoded_image_buffer_);
+      set_size(0);
+    } else {
+      RTC_CHECK(encoded_image_buffer_ != nullptr);
+      RTC_DCHECK_EQ(encoded_image_buffer_->data(), data());
+      encoded_image_buffer_->Realloc(newSize);
+    }
     _sessionInfo.UpdateDataPointers(prevBuffer, data());
   }
 

modules/video_coding/frame_buffer.h

diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h
index d74749c..76df28e 100644
--- a/modules/video_coding/frame_buffer.h
+++ b/modules/video_coding/frame_buffer.h
@@ -76,6 +76,9 @@
   void SetState(VCMFrameBufferStateEnum state);  // Set state of frame
 
   VCMFrameBufferStateEnum _state;  // Current state of the frame
+  // Set with SetEncodedData, but keep pointer to the concrete class here, to
+  // enable reallocation and mutation.
+  rtc::scoped_refptr<EncodedImageBuffer> encoded_image_buffer_;
   VCMSessionInfo _sessionInfo;
   uint16_t _nackCount;
   int64_t _latestPacketTimeMs;