Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #17 id:320001 of https://codereview.webrtc.org/2622263002/ )
Reason for revert:
Broke Chrome build, see, e.g.,
http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/16237
Original issue's description:
> Delete deprecated and transitional stuff related to video frame refactoring.
>
> BUG=webrtc:5880
>
> Review-Url: https://codereview.webrtc.org/2622263002
> Cr-Commit-Position: refs/heads/master@{#17928}
> Committed: 713a3bbcc7
TBR=mflodman@webrtc.org,perkj@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5880
Review-Url: https://codereview.webrtc.org/2845333002
Cr-Commit-Position: refs/heads/master@{#17929}
This commit is contained in:
@ -12,13 +12,12 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "webrtc/api/video/i420_buffer.h"
|
||||
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
|
||||
#include "webrtc/base/bind.h"
|
||||
#include "webrtc/base/checks.h"
|
||||
#include "webrtc/base/keep_ref_until_done.h"
|
||||
#include "webrtc/base/logging.h"
|
||||
#include "webrtc/base/scoped_ref_ptr.h"
|
||||
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
|
||||
|
||||
using webrtc::NativeHandleBuffer;
|
||||
|
||||
@ -143,10 +142,6 @@ AndroidTextureBuffer::NativeToI420Buffer() {
|
||||
//
|
||||
// TODO(nisse): Use an I420BufferPool. We then need to extend that
|
||||
// class, and I420Buffer, to support our memory layout.
|
||||
// TODO(nisse): Depending on
|
||||
// system_wrappers/include/aligned_malloc.h violate current DEPS
|
||||
// rules. We get away for now only because it is indirectly included
|
||||
// by i420_buffer.h
|
||||
std::unique_ptr<uint8_t, webrtc::AlignedFreeDeleter> yuv_data(
|
||||
static_cast<uint8_t*>(webrtc::AlignedMalloc(size, kBufferAlignment)));
|
||||
// See YuvConverter.java for the required layout.
|
||||
|
||||
Reference in New Issue
Block a user