projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
webrtc
/
video
/
send_statistics_proxy.h
diff --git
a/src/third_party/webrtc/video/send_statistics_proxy.h
b/src/third_party/webrtc/video/send_statistics_proxy.h
index
ef459da
..
2f645b1
100644
(file)
--- a/
src/third_party/webrtc/video/send_statistics_proxy.h
+++ b/
src/third_party/webrtc/video/send_statistics_proxy.h
@@
-46,7
+46,9
@@
class SendStatisticsProxy : public RtcpStatisticsCallback,
uint32_t ssrc) OVERRIDE;
// From BitrateStatisticsObserver.
uint32_t ssrc) OVERRIDE;
// From BitrateStatisticsObserver.
- virtual void Notify(const BitrateStatistics& stats, uint32_t ssrc) OVERRIDE;
+ virtual void Notify(const BitrateStatistics& total_stats,
+ const BitrateStatistics& retransmit_stats,
+ uint32_t ssrc) OVERRIDE;
// From FrameCountObserver.
virtual void FrameCountUpdated(FrameType frame_type,
// From FrameCountObserver.
virtual void FrameCountUpdated(FrameType frame_type,
@@
-75,7
+77,7
@@
class SendStatisticsProxy : public RtcpStatisticsCallback,
uint32_t ssrc) OVERRIDE;
private:
uint32_t ssrc) OVERRIDE;
private:
- S
tream
Stats* GetStatsEntry(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);
+ S
src
Stats* GetStatsEntry(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);
const VideoSendStream::Config config_;
scoped_ptr<CriticalSectionWrapper> crit_;
const VideoSendStream::Config config_;
scoped_ptr<CriticalSectionWrapper> crit_;