admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
webrtc_m130/video/encoder_rtcp_feedback_unittest.cc

132 lines
5.1 KiB
C++
Raw Normal View History

Adding a class receiving key frame requests and relying to corresponding ViEEncoder. This CL adds the new class and unittest, but doesn't wire up th efunctionality. That will come in a follow soon after. Also added include path in file_recorder.h to make video_engine_core_unittest compile. BUG=769 TEST=New unittest added. Review URL: https://webrtc-codereview.appspot.com/776004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2708 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-06 08:19:40 +00:00
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback The name EncoderRtcpFeedback is more appropriate because: 1. "Callback" implies a single function exposed, which is not the case. 2. We intend to add OnLossNotification() to the same class. Bug: webrtc:10501 Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27490}
2019-04-08 14:16:17 +02:00
#include "video/encoder_rtcp_feedback.h"
Adding a class receiving key frame requests and relying to corresponding ViEEncoder. This CL adds the new class and unittest, but doesn't wire up th efunctionality. That will come in a follow soon after. Also added include path in file_recorder.h to make video_engine_core_unittest compile. BUG=769 TEST=New unittest added. Review URL: https://webrtc-codereview.appspot.com/776004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2708 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-06 08:19:40 +00:00
Set overuse detector max frame interval based on target frame rate. Currently there is a hard limit for the estimated captured frame interval of 45ms. As the encoder utilization is calculated as (input frame interval)/(encode time), overuse signals can be triggered even though there is plenty of time to go around if the fps is low. However, in order to avoid falsly estimating low encode usage in case the capturer has a dynamic frame rate, set the frame interval based on the actual current max framerate. BUG=webrtc:4172 Review-Url: https://codereview.webrtc.org/2918143003 Cr-Commit-Position: refs/heads/master@{#18610}
2017-06-15 04:21:07 -07:00
#include <memory>
Query WebRTC-KeyframeInterval through propagated field trials Bug: webrtc:42220378 Change-Id: I3556ec6b280bf6c03e6c3a20949a19e182eed2b8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349640 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42349}
2024-05-02 16:48:16 +02:00
#include "api/environment/environment_factory.h"
Fixing WebRTC after moving from src/webrtc to src/ In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC from src/webrtc to src/ (in order to preserve an healthy git history). This CL takes care of fixing header guards, #include paths, etc... NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true TBR=tommi@webrtc.org Bug: chromium:611808 Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578 Reviewed-on: https://webrtc-review.googlesource.com/1561 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19846}
2017-09-15 06:47:31 +02:00
#include "test/gmock.h"
#include "test/gtest.h"
Adds unit tests for VideoSendStreamImpl. Bug: None Change-Id: Ifadad47af4769d8aca42c98832cea49a6c7977cd Reviewed-on: https://webrtc-review.googlesource.com/71040 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22959}
2018-04-19 17:09:15 +02:00
#include "video/test/mock_video_stream_encoder.h"
Adding a class receiving key frame requests and relying to corresponding ViEEncoder. This CL adds the new class and unittest, but doesn't wire up th efunctionality. That will come in a follow soon after. Also added include path in file_recorder.h to make video_engine_core_unittest compile. BUG=769 TEST=New unittest added. Review URL: https://webrtc-codereview.appspot.com/776004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2708 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-06 08:19:40 +00:00
generateKeyFrame: add rids argument and do the resolution of rids to layers. This has no effect yet since the simulcast encoder adapter (SimulcastEncoderAdapter::Encode), the VP8 encoder (LibvpxVp8Encoder::Encode) and the OpenH264 encoder (H264EncoderImpl::Encode) all generate a key frame for all layers whenever a key frame is requested on one layer. BUG=chromium:1354101 Change-Id: I13f5f1bf136839a68942b0f6bf4f2d5890415250 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280945 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38565}
2022-11-04 14:45:23 +01:00
using ::testing::_;
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
using ::testing::ElementsAre;
generateKeyFrame: add rids argument and do the resolution of rids to layers. This has no effect yet since the simulcast encoder adapter (SimulcastEncoderAdapter::Encode), the VP8 encoder (LibvpxVp8Encoder::Encode) and the OpenH264 encoder (H264EncoderImpl::Encode) all generate a key frame for all layers whenever a key frame is requested on one layer. BUG=chromium:1354101 Change-Id: I13f5f1bf136839a68942b0f6bf4f2d5890415250 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280945 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38565}
2022-11-04 14:45:23 +01:00
Add support of texture frames for video capturer. This is a reland of r6252. The video_capture_tests failure on builder Android Chromium-APK Tests should be flaky. - Add ViECapturer unittest. - Add CloneFrame function in I420VideoFrame. - Encoders do not support texture yet and texture frames are dropped in ViEEncoder for now. Corresponding CLs: https://codereview.chromium.org/277943002 http://cl/66620352 BUG=chromium:362437 TEST=WebRTC video stream forwarding, video_engine_core_unittests, common_video_unittests and video_capture_tests_apk. TBR=fischman@webrtc.org, perkj@webrtc.org, stefan@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12609004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6258 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-28 07:00:51 +00:00
namespace webrtc {
Revert "Add support of texture frames for video capturer." This reverts commit 83c89cd003be75d7d06ef9a2b139588f08d280ca. Reason: The Buildbot has detected a new failure on builder Android Chromium-APK Tests. BUG=chromium:362437 TBR=fischman@webrtc.org, perkj@webrtc.org, stefan@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12599004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6253 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-27 14:12:58 +00:00
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
class VideoEncoderFeedbackKeyframeTestBase : public ::testing::Test {
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
public:
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
VideoEncoderFeedbackKeyframeTestBase(bool per_layer_pli_handling,
std::vector<uint32_t> ssrcs)
This reverts commit 8eb37a39e79fe1098d3503dcb8c8c2d196203fed. Chrome now have its own implementation of TaskQueues that is based on Chrome threads. cl was originally reviewed here: https://codereview.webrtc.org/2060403002/ - Add task queue to Call with the intent of replacing the use of one of the process threads. - Split VideoSendStream in two. VideoSendStreamInternal is created and used on the new task queue. - BitrateAllocator is now created on libjingle's worker thread but always used on the new task queue instead of both encoder threads and the process thread. - VideoEncoderConfig and VideoSendStream::Config support move semantics. - The encoder thread is moved from VideoSendStream to ViEEncoder. Frames are forwarded directly to ViEEncoder which is responsible for timestamping ? and encoding the frames. TBR=mflodman@webrtc.org BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/2250123002 Cr-Commit-Position: refs/heads/master@{#14014}
2016-09-01 01:17:40 -07:00
: simulated_clock_(123456789),
Adds unit tests for VideoSendStreamImpl. Bug: None Change-Id: Ifadad47af4769d8aca42c98832cea49a6c7977cd Reviewed-on: https://webrtc-review.googlesource.com/71040 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22959}
2018-04-19 17:09:15 +02:00
encoder_(),
Query WebRTC-KeyframeInterval through propagated field trials Bug: webrtc:42220378 Change-Id: I3556ec6b280bf6c03e6c3a20949a19e182eed2b8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349640 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42349}
2024-05-02 16:48:16 +02:00
encoder_rtcp_feedback_(CreateEnvironment(&simulated_clock_),
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
per_layer_pli_handling,
ssrcs,
&encoder_,
nullptr) {}
Simplify EncoderStateFeedback. EncoderStateFeedback is now only connected to one encoder, so remove map and other complexity to deliver feedback more directly. BUG=webrtc:5494 R=danilchap@webrtc.org Review URL: https://codereview.webrtc.org/1706803002 . Cr-Commit-Position: refs/heads/master@{#11687}
2016-02-19 17:36:01 +01:00
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
protected:
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
static const uint32_t kSsrc = 1234;
static const uint32_t kOtherSsrc = 4321;
Make SendStatisticsProxy paramter mandatory in ViEEncoder ctor. The only implementation which used a nullptr was a mock used in tests, so add a dummy instance there instead. Remove tests for stats_proxy_ in vie_encoder and just dcheck in the constructor instead. BUG=None Review-Url: https://codereview.webrtc.org/2695643002 Cr-Commit-Position: refs/heads/master@{#16577}
2017-02-13 04:41:45 -08:00
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
SimulatedClock simulated_clock_;
Fully qualify googletest symbols. Semi-automatically created with: git grep -l " testing::" | xargs sed -i "s/ testing::/ ::testing::/g" git grep -l "(testing::" | xargs sed -i "s/(testing::/(::testing::/g" git cl format After this, two .cc files failed to compile and I have fixed them manually. Bug: webrtc:10523 Change-Id: I4741d3bcedc831b6c5fdc04485678617eb4ce031 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132018 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27526}
2019-04-09 15:11:12 +02:00
::testing::StrictMock<MockVideoStreamEncoder> encoder_;
Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback The name EncoderRtcpFeedback is more appropriate because: 1. "Callback" implies a single function exposed, which is not the case. 2. We intend to add OnLossNotification() to the same class. Bug: webrtc:10501 Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27490}
2019-04-08 14:16:17 +02:00
EncoderRtcpFeedback encoder_rtcp_feedback_;
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
};
Simplify EncoderStateFeedback. EncoderStateFeedback is now only connected to one encoder, so remove map and other complexity to deliver feedback more directly. BUG=webrtc:5494 R=danilchap@webrtc.org Review URL: https://codereview.webrtc.org/1706803002 . Cr-Commit-Position: refs/heads/master@{#11687}
2016-02-19 17:36:01 +01:00
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
class VideoEncoderFeedbackKeyframeTest
: public VideoEncoderFeedbackKeyframeTestBase {
public:
VideoEncoderFeedbackKeyframeTest()
: VideoEncoderFeedbackKeyframeTestBase(
/*per_layer_pli_handling=*/false,
{VideoEncoderFeedbackKeyframeTestBase::kSsrc}) {}
};
TEST_F(VideoEncoderFeedbackKeyframeTest, CreateAndTriggerRequests) {
generateKeyFrame: add rids argument and do the resolution of rids to layers. This has no effect yet since the simulcast encoder adapter (SimulcastEncoderAdapter::Encode), the VP8 encoder (LibvpxVp8Encoder::Encode) and the OpenH264 encoder (H264EncoderImpl::Encode) all generate a key frame for all layers whenever a key frame is requested on one layer. BUG=chromium:1354101 Change-Id: I13f5f1bf136839a68942b0f6bf4f2d5890415250 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280945 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38565}
2022-11-04 14:45:23 +01:00
EXPECT_CALL(encoder_, SendKeyFrame(_)).Times(1);
Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback The name EncoderRtcpFeedback is more appropriate because: 1. "Callback" implies a single function exposed, which is not the case. 2. We intend to add OnLossNotification() to the same class. Bug: webrtc:10501 Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27490}
2019-04-08 14:16:17 +02:00
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
}
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
TEST_F(VideoEncoderFeedbackKeyframeTest, TooManyOnReceivedIntraFrameRequest) {
generateKeyFrame: add rids argument and do the resolution of rids to layers. This has no effect yet since the simulcast encoder adapter (SimulcastEncoderAdapter::Encode), the VP8 encoder (LibvpxVp8Encoder::Encode) and the OpenH264 encoder (H264EncoderImpl::Encode) all generate a key frame for all layers whenever a key frame is requested on one layer. BUG=chromium:1354101 Change-Id: I13f5f1bf136839a68942b0f6bf4f2d5890415250 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280945 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38565}
2022-11-04 14:45:23 +01:00
EXPECT_CALL(encoder_, SendKeyFrame(_)).Times(1);
Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback The name EncoderRtcpFeedback is more appropriate because: 1. "Callback" implies a single function exposed, which is not the case. 2. We intend to add OnLossNotification() to the same class. Bug: webrtc:10501 Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27490}
2019-04-08 14:16:17 +02:00
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
simulated_clock_.AdvanceTimeMilliseconds(10);
Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback The name EncoderRtcpFeedback is more appropriate because: 1. "Callback" implies a single function exposed, which is not the case. 2. We intend to add OnLossNotification() to the same class. Bug: webrtc:10501 Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27490}
2019-04-08 14:16:17 +02:00
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
generateKeyFrame: add rids argument and do the resolution of rids to layers. This has no effect yet since the simulcast encoder adapter (SimulcastEncoderAdapter::Encode), the VP8 encoder (LibvpxVp8Encoder::Encode) and the OpenH264 encoder (H264EncoderImpl::Encode) all generate a key frame for all layers whenever a key frame is requested on one layer. BUG=chromium:1354101 Change-Id: I13f5f1bf136839a68942b0f6bf4f2d5890415250 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280945 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38565}
2022-11-04 14:45:23 +01:00
EXPECT_CALL(encoder_, SendKeyFrame(_)).Times(1);
Removed SSRC knowledge from ViEEncoder. SSRC knowledge is contained withing VideoSendStream. That also means that debug recording is moved to VideoSendStream. I think that make sence since that allows debug recording with external encoder implementations one day. BUG=webrtc:5687 Review-Url: https://codereview.webrtc.org/1936503002 Cr-Commit-Position: refs/heads/master@{#12632}
2016-05-04 11:26:51 -07:00
simulated_clock_.AdvanceTimeMilliseconds(300);
Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback The name EncoderRtcpFeedback is more appropriate because: 1. "Callback" implies a single function exposed, which is not the case. 2. We intend to add OnLossNotification() to the same class. Bug: webrtc:10501 Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27490}
2019-04-08 14:16:17 +02:00
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
Register callback for key frame request from media transport. Bug: webrtc:9719 Change-Id: Ibeadadb8e477d6d712fd69427c95e1e4f1940854 Reviewed-on: https://webrtc-review.googlesource.com/c/120340 Commit-Queue: Niels Moller <nisse@webrtc.org> Commit-Queue: Peter Slatala <psla@webrtc.org> Reviewed-by: Peter Slatala <psla@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26473}
2019-01-30 16:33:45 +01:00
}
Add nonstandard x-google-per-layer-pli fmtp for enabling per-layer keyFrames in response to PLIs which needs to be added to the remote codecs a=fmtp: This also forces SimulcastCastEncoderAdapter to avoid issues with codecs that have native simulcast capability but do require synchronized keyframes. This parameter allows for large-scale experimentation and A/B testing whether the new behavior has advantages. It is to be considered transitional and may be removed again in the future. BUG=webrtc:10107 Change-Id: I81f496c987b2fed7ff3089efb746e7e89e89c033 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333560 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41805}
2024-02-20 15:28:14 +01:00
class VideoEncoderFeedbackKeyframePerLayerPliTest
: public VideoEncoderFeedbackKeyframeTestBase {
public:
VideoEncoderFeedbackKeyframePerLayerPliTest()
: VideoEncoderFeedbackKeyframeTestBase(
/*per_layer_pli_handling=*/true,
{VideoEncoderFeedbackKeyframeTestBase::kSsrc,
VideoEncoderFeedbackKeyframeTestBase::kOtherSsrc}) {}
};
TEST_F(VideoEncoderFeedbackKeyframePerLayerPliTest, CreateAndTriggerRequests) {
EXPECT_CALL(encoder_,
SendKeyFrame(ElementsAre(VideoFrameType::kVideoFrameKey,
VideoFrameType::kVideoFrameDelta)))
.Times(1);
EXPECT_CALL(encoder_,
SendKeyFrame(ElementsAre(VideoFrameType::kVideoFrameDelta,
VideoFrameType::kVideoFrameKey)))
.Times(1);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kOtherSsrc);
}
TEST_F(VideoEncoderFeedbackKeyframePerLayerPliTest,
TooManyOnReceivedIntraFrameRequest) {
EXPECT_CALL(encoder_,
SendKeyFrame(ElementsAre(VideoFrameType::kVideoFrameKey,
VideoFrameType::kVideoFrameDelta)))
.Times(1);
EXPECT_CALL(encoder_,
SendKeyFrame(ElementsAre(VideoFrameType::kVideoFrameDelta,
VideoFrameType::kVideoFrameKey)))
.Times(1);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kOtherSsrc);
simulated_clock_.AdvanceTimeMilliseconds(10);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kOtherSsrc);
EXPECT_CALL(encoder_,
SendKeyFrame(ElementsAre(VideoFrameType::kVideoFrameKey,
VideoFrameType::kVideoFrameDelta)))
.Times(1);
EXPECT_CALL(encoder_,
SendKeyFrame(ElementsAre(VideoFrameType::kVideoFrameDelta,
VideoFrameType::kVideoFrameKey)))
.Times(1);
simulated_clock_.AdvanceTimeMilliseconds(300);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kOtherSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kOtherSsrc);
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kOtherSsrc);
}
Adding a class receiving key frame requests and relying to corresponding ViEEncoder. This CL adds the new class and unittest, but doesn't wire up th efunctionality. That will come in a follow soon after. Also added include path in file_recorder.h to make video_engine_core_unittest compile. BUG=769 TEST=New unittest added. Review URL: https://webrtc-codereview.appspot.com/776004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2708 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-09-06 08:19:40 +00:00
} // namespace webrtc
Reference in New Issue Copy Permalink