aboutsummaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorJorge E. Moreira <jemoreira@google.com>2020-07-01 16:41:11 -0700
committerJorge E. Moreira <jemoreira@google.com>2020-07-17 14:29:21 -0700
commit889b21a2e1486d6c9df1b458a356ce6423bcdf72 (patch)
treeced35a46830096764bd9faa8cddc61c933c02fa9 /api
parent85770cd25bd31d7241fa6588912981dcd110a14b (diff)
downloadwebrtc-889b21a2e1486d6c9df1b458a356ce6423bcdf72.tar.gz
Generate new Android.bp file and correct build errors
The following are not yet available in their respective libraries so attempts to use it in webrtc result in a call to abort(): * libvpx's CONSTRAINED_FROM_ABOVE_DROP constant * libyuv's I010 buffers The original webrtc project expects to have third party libraries checked out in third_party/ and base/third_party/. Added some headers in those libraries with a single line including the right header from external/<library>. Updated .gitignore to keep track of said headers. Bug: 153469641 Test: mm, also built cuttlefish using this library and ran it locally Change-Id: I2d596942e34093dccc65d4b7b8249b6afc14d31f
Diffstat (limited to 'api')
-rw-r--r--api/video/i010_buffer.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc
index 7286676ded..df43d78f2a 100644
--- a/api/video/i010_buffer.cc
+++ b/api/video/i010_buffer.cc
@@ -66,12 +66,16 @@ rtc::scoped_refptr<I010Buffer> I010Buffer::Copy(
const int width = source.width();
const int height = source.height();
rtc::scoped_refptr<I010Buffer> buffer = Create(width, height);
+#if 0
RTC_CHECK_EQ(
0, libyuv::I010Copy(
source.DataY(), source.StrideY(), source.DataU(), source.StrideU(),
source.DataV(), source.StrideV(), buffer->MutableDataY(),
buffer->StrideY(), buffer->MutableDataU(), buffer->StrideU(),
buffer->MutableDataV(), buffer->StrideV(), width, height));
+#else
+ abort();
+#endif
return buffer;
}
@@ -81,12 +85,16 @@ rtc::scoped_refptr<I010Buffer> I010Buffer::Copy(
const int width = source.width();
const int height = source.height();
rtc::scoped_refptr<I010Buffer> buffer = Create(width, height);
+#if 0
RTC_CHECK_EQ(
0, libyuv::I420ToI010(
source.DataY(), source.StrideY(), source.DataU(), source.StrideU(),
source.DataV(), source.StrideV(), buffer->MutableDataY(),
buffer->StrideY(), buffer->MutableDataU(), buffer->StrideU(),
buffer->MutableDataV(), buffer->StrideV(), width, height));
+#else
+ abort();
+#endif
return buffer;
}
@@ -150,11 +158,15 @@ rtc::scoped_refptr<I010Buffer> I010Buffer::Rotate(
rtc::scoped_refptr<I420BufferInterface> I010Buffer::ToI420() {
rtc::scoped_refptr<I420Buffer> i420_buffer =
I420Buffer::Create(width(), height());
+#if 0
libyuv::I010ToI420(DataY(), StrideY(), DataU(), StrideU(), DataV(), StrideV(),
i420_buffer->MutableDataY(), i420_buffer->StrideY(),
i420_buffer->MutableDataU(), i420_buffer->StrideU(),
i420_buffer->MutableDataV(), i420_buffer->StrideV(),
width(), height());
+#else
+ abort();
+#endif
return i420_buffer;
}