diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
| commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /modules/video_coding/codecs/test/videoprocessor.cc | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
| download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz | |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'modules/video_coding/codecs/test/videoprocessor.cc')
| -rw-r--r-- | modules/video_coding/codecs/test/videoprocessor.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc index a4918ae73d..23eadfc0db 100644 --- a/modules/video_coding/codecs/test/videoprocessor.cc +++ b/modules/video_coding/codecs/test/videoprocessor.cc @@ -650,6 +650,8 @@ const webrtc::EncodedImage* VideoProcessor::BuildAndStoreSuperframe( EncodedImage copied_image = encoded_image; copied_image.SetEncodedData(buffer); + if (base_image.size()) + copied_image._frameType = base_image._frameType; // Replace previous EncodedImage for this spatial layer. merged_encoded_frames_.at(spatial_idx) = std::move(copied_image); |