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

Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2852303002/ )

Browse Source 
Reason for revert:
Unfortunately, more downstream updates needed.

Original issue's description:
> Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2845333002/ )
>
> Reason for revert:
> Downstream projects being updated.
>
> For Chrome, relanding depends on cl
> https://codereview.chromium.org/2855783003/
>
> Original issue's description:
> > 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}
> > Committed: aec49d2b49
>
> TBR=mflodman@webrtc.org,perkj@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:5880
>
> Review-Url: https://codereview.webrtc.org/2852303002
> Cr-Commit-Position: refs/heads/master@{#17974}
> Committed: d71ebd70f6

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/2854883002
Cr-Commit-Position: refs/heads/master@{#17978}
This commit is contained in:
nisse
2017-05-02 06:56:07 -07:00
committed by Commit bot
parent eb1fde4a26
commit 6e6a485a02
26 changed files with 151 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/sdk/android/src/jni/native_handle_impl.cc
View File

@ -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.