| Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| index b9fc7de5daa4fc44187fa38bee291ca0cc369fef..9e97df342544551d22147958e96e45272fb55171 100644
|
| --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
|
| @@ -1028,16 +1028,17 @@ void VideoDecodeAcceleratorTest::OutputLogFile(
|
| class VideoDecodeAcceleratorParamTest
|
| : public VideoDecodeAcceleratorTest,
|
| public ::testing::WithParamInterface<
|
| - Tuple7<int, int, int, ResetPoint, ClientState, bool, bool> > {
|
| + Tuple<int, int, int, ResetPoint, ClientState, bool, bool> > {
|
| };
|
|
|
| // Helper so that gtest failures emit a more readable version of the tuple than
|
| // its byte representation.
|
| ::std::ostream& operator<<(
|
| ::std::ostream& os,
|
| - const Tuple7<int, int, int, ResetPoint, ClientState, bool, bool>& t) {
|
| - return os << t.a << ", " << t.b << ", " << t.c << ", " << t.d << ", " << t.e
|
| - << ", " << t.f << ", " << t.g;
|
| + const Tuple<int, int, int, ResetPoint, ClientState, bool, bool>& t) {
|
| + return os << get<0>(t) << ", " << get<1>(t) << ", " << get<2>(t) << ", "
|
| + << get<3>(t) << ", " << get<4>(t) << ", " << get<5>(t) << ", "
|
| + << get<6>(t);
|
| }
|
|
|
| // Wait for |note| to report a state and if it's not |expected_state| then
|
| @@ -1061,13 +1062,13 @@ enum { kMinSupportedNumConcurrentDecoders = 3 };
|
| // Test the most straightforward case possible: data is decoded from a single
|
| // chunk and rendered to the screen.
|
| TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) {
|
| - size_t num_concurrent_decoders = GetParam().a;
|
| - const size_t num_in_flight_decodes = GetParam().b;
|
| - int num_play_throughs = GetParam().c;
|
| - const int reset_point = GetParam().d;
|
| - const int delete_decoder_state = GetParam().e;
|
| - bool test_reuse_delay = GetParam().f;
|
| - const bool render_as_thumbnails = GetParam().g;
|
| + size_t num_concurrent_decoders = get<0>(GetParam());
|
| + const size_t num_in_flight_decodes = get<1>(GetParam());
|
| + int num_play_throughs = get<2>(GetParam());
|
| + const int reset_point = get<3>(GetParam());
|
| + const int delete_decoder_state = get<4>(GetParam());
|
| + bool test_reuse_delay = get<5>(GetParam());
|
| + const bool render_as_thumbnails = get<6>(GetParam());
|
|
|
| if (test_video_files_.size() > 1)
|
| num_concurrent_decoders = test_video_files_.size();
|
|
|