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

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc

Issue 2500743002: Revert of H.264 packetization mode 0 (try 2) (Closed)
Patch Set: 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/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc
deleted file mode 100644
index 73a7f3e640020f9a5448c1dd3b8963d1b2affcf9..0000000000000000000000000000000000000000
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2015 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.
- *
- */
-
-#include "webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h"
-
-#include "webrtc/test/gtest.h"
-
-namespace webrtc {
-
-namespace {
-
-const int kMaxPayloadSize = 1024;
-
-void SetDefaultSettings(VideoCodec* codec_settings) {
- codec_settings->codecType = kVideoCodecH264;
- codec_settings->maxFramerate = 60;
- codec_settings->width = 640;
- codec_settings->height = 480;
- codec_settings->H264()->packetization_mode = kH264PacketizationMode1;
- // If frame dropping is false, we get a warning that bitrate can't
- // be controlled for RC_QUALITY_MODE; RC_BITRATE_MODE and RC_TIMESTAMP_MODE
- codec_settings->H264()->frameDroppingOn = true;
- codec_settings->targetBitrate = 2000;
- codec_settings->maxBitrate = 4000;
-}
-
-TEST(H264EncoderImplTest, CanInitializeWithDefaultParameters) {
- H264EncoderImpl encoder;
- VideoCodec codec_settings;
- SetDefaultSettings(&codec_settings);
- EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
- encoder.InitEncode(&codec_settings, 1, kMaxPayloadSize));
-}
-
-TEST(H264EncoderImplTest, CanInitializeWithPacketizationMode0) {
- H264EncoderImpl encoder;
- VideoCodec codec_settings;
- SetDefaultSettings(&codec_settings);
- codec_settings.H264()->packetization_mode = kH264PacketizationMode0;
- EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
- encoder.InitEncode(&codec_settings, 1, kMaxPayloadSize));
-}
-
-} // anonymous namespace
-
-} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698