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

Update VP9EncoderImpl to use EncodedImage::Allocate

Browse Source 
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}
This commit is contained in:
Niels Möller
2019-02-07 18:52:50 +01:00
committed by Commit Bot
parent f9a5561de7
commit e12778cb3a
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -185,10 +185,7 @@ VP9EncoderImpl::~VP9EncoderImpl() {
int VP9EncoderImpl::Release() { int VP9EncoderImpl::Release() {
int ret_val = WEBRTC_VIDEO_CODEC_OK; int ret_val = WEBRTC_VIDEO_CODEC_OK;
if (encoded_image_.buffer() != nullptr) { encoded_image_.Allocate(0);
delete[] encoded_image_.buffer();
encoded_image_.set_buffer(nullptr, 0);
}
if (encoder_ != nullptr) { if (encoder_ != nullptr) {
if (inited_) { if (inited_) {
if (vpx_codec_destroy(encoder_)) { if (vpx_codec_destroy(encoder_)) {
@ -390,12 +387,9 @@ int VP9EncoderImpl::InitEncode(const VideoCodec* inst,
is_svc_ = (num_spatial_layers_ > 1 || num_temporal_layers_ > 1); is_svc_ = (num_spatial_layers_ > 1 || num_temporal_layers_ > 1);
// Allocate memory for encoded image // Allocate memory for encoded image
if (encoded_image_.data() != nullptr) {
delete[] encoded_image_.data();
}
size_t frame_capacity = size_t frame_capacity =
CalcBufferSize(VideoType::kI420, codec_.width, codec_.height); 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; encoded_image_._completeFrame = true;
// Populate encoder configuration with default values. // Populate encoder configuration with default values.
if (vpx_codec_enc_config_default(vpx_codec_vp9_cx(), config_, 0)) { if (vpx_codec_enc_config_default(vpx_codec_vp9_cx(), config_, 0)) {
@ -1266,9 +1260,7 @@ int VP9EncoderImpl::GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt) {
} }
if (pkt->data.frame.sz > encoded_image_.capacity()) { if (pkt->data.frame.sz > encoded_image_.capacity()) {
delete[] encoded_image_.buffer(); encoded_image_.Allocate(pkt->data.frame.sz);
encoded_image_.set_buffer(new uint8_t[pkt->data.frame.sz],
pkt->data.frame.sz);
} }
memcpy(encoded_image_.data(), pkt->data.frame.buf, pkt->data.frame.sz); memcpy(encoded_image_.data(), pkt->data.frame.buf, pkt->data.frame.sz);
encoded_image_.set_size(pkt->data.frame.sz); encoded_image_.set_size(pkt->data.frame.sz);