| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/timer/timer.h" | 7 #include "base/timer/timer.h" |
| 8 #include "media/base/android/demuxer_android.h" | 8 #include "media/base/android/demuxer_android.h" |
| 9 #include "media/base/android/media_codec_bridge.h" | 9 #include "media/base/android/media_codec_bridge.h" |
| 10 #include "media/base/android/media_codec_player.h" | 10 #include "media/base/android/media_codec_player.h" |
| (...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1583 | 1583 |
| 1584 // Wait till the player is initialized on media thread. | 1584 // Wait till the player is initialized on media thread. |
| 1585 EXPECT_TRUE(WaitForCondition(base::Bind(&MockDemuxerAndroid::IsInitialized, | 1585 EXPECT_TRUE(WaitForCondition(base::Bind(&MockDemuxerAndroid::IsInitialized, |
| 1586 base::Unretained(demuxer_)))); | 1586 base::Unretained(demuxer_)))); |
| 1587 | 1587 |
| 1588 if (!demuxer_->IsInitialized()) { | 1588 if (!demuxer_->IsInitialized()) { |
| 1589 DVLOG(0) << "AVPrerollVideoEndsWhilePrerolling: demuxer is not initialized"; | 1589 DVLOG(0) << "AVPrerollVideoEndsWhilePrerolling: demuxer is not initialized"; |
| 1590 return; | 1590 return; |
| 1591 } | 1591 } |
| 1592 | 1592 |
| 1593 // http://crbug.com/526755 |
| 1594 // Set verbose mode to the decoders after decoders are created. |
| 1595 player_->SetVerboseForTests(true); |
| 1596 |
| 1593 // Post configuration after the player has been initialized. | 1597 // Post configuration after the player has been initialized. |
| 1594 demuxer_->PostInternalConfigs(); | 1598 demuxer_->PostInternalConfigs(); |
| 1595 | 1599 |
| 1596 // Issue SeekTo(). | 1600 // Issue SeekTo(). |
| 1597 player_->SeekTo(seek_position); | 1601 player_->SeekTo(seek_position); |
| 1598 | 1602 |
| 1599 // Start the playback. | 1603 // Start the playback. |
| 1600 player_->Start(); | 1604 player_->Start(); |
| 1601 | 1605 |
| 1602 // http://crbug.com/526755 | 1606 // http://crbug.com/526755 |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1879 manager_.render_stat_[DemuxerStream::VIDEO].num_values()); | 1883 manager_.render_stat_[DemuxerStream::VIDEO].num_values()); |
| 1880 | 1884 |
| 1881 // Check that we did not miss audio frames. We expect two postponed frames | 1885 // Check that we did not miss audio frames. We expect two postponed frames |
| 1882 // that are not reported. | 1886 // that are not reported. |
| 1883 int expected_audio_frames = duration / kAudioFramePeriod + 1 - 2; | 1887 int expected_audio_frames = duration / kAudioFramePeriod + 1 - 2; |
| 1884 EXPECT_EQ(expected_audio_frames, | 1888 EXPECT_EQ(expected_audio_frames, |
| 1885 manager_.render_stat_[DemuxerStream::AUDIO].num_values()); | 1889 manager_.render_stat_[DemuxerStream::AUDIO].num_values()); |
| 1886 } | 1890 } |
| 1887 | 1891 |
| 1888 } // namespace media | 1892 } // namespace media |
| OLD | NEW |