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

Revert "Update RTCEncodedImage to not use deprecated mutable_data call."

Browse Source 
This reverts commit 677e62785dd39cbc730edcbb7ef99909dd292b11.

Reason for revert:
The RTC_DCHECK_EQ(self.buffer.bytes, self.encodedData->data()) line is triggering for every call

Original change's description:
> Update RTCEncodedImage to not use deprecated mutable_data call.
> 
> Bug: webrtc:9378
> Change-Id: If1e6284e2d11009097c87d15b98a2768a1d71521
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168524
> Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30518}

TBR=nisse@webrtc.org,kthelgason@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:9378
Change-Id: I91b6df1148224785c209a7306ec186a952f5e289
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168620
Reviewed-by: Zeke Chin <tkchin@webrtc.org>
Commit-Queue: Zeke Chin <tkchin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30527}
This commit is contained in:
Zeke Chin
2020-02-15 02:09:23 +00:00
committed by Commit Bot
parent 08b11cafae
commit 966bcc4bd5
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/objc/api/peerconnection/RTCEncodedImage+Private.mm
View File

@ -51,10 +51,9 @@
- (instancetype)initWithNativeEncodedImage:(const webrtc::EncodedImage &)encodedImage { - (instancetype)initWithNativeEncodedImage:(const webrtc::EncodedImage &)encodedImage {
if (self = [super init]) { if (self = [super init]) {
self.encodedData = encodedImage.GetEncodedData();
// Wrap the buffer in NSData without copying, do not take ownership. // Wrap the buffer in NSData without copying, do not take ownership.
self.buffer = [NSData dataWithBytesNoCopy:self.encodedData->data() self.buffer = [NSData dataWithBytesNoCopy:encodedImage.mutable_data()
length:self.encodedData->size() length:encodedImage.size()
freeWhenDone:NO]; freeWhenDone:NO];
self.encodedWidth = rtc::dchecked_cast<int32_t>(encodedImage._encodedWidth); self.encodedWidth = rtc::dchecked_cast<int32_t>(encodedImage._encodedWidth);
self.encodedHeight = rtc::dchecked_cast<int32_t>(encodedImage._encodedHeight); self.encodedHeight = rtc::dchecked_cast<int32_t>(encodedImage._encodedHeight);
@ -78,10 +77,8 @@
- (webrtc::EncodedImage)nativeEncodedImage { - (webrtc::EncodedImage)nativeEncodedImage {
// Return the pointer without copying. // Return the pointer without copying.
webrtc::EncodedImage encodedImage; webrtc::EncodedImage encodedImage(
RTC_DCHECK_EQ(self.buffer.bytes, self.encodedData->data()); (uint8_t *)self.buffer.bytes, (size_t)self.buffer.length, (size_t)self.buffer.length);
encodedImage.SetEncodedData(self.encodedData);
encodedImage.set_size(self.buffer.length);
encodedImage._encodedWidth = rtc::dchecked_cast<uint32_t>(self.encodedWidth); encodedImage._encodedWidth = rtc::dchecked_cast<uint32_t>(self.encodedWidth);
encodedImage._encodedHeight = rtc::dchecked_cast<uint32_t>(self.encodedHeight); encodedImage._encodedHeight = rtc::dchecked_cast<uint32_t>(self.encodedHeight);
encodedImage.SetTimestamp(self.timeStamp); encodedImage.SetTimestamp(self.timeStamp);

2
sdk/objc/unittests/objc_video_decoder_factory_tests.mm
View File

@ -70,7 +70,6 @@ TEST(ObjCVideoDecoderFactoryTest, DecodeReturnsOKOnSuccess) {
std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateOKDecoderFactory()); std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateOKDecoderFactory());
webrtc::EncodedImage encoded_image; webrtc::EncodedImage encoded_image;
encoded_image.SetEncodedData(webrtc::EncodedImageBuffer::Create());
EXPECT_EQ(decoder->Decode(encoded_image, false, 0), WEBRTC_VIDEO_CODEC_OK); EXPECT_EQ(decoder->Decode(encoded_image, false, 0), WEBRTC_VIDEO_CODEC_OK);
} }
@ -79,7 +78,6 @@ TEST(ObjCVideoDecoderFactoryTest, DecodeReturnsErrorOnFail) {
std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateErrorDecoderFactory()); std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateErrorDecoderFactory());
webrtc::EncodedImage encoded_image; webrtc::EncodedImage encoded_image;
encoded_image.SetEncodedData(webrtc::EncodedImageBuffer::Create());
EXPECT_EQ(decoder->Decode(encoded_image, false, 0), WEBRTC_VIDEO_CODEC_ERROR); EXPECT_EQ(decoder->Decode(encoded_image, false, 0), WEBRTC_VIDEO_CODEC_ERROR);
} }