webrtc_m130/sdk/objc/api/peerconnection/RTCEncodedImage+Private.mm

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

142 lines
5.1 KiB
Plaintext
Raw Normal View History

/*
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#import "RTCEncodedImage+Private.h"
#import <objc/runtime.h>
#include "rtc_base/numerics/safe_conversions.h"
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
namespace {
// An implementation of EncodedImageBufferInterface that doesn't perform any
// copies.
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
class ObjCEncodedImageBuffer : public webrtc::EncodedImageBufferInterface {
public:
static rtc::scoped_refptr<ObjCEncodedImageBuffer> Create(NSData *data) {
return rtc::make_ref_counted<ObjCEncodedImageBuffer>(data);
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
}
const uint8_t *data() const override {
return static_cast<const uint8_t *>(data_.bytes);
}
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
// TODO(bugs.webrtc.org/9378): delete this non-const data method.
uint8_t *data() override {
return const_cast<uint8_t *>(static_cast<const uint8_t *>(data_.bytes));
}
size_t size() const override { return data_.length; }
protected:
explicit ObjCEncodedImageBuffer(NSData *data) : data_(data) {}
~ObjCEncodedImageBuffer() {}
NSData *data_;
};
} // namespace
// A simple wrapper around webrtc::EncodedImageBufferInterface to make it usable
// with associated objects.
@interface RTCWrappedEncodedImageBuffer : NSObject
@property(nonatomic) rtc::scoped_refptr<webrtc::EncodedImageBufferInterface>
buffer;
- (instancetype)initWithEncodedImageBuffer:
(rtc::scoped_refptr<webrtc::EncodedImageBufferInterface>)buffer;
@end
@implementation RTCWrappedEncodedImageBuffer
@synthesize buffer = _buffer;
- (instancetype)initWithEncodedImageBuffer:
(rtc::scoped_refptr<webrtc::EncodedImageBufferInterface>)buffer {
self = [super init];
if (self) {
_buffer = buffer;
}
return self;
}
@end
@implementation RTC_OBJC_TYPE (RTCEncodedImage)
(Private)
- (rtc::scoped_refptr<webrtc::EncodedImageBufferInterface>)encodedData {
RTCWrappedEncodedImageBuffer *wrappedBuffer =
objc_getAssociatedObject(self, @selector(encodedData));
return wrappedBuffer.buffer;
}
- (void)setEncodedData:
(rtc::scoped_refptr<webrtc::EncodedImageBufferInterface>)buffer {
return objc_setAssociatedObject(
self,
@selector(encodedData),
[[RTCWrappedEncodedImageBuffer alloc] initWithEncodedImageBuffer:buffer],
OBJC_ASSOCIATION_RETAIN_NONATOMIC);
}
- (instancetype)initWithNativeEncodedImage:
(const webrtc::EncodedImage &)encodedImage {
self = [super init];
if (self) {
// A reference to the encodedData must be stored so that it's kept alive as
// long self.buffer references its underlying data.
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
self.encodedData = encodedImage.GetEncodedData();
// Wrap the buffer in NSData without copying, do not take ownership.
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
self.buffer = [NSData dataWithBytesNoCopy:self.encodedData->data()
length:encodedImage.size()
freeWhenDone:NO];
self.encodedWidth = rtc::dchecked_cast<int32_t>(encodedImage._encodedWidth);
self.encodedHeight =
rtc::dchecked_cast<int32_t>(encodedImage._encodedHeight);
self.timeStamp = encodedImage.RtpTimestamp();
self.captureTimeMs = encodedImage.capture_time_ms_;
self.ntpTimeMs = encodedImage.ntp_time_ms_;
self.flags = encodedImage.timing_.flags;
self.encodeStartMs = encodedImage.timing_.encode_start_ms;
self.encodeFinishMs = encodedImage.timing_.encode_finish_ms;
self.frameType = static_cast<RTCFrameType>(encodedImage._frameType);
self.rotation = static_cast<RTCVideoRotation>(encodedImage.rotation_);
self.qp = @(encodedImage.qp_);
self.contentType =
(encodedImage.content_type_ == webrtc::VideoContentType::SCREENSHARE) ?
RTCVideoContentTypeScreenshare :
RTCVideoContentTypeUnspecified;
}
return self;
}
- (webrtc::EncodedImage)nativeEncodedImage {
// Return the pointer without copying.
Reland "Update RTCEncodedImage to not use deprecated mutable_data call." This reverts commit 966bcc4bd5cc7aee5963e784ddf0caf668b2d6e6. Reason for revert: Fixing upstream issues. Original change's description: > Revert "Update RTCEncodedImage to not use deprecated mutable_data call." > > 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} TBR=nisse@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9378 Change-Id: I1c0e61d8a390a5999f8dbbbda6f094d71f9b0678 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168740 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30588}
2020-02-20 07:34:45 -08:00
webrtc::EncodedImage encodedImage;
if (self.encodedData) {
encodedImage.SetEncodedData(self.encodedData);
} else if (self.buffer) {
encodedImage.SetEncodedData(ObjCEncodedImageBuffer::Create(self.buffer));
}
encodedImage.set_size(self.buffer.length);
encodedImage._encodedWidth = rtc::dchecked_cast<uint32_t>(self.encodedWidth);
encodedImage._encodedHeight =
rtc::dchecked_cast<uint32_t>(self.encodedHeight);
encodedImage.SetRtpTimestamp(self.timeStamp);
encodedImage.capture_time_ms_ = self.captureTimeMs;
encodedImage.ntp_time_ms_ = self.ntpTimeMs;
encodedImage.timing_.flags = self.flags;
encodedImage.timing_.encode_start_ms = self.encodeStartMs;
encodedImage.timing_.encode_finish_ms = self.encodeFinishMs;
encodedImage._frameType = webrtc::VideoFrameType(self.frameType);
encodedImage.rotation_ = webrtc::VideoRotation(self.rotation);
encodedImage.qp_ = self.qp ? self.qp.intValue : -1;
encodedImage.content_type_ =
(self.contentType == RTCVideoContentTypeScreenshare) ?
webrtc::VideoContentType::SCREENSHARE :
webrtc::VideoContentType::UNSPECIFIED;
return encodedImage;
}
@end