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

Revert "Improve example video analyzer for use in debugging"

Browse Source 
This reverts commit 1570218ec9fc5d00642a5cf0c1cd8a16260a19a6.

Reason for revert: Speculative revert on tree closing

Original change's description:
> Improve example video analyzer for use in debugging
> 
> Bug: webrtc:10138
> Change-Id: I40e81179ae6bec83efc57a5723450690c21c3481
> Reviewed-on: https://webrtc-review.googlesource.com/c/124782
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#26883}

TBR=mbonadei@webrtc.org,titovartem@webrtc.org

Change-Id: I034f689274ceef8a8ea1d26eb5c25e833cf6bdf0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10138
Reviewed-on: https://webrtc-review.googlesource.com/c/124822
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26884}
This commit is contained in:
Artem Titov
2019-02-28 00:32:31 +00:00
committed by Commit Bot
parent 1570218ec9
commit 2585979b1b
2 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/pc/e2e/analyzer/video/example_video_quality_analyzer.cc
View File

@ -44,16 +44,13 @@ uint16_t ExampleVideoQualityAnalyzer::OnFrameCaptured(
}
void ExampleVideoQualityAnalyzer::OnFramePreEncode(
const webrtc::VideoFrame& frame) {
rtc::CritScope crit(&lock_);
++frames_pre_encoded_;
}
const webrtc::VideoFrame& frame) {}
void ExampleVideoQualityAnalyzer::OnFrameEncoded(
uint16_t frame_id,
const webrtc::EncodedImage& encoded_image) {
rtc::CritScope crit(&lock_);
++frames_encoded_;
++frames_sent_;
}
void ExampleVideoQualityAnalyzer::OnFrameDropped(
@ -73,10 +70,7 @@ void ExampleVideoQualityAnalyzer::OnFrameReceived(
void ExampleVideoQualityAnalyzer::OnFrameDecoded(
const webrtc::VideoFrame& frame,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
rtc::CritScope crit(&lock_);
++frames_decoded_;
}
absl::optional<uint8_t> qp) {}
void ExampleVideoQualityAnalyzer::OnFrameRendered(
const webrtc::VideoFrame& frame) {
@ -118,14 +112,9 @@ uint64_t ExampleVideoQualityAnalyzer::frames_captured() const {
return frames_captured_;
}
uint64_t ExampleVideoQualityAnalyzer::frames_pre_encoded() const {
uint64_t ExampleVideoQualityAnalyzer::frames_sent() const {
rtc::CritScope crit(&lock_);
return frames_pre_encoded_;
}
uint64_t ExampleVideoQualityAnalyzer::frames_encoded() const {
rtc::CritScope crit(&lock_);
return frames_encoded_;
return frames_sent_;
}
uint64_t ExampleVideoQualityAnalyzer::frames_received() const {
@ -133,9 +122,9 @@ uint64_t ExampleVideoQualityAnalyzer::frames_received() const {
return frames_received_;
}
uint64_t ExampleVideoQualityAnalyzer::frames_decoded() const {
uint64_t ExampleVideoQualityAnalyzer::frames_dropped() const {
rtc::CritScope crit(&lock_);
return frames_decoded_;
return frames_dropped_;
}
uint64_t ExampleVideoQualityAnalyzer::frames_rendered() const {
@ -143,10 +132,5 @@ uint64_t ExampleVideoQualityAnalyzer::frames_rendered() const {
return frames_rendered_;
}
uint64_t ExampleVideoQualityAnalyzer::frames_dropped() const {
rtc::CritScope crit(&lock_);
return frames_dropped_;
}
} // namespace test
} // namespace webrtc

12
test/pc/e2e/analyzer/video/example_video_quality_analyzer.h
View File

@ -52,12 +52,10 @@ class ExampleVideoQualityAnalyzer : public VideoQualityAnalyzerInterface {
std::string GetStreamLabel(uint16_t frame_id) override;
uint64_t frames_captured() const;
uint64_t frames_pre_encoded() const;
uint64_t frames_encoded() const;
uint64_t frames_sent() const;
uint64_t frames_received() const;
uint64_t frames_decoded() const;
uint64_t frames_rendered() const;
uint64_t frames_dropped() const;
uint64_t frames_rendered() const;
private:
// When peer A captured the frame it will come into analyzer's OnFrameCaptured
@ -73,12 +71,10 @@ class ExampleVideoQualityAnalyzer : public VideoQualityAnalyzerInterface {
std::map<uint16_t, std::string> frames_to_stream_label_ RTC_GUARDED_BY(lock_);
uint16_t next_frame_id_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_captured_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_pre_encoded_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_encoded_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_sent_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_received_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_decoded_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_rendered_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_dropped_ RTC_GUARDED_BY(lock_) = 0;
uint64_t frames_rendered_ RTC_GUARDED_BY(lock_) = 0;
};
} // namespace test