Index: media/gpu/video_encode_accelerator_unittest.cc |
diff --git a/media/gpu/video_encode_accelerator_unittest.cc b/media/gpu/video_encode_accelerator_unittest.cc |
index 7ba3fe8d83e6ef8be99a1efb7b94f6d108a7a73a..16b900798093c91ee28f963e40b91eba294bca68 100644 |
--- a/media/gpu/video_encode_accelerator_unittest.cc |
+++ b/media/gpu/video_encode_accelerator_unittest.cc |
@@ -1575,12 +1575,14 @@ bool VEAClient::HandleEncodedFrame(bool keyframe) { |
SetState(CS_FINISHED); |
if (!quality_validator_) |
SetState(CS_VALIDATED); |
+#if defined(OS_CHROMEOS) |
pbos
2016/08/02 00:16:52
Can you comment on why this would/should only appl
emircan
2016/08/02 22:05:40
I removed ifdef and explained above.
|
if (verify_output_timestamp_) { |
// There may be some timestamps left because we push extra frames to flush |
// encoder. |
EXPECT_LE(frame_timestamps_.size(), |
static_cast<size_t>(next_input_id_ - num_frames_to_encode_)); |
} |
+#endif // defined(OS_CHROMEOS) |
return false; |
} |
@@ -1836,6 +1838,15 @@ INSTANTIATE_TEST_CASE_P(MultipleEncoders, |
false, |
false, |
false))); |
+ |
+#if defined(OS_MACOSX) |
+INSTANTIATE_TEST_CASE_P( |
+ VerifyTimestamp, |
+ VideoEncodeAcceleratorTest, |
+ ::testing::Values( |
+ std::make_tuple(1, false, 0, false, false, false, false, false, true))); |
+#endif // defined(OS_MACOSX) |
+ |
#if defined(OS_WIN) |
INSTANTIATE_TEST_CASE_P( |
ForceBitrate, |