Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1376873 - Mediapipeline updates; r=pehrsons

Browse Source 
Support for native_handle() has been removed by upstream.

Differential Revision: https://phabricator.services.mozilla.com/D7437

--HG--
extra : rebase_source : e37659e718c58d0de7504ddffa15043ff18a603c
This commit is contained in:
Dan Minor 2018-02-16 09:15:44 -05:00
parent a94995d952
commit add634384b
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
View File

@ -49,11 +49,10 @@
#include "Tracing.h"
#include "WebrtcImageBuffer.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/keep_ref_until_done.h"
#include "webrtc/rtc_base/bind.h"
#include "webrtc/rtc_base/keep_ref_until_done.h"
#include "webrtc/common_video/include/i420_buffer_pool.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
#include "webrtc/video_frame.h"
// Max size given stereo is 480*2*2 = 1920 (10ms of 16-bits stereo audio at
// 48KHz)
@ -2053,24 +2052,24 @@ public:
MOZ_ASSERT(aBuffer.type() == webrtc::VideoFrameBuffer::Type::kI420);
rtc::scoped_refptr<const webrtc::I420BufferInterface> i420 = aBuffer.GetI420();
MOZ_ASSERT(aBuffer.DataY());
MOZ_ASSERT(i420->DataY());
// Create a video frame using |buffer|.
RefPtr<PlanarYCbCrImage> yuvImage =
mImageContainer->CreatePlanarYCbCrImage();
PlanarYCbCrData yuvData;
yuvData.mYChannel = const_cast<uint8_t*>(aBuffer.DataY());
yuvData.mYSize = IntSize(aBuffer.width(), aBuffer.height());
yuvData.mYStride = aBuffer.StrideY();
MOZ_ASSERT(aBuffer.StrideU() == aBuffer.StrideV());
yuvData.mCbCrStride = aBuffer.StrideU();
yuvData.mCbChannel = const_cast<uint8_t*>(aBuffer.DataU());
yuvData.mCrChannel = const_cast<uint8_t*>(aBuffer.DataV());
yuvData.mYChannel = const_cast<uint8_t*>(i420->DataY());
yuvData.mYSize = IntSize(i420->width(), i420->height());
yuvData.mYStride = i420->StrideY();
MOZ_ASSERT(i420->StrideU() == i420->StrideV());
yuvData.mCbCrStride = i420->StrideU();
yuvData.mCbChannel = const_cast<uint8_t*>(i420->DataU());
yuvData.mCrChannel = const_cast<uint8_t*>(i420->DataV());
yuvData.mCbCrSize =
IntSize((aBuffer.width() + 1) >> 1, (aBuffer.height() + 1) >> 1);
IntSize((i420->width() + 1) >> 1, (i420->height() + 1) >> 1);
yuvData.mPicX = 0;
yuvData.mPicY = 0;
yuvData.mPicSize = IntSize(aBuffer.width(), aBuffer.height());
yuvData.mPicSize = IntSize(i420->width(), i420->height());
yuvData.mStereoMode = StereoMode::MONO;
if (!yuvImage->CopyData(yuvData)) {

8
media/webrtc/signaling/src/mediapipeline/MediaPipelineFilter.cpp
View File

@ -36,16 +36,16 @@ bool MediaPipelineFilter::Filter(const webrtc::RTPHeader& header,
return false;
}
if (!header.extension.rtpStreamId.empty() &&
if (!header.extension.stream_id.empty() &&
!remote_rid_set_.empty() &&
remote_rid_set_.count(header.extension.rtpStreamId.data())) {
remote_rid_set_.count(header.extension.stream_id.data())) {
return true;
}
if (!header.extension.rtpStreamId.empty()) {
if (!header.extension.stream_id.empty()) {
MOZ_LOG(gMediaPipelineLog, LogLevel::Debug,
("MediaPipelineFilter ignoring seq# %u ssrc: %u RID: %s",
header.sequenceNumber, header.ssrc,
header.extension.rtpStreamId.data()));
header.extension.stream_id.data()));
}
if (remote_ssrc_set_.count(header.ssrc)) {