| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 VideoCodec codec_settings() override { | 25 VideoCodec codec_settings() override { |
| 26 VideoCodec codec_inst; | 26 VideoCodec codec_inst; |
| 27 codec_inst.codecType = webrtc::kVideoCodecH264; | 27 codec_inst.codecType = webrtc::kVideoCodecH264; |
| 28 // If frame dropping is false, we get a warning that bitrate can't | 28 // If frame dropping is false, we get a warning that bitrate can't |
| 29 // be controlled for RC_QUALITY_MODE; RC_BITRATE_MODE and RC_TIMESTAMP_MODE | 29 // be controlled for RC_QUALITY_MODE; RC_BITRATE_MODE and RC_TIMESTAMP_MODE |
| 30 codec_inst.H264()->frameDroppingOn = true; | 30 codec_inst.H264()->frameDroppingOn = true; |
| 31 return codec_inst; | 31 return codec_inst; |
| 32 } | 32 } |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 #ifdef WEBRTC_VIDEOPROCESSOR_H264_TESTS | 35 #ifdef WEBRTC_USE_H264 |
| 36 #define MAYBE_EncodeDecode EncodeDecode | 36 #define MAYBE_EncodeDecode EncodeDecode |
| 37 #define MAYBE_DecodedQpEqualsEncodedQp DecodedQpEqualsEncodedQp | 37 #define MAYBE_DecodedQpEqualsEncodedQp DecodedQpEqualsEncodedQp |
| 38 #else | 38 #else |
| 39 #define MAYBE_EncodeDecode DISABLED_EncodeDecode | 39 #define MAYBE_EncodeDecode DISABLED_EncodeDecode |
| 40 #define MAYBE_DecodedQpEqualsEncodedQp DISABLED_DecodedQpEqualsEncodedQp | 40 #define MAYBE_DecodedQpEqualsEncodedQp DISABLED_DecodedQpEqualsEncodedQp |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 TEST_F(TestH264Impl, MAYBE_EncodeDecode) { | 43 TEST_F(TestH264Impl, MAYBE_EncodeDecode) { |
| 44 EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, | 44 EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, |
| 45 encoder_->Encode(*input_frame_, nullptr, nullptr)); | 45 encoder_->Encode(*input_frame_, nullptr, nullptr)); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 69 decoder_->Decode(encoded_frame, false, nullptr)); | 69 decoder_->Decode(encoded_frame, false, nullptr)); |
| 70 std::unique_ptr<VideoFrame> decoded_frame; | 70 std::unique_ptr<VideoFrame> decoded_frame; |
| 71 rtc::Optional<uint8_t> decoded_qp; | 71 rtc::Optional<uint8_t> decoded_qp; |
| 72 ASSERT_TRUE(WaitForDecodedFrame(&decoded_frame, &decoded_qp)); | 72 ASSERT_TRUE(WaitForDecodedFrame(&decoded_frame, &decoded_qp)); |
| 73 ASSERT_TRUE(decoded_frame); | 73 ASSERT_TRUE(decoded_frame); |
| 74 ASSERT_TRUE(decoded_qp); | 74 ASSERT_TRUE(decoded_qp); |
| 75 EXPECT_EQ(encoded_frame.qp_, *decoded_qp); | 75 EXPECT_EQ(encoded_frame.qp_, *decoded_qp); |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace webrtc | 78 } // namespace webrtc |
| OLD | NEW |