zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update SimulcastTestFixtureImpl to use EncodedImage::Allocate

Browse Source 
Bug: webrtc:9378
Change-Id: Ie0364cb3c96f2ecefe246f8c8b6277d360742111
Reviewed-on: https://webrtc-review.googlesource.com/c/121880
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26642}
This commit is contained in:
Niels Möller
2019-02-07 19:47:02 +01:00
committed by Commit Bot
parent 40027b1411
commit a93b8b0d41
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/video_coding/utility/simulcast_test_fixture_impl.cc
View File

@ -70,11 +70,6 @@ class SimulcastTestFixtureImpl::TestEncodedImageCallback
memset(layer_sync_, false, sizeof(layer_sync_)); memset(layer_sync_, false, sizeof(layer_sync_));
} }
~TestEncodedImageCallback() override {
delete[] encoded_key_frame_.data();
delete[] encoded_frame_.data();
}
Result OnEncodedImage(const EncodedImage& encoded_image, Result OnEncodedImage(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info, const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) override { const RTPFragmentationHeader* fragmentation) override {
@ -82,18 +77,15 @@ class SimulcastTestFixtureImpl::TestEncodedImageCallback
// Only store the base layer. // Only store the base layer.
if (encoded_image.SpatialIndex().value_or(0) == 0) { if (encoded_image.SpatialIndex().value_or(0) == 0) {
if (encoded_image._frameType == kVideoFrameKey) { if (encoded_image._frameType == kVideoFrameKey) {
delete[] encoded_key_frame_.buffer(); // TODO(nisse): Why not size() ?
encoded_key_frame_.set_buffer(new uint8_t[encoded_image.capacity()], encoded_key_frame_.Allocate(encoded_image.capacity());
encoded_image.capacity());
encoded_key_frame_.set_size(encoded_image.size()); encoded_key_frame_.set_size(encoded_image.size());
encoded_key_frame_._frameType = kVideoFrameKey; encoded_key_frame_._frameType = kVideoFrameKey;
encoded_key_frame_._completeFrame = encoded_image._completeFrame; encoded_key_frame_._completeFrame = encoded_image._completeFrame;
memcpy(encoded_key_frame_.data(), encoded_image.data(), memcpy(encoded_key_frame_.data(), encoded_image.data(),
encoded_image.size()); encoded_image.size());
} else { } else {
delete[] encoded_frame_.buffer(); encoded_frame_.Allocate(encoded_image.capacity());
encoded_frame_.set_buffer(new uint8_t[encoded_image.capacity()],
encoded_image.capacity());
encoded_frame_.set_size(encoded_image.size()); encoded_frame_.set_size(encoded_image.size());
memcpy(encoded_frame_.data(), encoded_image.data(), memcpy(encoded_frame_.data(), encoded_image.data(),
encoded_image.size()); encoded_image.size());
@ -864,9 +856,8 @@ void SimulcastTestFixtureImpl::TestDecodeWidthHeightSet() {
EXPECT_EQ(encoded_image._frameType, kVideoFrameKey); EXPECT_EQ(encoded_image._frameType, kVideoFrameKey);
size_t index = encoded_image.SpatialIndex().value_or(0); size_t index = encoded_image.SpatialIndex().value_or(0);
encoded_frame[index].set_buffer( // TODO(nisse): Why not size()
new uint8_t[encoded_image.capacity()], encoded_frame[index].Allocate(encoded_image.capacity());
encoded_image.capacity());
encoded_frame[index].set_size(encoded_image.size()); encoded_frame[index].set_size(encoded_image.size());
encoded_frame[index]._frameType = encoded_image._frameType; encoded_frame[index]._frameType = encoded_image._frameType;
encoded_frame[index]._completeFrame = encoded_image._completeFrame; encoded_frame[index]._completeFrame = encoded_image._completeFrame;
@ -903,10 +894,6 @@ void SimulcastTestFixtureImpl::TestDecodeWidthHeightSet() {
EXPECT_EQ(decodedImage.height(), kDefaultHeight); EXPECT_EQ(decodedImage.height(), kDefaultHeight);
})); }));
EXPECT_EQ(0, decoder_->Decode(encoded_frame[2], false, NULL, 0)); EXPECT_EQ(0, decoder_->Decode(encoded_frame[2], false, NULL, 0));
for (int i = 0; i < 3; ++i) {
delete[] encoded_frame[i].buffer();
}
} }
} // namespace test } // namespace test