generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 63884381-> 63913264

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5805 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2014-03-27 23:48:25 +00:00
parent a5586b50e5
commit f7d501d48a
7 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
talk/app/webrtc/statscollector.cc
View File

@@ -84,8 +84,6 @@ const char StatsReport::kStatsValueNameFingerprintAlgorithm[] =
"googFingerprintAlgorithm";
const char StatsReport::kStatsValueNameFirsReceived[] = "googFirsReceived";
const char StatsReport::kStatsValueNameFirsSent[] = "googFirsSent";
const char StatsReport::kStatsValueNameFrameHeightInput[] =
"googFrameHeightInput";
const char StatsReport::kStatsValueNameFrameHeightReceived[] =
"googFrameHeightReceived";
const char StatsReport::kStatsValueNameFrameHeightSent[] =
@@ -107,8 +105,6 @@ const char StatsReport::kStatsValueNameRenderDelayMs[] = "googRenderDelayMs";
const char StatsReport::kStatsValueNameFrameRateInput[] = "googFrameRateInput";
const char StatsReport::kStatsValueNameFrameRateSent[] = "googFrameRateSent";
const char StatsReport::kStatsValueNameFrameWidthInput[] =
"googFrameWidthInput";
const char StatsReport::kStatsValueNameFrameWidthReceived[] =
"googFrameWidthReceived";
const char StatsReport::kStatsValueNameFrameWidthSent[] = "googFrameWidthSent";
@@ -354,14 +350,10 @@ void ExtractStats(const cricket::VideoSenderInfo& info, StatsReport* report) {
info.plis_rcvd);
report->AddValue(StatsReport::kStatsValueNameNacksReceived,
info.nacks_rcvd);
report->AddValue(StatsReport::kStatsValueNameFrameWidthInput,
info.input_frame_width);
report->AddValue(StatsReport::kStatsValueNameFrameHeightInput,
info.input_frame_height);
report->AddValue(StatsReport::kStatsValueNameFrameWidthSent,
info.send_frame_width);
info.frame_width);
report->AddValue(StatsReport::kStatsValueNameFrameHeightSent,
info.send_frame_height);
info.frame_height);
report->AddValue(StatsReport::kStatsValueNameFrameRateInput,
info.framerate_input);
report->AddValue(StatsReport::kStatsValueNameFrameRateSent,

2
talk/app/webrtc/statstypes.h
View File

@@ -148,7 +148,6 @@ class StatsReport {
static const char kStatsValueNameExpandRate[];
static const char kStatsValueNameFirsReceived[];
static const char kStatsValueNameFirsSent[];
static const char kStatsValueNameFrameHeightInput[];
static const char kStatsValueNameFrameHeightReceived[];
static const char kStatsValueNameFrameHeightSent[];
static const char kStatsValueNameFrameRateReceived[];
@@ -163,7 +162,6 @@ class StatsReport {
static const char kStatsValueNameRenderDelayMs[];
static const char kStatsValueNameFrameRateInput[];
static const char kStatsValueNameFrameRateSent[];
static const char kStatsValueNameFrameWidthInput[];
static const char kStatsValueNameFrameWidthReceived[];
static const char kStatsValueNameFrameWidthSent[];
static const char kStatsValueNameJitterReceived[];

12
talk/media/base/mediachannel.h
View File

@@ -858,10 +858,8 @@ struct VideoSenderInfo : public MediaSenderInfo {
firs_rcvd(0),
plis_rcvd(0),
nacks_rcvd(0),
input_frame_width(0),
input_frame_height(0),
send_frame_width(0),
send_frame_height(0),
frame_width(0),
frame_height(0),
framerate_input(0),
framerate_sent(0),
nominal_bitrate(0),
@@ -878,10 +876,8 @@ struct VideoSenderInfo : public MediaSenderInfo {
int firs_rcvd;
int plis_rcvd;
int nacks_rcvd;
int input_frame_width;
int input_frame_height;
int send_frame_width;
int send_frame_height;
int frame_width;
int frame_height;
int framerate_input;
int framerate_sent;
int nominal_bitrate;

16
talk/media/base/videoengine_unittest.h
View File

@@ -806,8 +806,8 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_EQ(0, info.senders[0].firs_rcvd);
EXPECT_EQ(0, info.senders[0].plis_rcvd);
EXPECT_EQ(0, info.senders[0].nacks_rcvd);
EXPECT_EQ(DefaultCodec().width, info.senders[0].send_frame_width);
EXPECT_EQ(DefaultCodec().height, info.senders[0].send_frame_height);
EXPECT_EQ(DefaultCodec().width, info.senders[0].frame_width);
EXPECT_EQ(DefaultCodec().height, info.senders[0].frame_height);
EXPECT_GT(info.senders[0].framerate_input, 0);
EXPECT_GT(info.senders[0].framerate_sent, 0);
@@ -866,8 +866,8 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_EQ(0, info.senders[0].firs_rcvd);
EXPECT_EQ(0, info.senders[0].plis_rcvd);
EXPECT_EQ(0, info.senders[0].nacks_rcvd);
EXPECT_EQ(DefaultCodec().width, info.senders[0].send_frame_width);
EXPECT_EQ(DefaultCodec().height, info.senders[0].send_frame_height);
EXPECT_EQ(DefaultCodec().width, info.senders[0].frame_width);
EXPECT_EQ(DefaultCodec().height, info.senders[0].frame_height);
EXPECT_GT(info.senders[0].framerate_input, 0);
EXPECT_GT(info.senders[0].framerate_sent, 0);
@@ -937,12 +937,12 @@ class VideoMediaChannelTest : public testing::Test,
info.senders[0].packets_sent + info.senders[1].packets_sent);
EXPECT_EQ(1U, info.senders[0].ssrcs().size());
EXPECT_EQ(1234U, info.senders[0].ssrcs()[0]);
EXPECT_EQ(DefaultCodec().width, info.senders[0].send_frame_width);
EXPECT_EQ(DefaultCodec().height, info.senders[0].send_frame_height);
EXPECT_EQ(DefaultCodec().width, info.senders[0].frame_width);
EXPECT_EQ(DefaultCodec().height, info.senders[0].frame_height);
EXPECT_EQ(1U, info.senders[1].ssrcs().size());
EXPECT_EQ(5678U, info.senders[1].ssrcs()[0]);
EXPECT_EQ(kTestWidth, info.senders[1].send_frame_width);
EXPECT_EQ(kTestHeight, info.senders[1].send_frame_height);
EXPECT_EQ(kTestWidth, info.senders[1].frame_width);
EXPECT_EQ(kTestHeight, info.senders[1].frame_height);
// The capturer must be unregistered here as it runs out of it's scope next.
EXPECT_TRUE(channel_->SetCapturer(5678, NULL));
}

37
talk/media/webrtc/webrtcvideoengine.cc
View File

@@ -36,7 +36,6 @@
#include <set>
#include "talk/base/basictypes.h"
#include "talk/base/bind.h"
#include "talk/base/buffer.h"
#include "talk/base/byteorder.h"
#include "talk/base/common.h"
@@ -2369,26 +2368,8 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options,
sinfo.packets_lost = -1;
sinfo.fraction_lost = -1;
sinfo.rtt_ms = -1;
sinfo.input_frame_width = static_cast<int>(channel_stream_info->width());
sinfo.input_frame_height =
static_cast<int>(channel_stream_info->height());
VideoCapturer* video_capturer = send_channel->video_capturer();
if (video_capturer) {
video_capturer->GetStats(&sinfo.adapt_frame_drops,
&sinfo.effects_frame_drops,
&sinfo.capturer_frame_time);
}
webrtc::VideoCodec vie_codec;
if (engine()->vie()->codec()->GetSendCodec(channel_id, vie_codec) == 0) {
sinfo.send_frame_width = vie_codec.width;
sinfo.send_frame_height = vie_codec.height;
} else {
sinfo.send_frame_width = -1;
sinfo.send_frame_height = -1;
LOG_RTCERR1(GetSendCodec, channel_id);
}
sinfo.frame_width = static_cast<int>(channel_stream_info->width());
sinfo.frame_height = static_cast<int>(channel_stream_info->height());
sinfo.framerate_input = channel_stream_info->framerate();
sinfo.framerate_sent = send_channel->encoder_observer()->framerate();
sinfo.nominal_bitrate = send_channel->encoder_observer()->bitrate();
@@ -3089,18 +3070,8 @@ bool WebRtcVideoMediaChannel::GetVideoAdapter(
return true;
}
void WebRtcVideoMediaChannel::OnFrameFromCapturer(VideoCapturer* capturer,
const VideoFrame* frame) {
// This method is called from the capturer thread while the rest of the
// WebRtcVideoMediaChannel is run on the worker thread.
engine_->worker_thread()->Invoke<void>(
Bind(&WebRtcVideoMediaChannel::SendFrame, this, capturer, frame));
}
void WebRtcVideoMediaChannel::SendFrame(VideoCapturer* capturer,
const VideoFrame* frame) {
// TODO(ronghuawu): Reenable once webrtc 3125 is fixed.
// ASSERT(engine_->worker_thread() == talk_base::Thread::Current());
// If the |capturer| is registered to any send channel, then send the frame
// to those send channels.
bool capturer_is_channel_owned = false;
@@ -4048,8 +4019,8 @@ bool WebRtcVideoMediaChannel::SetLocalRtxSsrc(int channel_id,
void WebRtcVideoMediaChannel::MaybeConnectCapturer(VideoCapturer* capturer) {
if (capturer != NULL && GetSendChannelNum(capturer) == 1) {
capturer->SignalVideoFrame.connect(
this, &WebRtcVideoMediaChannel::OnFrameFromCapturer);
capturer->SignalVideoFrame.connect(this,
&WebRtcVideoMediaChannel::SendFrame);
}
}

7
talk/media/webrtc/webrtcvideoengine.h
View File

@@ -292,7 +292,9 @@ class WebRtcVideoMediaChannel : public talk_base::MessageHandler,
uint32 send_ssrc() const { return 0; }
bool GetRenderer(uint32 ssrc, VideoRenderer** renderer);
bool GetVideoAdapter(uint32 ssrc, CoordinatedVideoAdapter** video_adapter);
void OnFrameFromCapturer(VideoCapturer* capturer, const VideoFrame* frame);
void SendFrame(VideoCapturer* capturer, const VideoFrame* frame);
bool SendFrame(WebRtcVideoChannelSendInfo* channel_info,
const VideoFrame* frame, bool is_screencast);
// Thunk functions for use with HybridVideoEngine
void OnLocalFrame(VideoCapturer* capturer, const VideoFrame* frame) {
@@ -414,9 +416,6 @@ class WebRtcVideoMediaChannel : public talk_base::MessageHandler,
// to one send channel, i.e. the last send channel.
void MaybeDisconnectCapturer(VideoCapturer* capturer);
void SendFrame(VideoCapturer* capturer, const VideoFrame* frame);
bool SendFrame(WebRtcVideoChannelSendInfo* channel_info,
const VideoFrame* frame, bool is_screencast);
bool RemoveRecvStreamInternal(uint32 ssrc);
// Global state.

4
talk/media/webrtc/webrtcvideoengine_unittest.cc
View File

@@ -128,7 +128,7 @@ class WebRtcVideoEngineTestFake : public testing::Test,
return false;
}
cricket::FakeVideoCapturer capturer;
channel_->OnFrameFromCapturer(&capturer, &frame);
channel_->SendFrame(&capturer, &frame);
return true;
}
bool SendI420ScreencastFrame(int width, int height) {
@@ -145,7 +145,7 @@ class WebRtcVideoEngineTestFake : public testing::Test,
}
cricket::FakeVideoCapturer capturer;
capturer.SetScreencast(true);
channel_->OnFrameFromCapturer(&capturer, &frame);
channel_->SendFrame(&capturer, &frame);
return true;
}
void VerifyCodecFeedbackParams(const cricket::VideoCodec& codec) {