diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-11-12 19:57:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-12 19:57:20 +0000 |
| commit | 6df1e7e2c3eb8ef4499f1279d91ecaae6b3991cd (patch) | |
| tree | 5783d2235cb8ae0035c6aec139a49e307653a14a | |
| parent | 3de41606e7f85611c1bebf8ec7c11abb4b30ec7d (diff) | |
| parent | 39ebfc8193a604f536a4ba3a9e55beb532bc68a6 (diff) | |
| download | webrtc-android-s-qpr3-beta-1.tar.gz | |
Merge "Bring back libyuv's I010 buffer API usage" am: 39ebfc8193android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1890535
Change-Id: I68b777c631c47834cb04e99b429ee43943a9e725
| -rw-r--r-- | api/video/i010_buffer.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc index df43d78f2a..7286676ded 100644 --- a/api/video/i010_buffer.cc +++ b/api/video/i010_buffer.cc @@ -66,16 +66,12 @@ 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; } @@ -85,16 +81,12 @@ 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; } @@ -158,15 +150,11 @@ 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; } |