Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: webrtc/video/end_to_end_tests.cc

Issue 2337453002: H.264 packetization mode 0 (try 2) (Closed)
Patch Set: Addressed hbos comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 1f8109fd8b639b3ee23a2e899b9eb9a973d419a1..30a598ce8723df9723aae202d407a85be60a34e0 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -131,6 +131,15 @@ class EndToEndTest : public test::CallTest {
Transport* transport);
};
+void SetPacketizationMode(H264PacketizationMode mode, VideoEncoder* encoder) {
+ VideoCodec codec_settings;
+ codec_settings.codecType = kVideoCodecH264;
+ codec_settings.H264()->packetization_mode = mode;
+ // TODO(hta): Determine appropriate value for max packet size.
+ static const int kMaxPacketSize = 1024;
+ encoder->InitEncode(&codec_settings, 0, kMaxPacketSize);
+}
+
TEST_F(EndToEndTest, ReceiverCanBeStartedTwice) {
CreateCalls(Call::Config(&event_log_), Call::Config(&event_log_));
@@ -374,7 +383,7 @@ TEST_F(EndToEndTest, SendsAndReceivesVP9VideoRotation90) {
}
#endif // !defined(RTC_DISABLE_VP9)
-#if defined(WEBRTC_END_TO_END_H264_TESTS)
+#if defined(WEBRTC_USE_H264)
TEST_F(EndToEndTest, SendsAndReceivesH264) {
CodecObserver test(500, kVideoRotation_0, "H264",
@@ -390,7 +399,25 @@ TEST_F(EndToEndTest, SendsAndReceivesH264VideoRotation90) {
RunBaseTest(&test);
}
-#endif // defined(WEBRTC_END_TO_END_H264_TESTS)
+TEST_F(EndToEndTest, SendsAndReceivesH264PacketizationMode0) {
+ VideoEncoder* encoder = VideoEncoder::Create(VideoEncoder::kH264);
+ SetPacketizationMode(kH264PacketizationMode0, encoder);
+ // The CodecObserver takes ownership of the encoder.
+ CodecObserver test(500, kVideoRotation_0, "H264", encoder,
+ H264Decoder::Create());
+ RunBaseTest(&test);
+}
+
+TEST_F(EndToEndTest, SendsAndReceivesH264PacketizationMode1) {
+ VideoEncoder* encoder = VideoEncoder::Create(VideoEncoder::kH264);
+ SetPacketizationMode(kH264PacketizationMode1, encoder);
+ // The CodecObserver takes ownership of the encoder.
+ CodecObserver test(500, kVideoRotation_0, "H264", encoder,
+ H264Decoder::Create());
+ RunBaseTest(&test);
+}
+
+#endif // defined(WEBRTC_USE_H264)
TEST_F(EndToEndTest, ReceiverUsesLocalSsrc) {
class SyncRtcpObserver : public test::EndToEndTest {

Powered by Google App Engine
This is Rietveld 408576698