media/base/android/media_source_player_unittest.cc - Issue 254473010: Refactor MSE implementation on Android to simplify the logic and improve the performance

Unified Diff: media/base/android/media_source_player_unittest.cc

Issue 254473010: Refactor MSE implementation on Android to simplify the logic and improve the performance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 months 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: media/base/android/media_source_player_unittest.cc

diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc

index 35431e96953486daf44ed5e325db07bb2f430889..c1ae2f12e809d628dd505bd260aa09209ff0dc0b 100644

--- a/media/base/android/media_source_player_unittest.cc

+++ b/media/base/android/media_source_player_unittest.cc

@@ -8,10 +8,12 @@

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/strings/stringprintf.h"

+#include "media/base/android/audio_decoder_job.h"

#include "media/base/android/media_codec_bridge.h"

#include "media/base/android/media_drm_bridge.h"

#include "media/base/android/media_player_manager.h"

#include "media/base/android/media_source_player.h"

+#include "media/base/android/video_decoder_job.h"

#include "media/base/bind_to_current_loop.h"

#include "media/base/decoder_buffer.h"

#include "media/base/test_data_util.h"

@@ -135,14 +137,10 @@ class MockDemuxerAndroid : public DemuxerAndroid {

: message_loop_(message_loop),

num_data_requests_(0),

num_seek_requests_(0),

- num_browser_seek_requests_(0),

- num_config_requests_(0) {}

+ num_browser_seek_requests_(0) {}

virtual ~MockDemuxerAndroid() {}

virtual void Initialize(DemuxerAndroidClient* client) OVERRIDE {}

- virtual void RequestDemuxerConfigs() OVERRIDE {

- num_config_requests_++;

- }

virtual void RequestDemuxerData(DemuxerStream::Type type) OVERRIDE {

num_data_requests_++;

if (message_loop_->is_running())

@@ -158,7 +156,6 @@ class MockDemuxerAndroid : public DemuxerAndroid {

int num_data_requests() const { return num_data_requests_; }

int num_seek_requests() const { return num_seek_requests_; }

int num_browser_seek_requests() const { return num_browser_seek_requests_; }

- int num_config_requests() const { return num_config_requests_; }

private:

base::MessageLoop* message_loop_;

@@ -172,9 +169,6 @@ class MockDemuxerAndroid : public DemuxerAndroid {

// The number of browser seek requests this object has seen.

int num_browser_seek_requests_;

- // The number of demuxer config requests this object has seen.

- int num_config_requests_;

DISALLOW_COPY_AND_ASSIGN(MockDemuxerAndroid);

};

@@ -204,10 +198,17 @@ class MediaSourcePlayerTest : public testing::Test {

player_.video_decoder_job_.get());

}

+ // Get the MediaCodecBridge from the decoder job.

+ MediaCodecBridge* GetMediaCodecBridge(bool is_audio) {

+ if (is_audio)

+ return player_.audio_decoder_job_->media_codec_bridge_.get();

+ return player_.video_decoder_job_->media_codec_bridge_.get();

+ }

// Get the per-job prerolling status from the MediaSourcePlayer's job matching

// |is_audio|. Caller must guard against NPE if the player's job is NULL.

bool IsPrerolling(bool is_audio) {

- return GetMediaDecoderJob(is_audio)->prerolling();

+ return GetMediaDecoderJob(is_audio)->prerolling_;

}

// Get the preroll timestamp from the MediaSourcePlayer.

@@ -226,8 +227,6 @@ class MediaSourcePlayerTest : public testing::Test {

EXPECT_TRUE(player_.IsPlaying());

player_.Release();

EXPECT_FALSE(player_.IsPlaying());

- EXPECT_FALSE(GetMediaDecoderJob(true));

- EXPECT_FALSE(GetMediaDecoderJob(false));

}

// Upon the next successful decode callback, post a task to call Release()

@@ -244,22 +243,17 @@ class MediaSourcePlayerTest : public testing::Test {

}

// Asynch test callback posted upon decode completion to verify that a pending

- // prefetch done event is cleared across |player_|'s Release(). This helps

+ // prefetch done event is not cleared across |player_|'s Release(). This helps

// ensure the ReleaseWithOnPrefetchDoneAlreadyPosted test scenario is met.

void ReleaseWithPendingPrefetchDoneVerification() {

EXPECT_TRUE(player_.IsEventPending(player_.PREFETCH_DONE_EVENT_PENDING));

ReleasePlayer();

- EXPECT_FALSE(player_.IsEventPending(player_.PREFETCH_DONE_EVENT_PENDING));

+ EXPECT_TRUE(player_.IsEventPending(player_.PREFETCH_DONE_EVENT_PENDING));

EXPECT_FALSE(decoder_callback_hook_executed_);

+ EXPECT_FALSE(GetMediaCodecBridge(true));

decoder_callback_hook_executed_ = true;

}

- // Inspect internal pending_event_ state of |player_|. This is for infrequent

- // use by tests, only where required.

- bool IsPendingSurfaceChange() {

- return player_.IsEventPending(player_.SURFACE_CHANGE_EVENT_PENDING);

- }

DemuxerConfigs CreateAudioDemuxerConfigs(AudioCodec audio_codec) {

DemuxerConfigs configs;

configs.audio_codec = audio_codec;

@@ -288,9 +282,9 @@ class MediaSourcePlayerTest : public testing::Test {

return configs;

}

- DemuxerConfigs CreateVideoDemuxerConfigs() {

+ DemuxerConfigs CreateVideoDemuxerConfigs(VideoCodec video_codec) {

DemuxerConfigs configs;

- configs.video_codec = kCodecVP8;

+ configs.video_codec = video_codec;

configs.video_size = gfx::Size(320, 240);

configs.is_video_encrypted = false;

configs.duration = kDefaultDuration;

@@ -312,7 +306,7 @@ class MediaSourcePlayerTest : public testing::Test {

return CreateAudioDemuxerConfigs(kCodecVorbis);

if (have_video && !have_audio)

- return CreateVideoDemuxerConfigs();

+ return CreateVideoDemuxerConfigs(kCodecVP8);

return CreateAudioVideoDemuxerConfigs();

}

@@ -326,7 +320,7 @@ class MediaSourcePlayerTest : public testing::Test {

// Starts a video decoder job. Verifies player behavior relative to

// |expect_player_requests_data|.

void StartVideoDecoderJob(bool expect_player_requests_data) {

- Start(CreateVideoDemuxerConfigs(), expect_player_requests_data);

+ Start(CreateVideoDemuxerConfigs(kCodecVP8), expect_player_requests_data);

}

// Starts decoding the data. Verifies player behavior relative to

@@ -344,13 +338,6 @@ class MediaSourcePlayerTest : public testing::Test {

EXPECT_TRUE(player_.IsPlaying());

EXPECT_EQ(original_num_data_requests + expected_request_delta,

demuxer_->num_data_requests());

- // Verify player has decoder job iff the config included the media type for

- // the job and the player is expected to request data due to Start(), above.

- EXPECT_EQ(expect_player_requests_data && has_audio,

- GetMediaDecoderJob(true) != NULL);

- EXPECT_EQ(expect_player_requests_data && has_video,

- GetMediaDecoderJob(false) != NULL);

}

// Keeps decoding audio data until the decoder starts to output samples.

@@ -438,7 +425,7 @@ class MediaSourcePlayerTest : public testing::Test {

// decoding.

void StartAudioDecoderJobAndSeekToWhileDecoding(

const base::TimeDelta& seek_time) {

- EXPECT_FALSE(GetMediaDecoderJob(true));

+ EXPECT_FALSE(GetMediaCodecBridge(true));

EXPECT_FALSE(player_.IsPlaying());

EXPECT_EQ(0, demuxer_->num_data_requests());

EXPECT_EQ(0.0, GetPrerollTimestamp().InMillisecondsF());

@@ -475,6 +462,9 @@ class MediaSourcePlayerTest : public testing::Test {

// caused by the seek.

player_.OnDemuxerDataAvailable(CreateAbortedAck(is_audio));

+ // Wait for the decode job to finish so we can process the seek request.

+ WaitForDecodeDone(is_audio, !is_audio);

// Verify that the seek is requested.

EXPECT_EQ(original_num_seeks + 1, demuxer_->num_seek_requests());

@@ -519,8 +509,10 @@ class MediaSourcePlayerTest : public testing::Test {

EXPECT_LE(target_timestamp, player_.GetCurrentTime());

}

- DemuxerData CreateReadFromDemuxerAckWithConfigChanged(bool is_audio,

- int config_unit_index) {

+ DemuxerData CreateReadFromDemuxerAckWithConfigChanged(

+ bool is_audio,

+ int config_unit_index,

+ const DemuxerConfigs& configs) {

DemuxerData data;

data.type = is_audio ? DemuxerStream::AUDIO : DemuxerStream::VIDEO;

data.access_units.resize(config_unit_index + 1);

@@ -529,6 +521,8 @@ class MediaSourcePlayerTest : public testing::Test {

data.access_units[i] = CreateAccessUnitWithData(is_audio, i);

data.access_units[config_unit_index].status = DemuxerStream::kConfigChanged;

+ data.demuxer_configs.resize(1);

+ data.demuxer_configs[0] = configs;

return data;

}

@@ -540,29 +534,35 @@ class MediaSourcePlayerTest : public testing::Test {

// browser seek results once decode completes and surface change processing

// begins.

void BrowserSeekPlayer(bool trigger_with_release_start) {

- int expected_num_data_requests = demuxer_->num_data_requests() +

- (trigger_with_release_start ? 1 : 2);

+ int expected_num_data_requests = demuxer_->num_data_requests() + 2;

int expected_num_seek_requests = demuxer_->num_seek_requests();

int expected_num_browser_seek_requests =

demuxer_->num_browser_seek_requests();

- EXPECT_FALSE(GetMediaDecoderJob(false));

CreateNextTextureAndSetVideoSurface();

StartVideoDecoderJob(true);

if (trigger_with_release_start) {

+ // Consume the first frame, so that the next VideoDecoderJob will not

+ // inherit the I-frame from the previous decoder.

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

ReleasePlayer();

+ WaitForVideoDecodeDone();

// Simulate demuxer's response to the video data request. The data will be

- // discarded.

+ // passed to the next MediaCodecBridge.

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

- EXPECT_FALSE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_FALSE(player_.IsPlaying());

EXPECT_EQ(expected_num_seek_requests, demuxer_->num_seek_requests());

CreateNextTextureAndSetVideoSurface();

StartVideoDecoderJob(false);

- EXPECT_FALSE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

+ // Run the message loop so that prefetch will complete.

+ while (expected_num_seek_requests == demuxer_->num_seek_requests())

+ message_loop_.RunUntilIdle();

} else {

// Simulate demuxer's response to the video data request.

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

@@ -575,7 +575,7 @@ class MediaSourcePlayerTest : public testing::Test {

CreateNextTextureAndSetVideoSurface();

// Browser seek should not begin until decoding has completed.

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ EXPECT_TRUE(GetMediaCodecBridge(false));

EXPECT_EQ(expected_num_seek_requests, demuxer_->num_seek_requests());

// Wait for the decoder job to finish decoding and be reset pending the

@@ -600,12 +600,10 @@ class MediaSourcePlayerTest : public testing::Test {

// false, regular data is fed and decoded prior to feeding the config change

// AU in response to the second data request (after prefetch completed).

// |config_unit_index| controls which access unit is |kConfigChanged|.

- void StartConfigChange(bool is_audio,

- bool config_unit_in_prefetch,

- int config_unit_index) {

- int expected_num_config_requests = demuxer_->num_config_requests();

- EXPECT_FALSE(GetMediaDecoderJob(is_audio));

+ void SendConfigChangeToDecoder(bool is_audio,

+ bool config_unit_in_prefetch,

+ int config_unit_index) {

+ EXPECT_FALSE(GetMediaCodecBridge(is_audio));

if (is_audio) {

StartAudioDecoderJob(true);

} else {

@@ -614,7 +612,6 @@ class MediaSourcePlayerTest : public testing::Test {

}

int expected_num_data_requests = demuxer_->num_data_requests();

// Feed and decode a standalone access unit so the player exits prefetch.

if (!config_unit_in_prefetch) {

if (is_audio)

@@ -629,19 +626,34 @@ class MediaSourcePlayerTest : public testing::Test {

EXPECT_EQ(expected_num_data_requests, demuxer_->num_data_requests());

}

- EXPECT_EQ(expected_num_config_requests, demuxer_->num_config_requests());

+ DemuxerConfigs configs = is_audio ? CreateAudioDemuxerConfigs(kCodecAAC) :

+ CreateVideoDemuxerConfigs(kCodecVP9);

// Feed and decode access units with data for any units prior to

// |config_unit_index|, and a |kConfigChanged| unit at that index.

// Player should prepare to reconfigure the decoder job, and should request

// new demuxer configs.

- player_.OnDemuxerDataAvailable(

- CreateReadFromDemuxerAckWithConfigChanged(is_audio, config_unit_index));

- WaitForDecodeDone(is_audio, !is_audio);

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckWithConfigChanged(

+ is_audio, config_unit_index, configs));

- expected_num_config_requests++;

+ expected_num_data_requests++;

EXPECT_EQ(expected_num_data_requests, demuxer_->num_data_requests());

- EXPECT_EQ(expected_num_config_requests, demuxer_->num_config_requests());

+ if (is_audio)

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(0));

+ else

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ }

+ // Send a config change to the decoder job and drain the decoder so that the

+ // config change is processed.

+ void StartConfigChange(bool is_audio,

+ bool config_unit_in_prefetch,

+ int config_unit_index) {

+ SendConfigChangeToDecoder(is_audio, config_unit_in_prefetch,

+ config_unit_index);

+ int expected_num_data_requests = demuxer_->num_data_requests();

+ // Run until decoder starts to request new data.

+ while(demuxer_->num_data_requests() == expected_num_data_requests)

wolenetz 2014/04/25 23:13:13 lint nit: Missing space before ( in while(

qinmin 2014/04/26 01:30:11 Done.

+ message_loop_.RunUntilIdle();

}

void CreateNextTextureAndSetVideoSurface() {

@@ -663,10 +675,10 @@ class MediaSourcePlayerTest : public testing::Test {

// assumed to exist for any stream whose decode completion is awaited.

void WaitForDecodeDone(bool wait_for_audio, bool wait_for_video) {

DCHECK(wait_for_audio || wait_for_video);

- while ((wait_for_audio && GetMediaDecoderJob(true) &&

+ while ((wait_for_audio && GetMediaCodecBridge(true) &&

GetMediaDecoderJob(true)->HasData() &&

GetMediaDecoderJob(true)->is_decoding()) ||

- (wait_for_video && GetMediaDecoderJob(false) &&

+ (wait_for_video && GetMediaCodecBridge(false) &&

GetMediaDecoderJob(false)->HasData() &&

GetMediaDecoderJob(false)->is_decoding())) {

message_loop_.RunUntilIdle();

@@ -769,6 +781,14 @@ class MediaSourcePlayerTest : public testing::Test {

return player_.start_time_ticks_;

}

+ bool IsRequestingDemuxerData(bool is_audio) {

+ return GetMediaDecoderJob(is_audio)->is_requesting_demuxer_data_;

+ }

+ bool IsDrainingDecoder(bool is_audio) {

+ return GetMediaDecoderJob(is_audio)->drain_decoder_;

+ }

base::MessageLoop message_loop_;

MockMediaPlayerManager manager_;

MockDemuxerAndroid* demuxer_; // Owned by |player_|.

@@ -810,35 +830,32 @@ TEST_F(MediaSourcePlayerTest, StartAudioDecoderWithInvalidConfig) {

uint8 invalid_codec_data[] = { 0x00, 0xff, 0xff, 0xff, 0xff };

configs.audio_extra_data.insert(configs.audio_extra_data.begin(),

invalid_codec_data, invalid_codec_data + 4);

- Start(configs, false);

+ // Prefetch() should happen before the decoder is created, so we should always

+ // see data requests.

+ Start(configs, true);

EXPECT_EQ(0, demuxer_->num_seek_requests());

}

TEST_F(MediaSourcePlayerTest, StartVideoCodecWithValidSurface) {

SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();

- // Test video decoder job will be created when surface is valid.

- // Video decoder job will not be created until surface is available.

- StartVideoDecoderJob(false);

+ // Test video decoder job will not be created until data is received.

+ StartVideoDecoderJob(true);

// Set both an initial and a later video surface without receiving any

// demuxed data yet.

CreateNextTextureAndSetVideoSurface();

- MediaDecoderJob* first_job = GetMediaDecoderJob(false);

- EXPECT_TRUE(first_job);

+ EXPECT_FALSE(GetMediaCodecBridge(false));

CreateNextTextureAndSetVideoSurface();

- // Setting another surface will not create a new job until any pending

- // read is satisfied (and job is no longer decoding).

- EXPECT_EQ(first_job, GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

// No seeks, even on setting surface, should have occurred. (Browser seeks can

// occur on setting surface, but only after previously receiving video data.)

EXPECT_EQ(0, demuxer_->num_seek_requests());

- // Note, the decoder job for the second surface set, above, will be created

- // only after the pending read is satisfied and decoded, and the resulting

- // browser seek is done. See BrowserSeek_* tests for this coverage.

+ // Send the first input chunk and verify that decoder will be created.

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ EXPECT_TRUE(GetMediaCodecBridge(false));

}

TEST_F(MediaSourcePlayerTest, StartVideoCodecWithInvalidSurface) {

@@ -848,7 +865,7 @@ TEST_F(MediaSourcePlayerTest, StartVideoCodecWithInvalidSurface) {

scoped_refptr<gfx::SurfaceTexture> surface_texture(

gfx::SurfaceTexture::Create(0));

gfx::ScopedJavaSurface surface(surface_texture.get());

- StartVideoDecoderJob(false);

+ StartVideoDecoderJob(true);

// Release the surface texture.

surface_texture = NULL;

@@ -856,9 +873,7 @@ TEST_F(MediaSourcePlayerTest, StartVideoCodecWithInvalidSurface) {

// Player should not seek the demuxer on setting initial surface.

EXPECT_EQ(0, demuxer_->num_seek_requests());

- EXPECT_FALSE(GetMediaDecoderJob(false));

- EXPECT_EQ(0, demuxer_->num_data_requests());

+ EXPECT_FALSE(GetMediaCodecBridge(false));

}

TEST_F(MediaSourcePlayerTest, ReadFromDemuxerAfterSeek) {

@@ -874,26 +889,23 @@ TEST_F(MediaSourcePlayerTest, SetSurfaceWhileSeeking) {

// Test SetVideoSurface() will not cause an extra seek while the player is

// waiting for demuxer to indicate seek is done.

- // Player is still waiting for SetVideoSurface(), so no request is sent.

- StartVideoDecoderJob(false); // Verifies no data requested.

+ player_.OnDemuxerConfigsAvailable(CreateVideoDemuxerConfigs(kCodecVP8));

// Initiate a seek. Skip requesting element seek of renderer.

// Instead behave as if the renderer has asked us to seek.

- EXPECT_EQ(0, demuxer_->num_seek_requests());

player_.SeekTo(base::TimeDelta());

EXPECT_EQ(1, demuxer_->num_seek_requests());

CreateNextTextureAndSetVideoSurface();

- EXPECT_FALSE(GetMediaDecoderJob(false));

EXPECT_EQ(1, demuxer_->num_seek_requests());

- // Reconfirm player has not yet requested data.

- EXPECT_EQ(0, demuxer_->num_data_requests());

+ player_.Start();

// Send the seek done notification. The player should start requesting data.

player_.OnDemuxerSeekDone(kNoTimestamp());

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_EQ(1, demuxer_->num_data_requests());

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ EXPECT_TRUE(GetMediaCodecBridge(false));

// Reconfirm exactly 1 seek request has been made of demuxer, and that it

// was not a browser seek request.

@@ -922,7 +934,7 @@ TEST_F(MediaSourcePlayerTest, ChangeMultipleSurfaceWhileDecoding) {

// Wait for the decoder job to finish decoding and be reset pending a browser

// seek.

WaitForVideoDecodeDone();

- player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ player_.OnDemuxerDataAvailable(CreateAbortedAck(false));

// Only one browser seek should have been initiated. No further data request

// should have been processed on |message_loop_| before surface change event

@@ -933,9 +945,12 @@ TEST_F(MediaSourcePlayerTest, ChangeMultipleSurfaceWhileDecoding) {

// Simulate browser seek is done and confirm player requests more data for new

// video decoder job.

player_.OnDemuxerSeekDone(player_.GetCurrentTime());

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_EQ(3, demuxer_->num_data_requests());

EXPECT_EQ(1, demuxer_->num_seek_requests());

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ EXPECT_TRUE(GetMediaCodecBridge(false));

}

TEST_F(MediaSourcePlayerTest, SetEmptySurfaceAndStarveWhileDecoding) {

@@ -956,7 +971,7 @@ TEST_F(MediaSourcePlayerTest, SetEmptySurfaceAndStarveWhileDecoding) {

// this case.

TriggerPlayerStarvation();

// Wait for the decoder job to finish decoding and be reset.

- while (GetMediaDecoderJob(false))

+ while (GetMediaDecoderJob(false)->is_decoding())

message_loop_.RunUntilIdle();

// No further seek or data requests should have been received since the

@@ -977,24 +992,24 @@ TEST_F(MediaSourcePlayerTest, ReleaseVideoDecoderResourcesWhileDecoding) {

// not be immediately released.

CreateNextTextureAndSetVideoSurface();

StartVideoDecoderJob(true);

- EXPECT_EQ(1, manager_.num_resources_requested());

+ // No resource is requested since there is no data to decode.

+ EXPECT_EQ(0, manager_.num_resources_requested());

ReleasePlayer();

- // The resources will be immediately released since the decoder is idle.

- EXPECT_EQ(1, manager_.num_resources_released());

+ EXPECT_EQ(0, manager_.num_resources_released());

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

// Recreate the video decoder.

CreateNextTextureAndSetVideoSurface();

player_.Start();

- EXPECT_EQ(1, demuxer_->num_browser_seek_requests());

- player_.OnDemuxerSeekDone(base::TimeDelta());

- EXPECT_EQ(2, manager_.num_resources_requested());

- player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ while (!GetMediaDecoderJob(false)->is_decoding())

+ message_loop_.RunUntilIdle();

+ EXPECT_EQ(0, demuxer_->num_browser_seek_requests());

+ EXPECT_EQ(1, manager_.num_resources_requested());

ReleasePlayer();

// The resource is still held by the video decoder until it finishes decoding.

- EXPECT_EQ(1, manager_.num_resources_released());

+ EXPECT_EQ(0, manager_.num_resources_released());

// Wait for the decoder job to finish decoding and be reset.

- while (manager_.num_resources_released() != 2)

+ while (manager_.num_resources_released() != 1)

message_loop_.RunUntilIdle();

}

@@ -1004,7 +1019,6 @@ TEST_F(MediaSourcePlayerTest, AudioOnlyStartAfterSeekFinish) {

// Test audio decoder job will not start until pending seek event is handled.

DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis);

player_.OnDemuxerConfigsAvailable(configs);

- EXPECT_FALSE(GetMediaDecoderJob(true));

// Initiate a seek. Skip requesting element seek of renderer.

// Instead behave as if the renderer has asked us to seek.

@@ -1012,16 +1026,19 @@ TEST_F(MediaSourcePlayerTest, AudioOnlyStartAfterSeekFinish) {

EXPECT_EQ(1, demuxer_->num_seek_requests());

player_.Start();

- EXPECT_FALSE(GetMediaDecoderJob(true));

EXPECT_EQ(0, demuxer_->num_data_requests());

// Sending back the seek done notification.

player_.OnDemuxerSeekDone(kNoTimestamp());

- EXPECT_TRUE(GetMediaDecoderJob(true));

+ EXPECT_FALSE(GetMediaCodecBridge(true));

EXPECT_EQ(1, demuxer_->num_data_requests());

// Reconfirm exactly 1 seek request has been made of demuxer.

EXPECT_EQ(1, demuxer_->num_seek_requests());

+ // Decoder is created after data is received.

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(0));

+ EXPECT_TRUE(GetMediaCodecBridge(true));

}

TEST_F(MediaSourcePlayerTest, VideoOnlyStartAfterSeekFinish) {

@@ -1029,9 +1046,8 @@ TEST_F(MediaSourcePlayerTest, VideoOnlyStartAfterSeekFinish) {

// Test video decoder job will not start until pending seek event is handled.

CreateNextTextureAndSetVideoSurface();

- DemuxerConfigs configs = CreateVideoDemuxerConfigs();

+ DemuxerConfigs configs = CreateVideoDemuxerConfigs(kCodecVP8);

player_.OnDemuxerConfigsAvailable(configs);

- EXPECT_FALSE(GetMediaDecoderJob(false));

// Initiate a seek. Skip requesting element seek of renderer.

// Instead behave as if the renderer has asked us to seek.

@@ -1039,16 +1055,19 @@ TEST_F(MediaSourcePlayerTest, VideoOnlyStartAfterSeekFinish) {

EXPECT_EQ(1, demuxer_->num_seek_requests());

player_.Start();

- EXPECT_FALSE(GetMediaDecoderJob(false));

EXPECT_EQ(0, demuxer_->num_data_requests());

// Sending back the seek done notification.

player_.OnDemuxerSeekDone(kNoTimestamp());

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_EQ(1, demuxer_->num_data_requests());

// Reconfirm exactly 1 seek request has been made of demuxer.

EXPECT_EQ(1, demuxer_->num_seek_requests());

+ // Decoder is created after data is received.

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ EXPECT_TRUE(GetMediaCodecBridge(false));

}

TEST_F(MediaSourcePlayerTest, StartImmediatelyAfterPause) {

@@ -1080,7 +1099,7 @@ TEST_F(MediaSourcePlayerTest, StartImmediatelyAfterPause) {

message_loop_.RunUntilIdle();

// The decoder job should finish and wait for data.

EXPECT_EQ(2, demuxer_->num_data_requests());

- EXPECT_TRUE(GetMediaDecoderJob(true)->is_requesting_demuxer_data());

+ EXPECT_TRUE(IsRequestingDemuxerData(true));

}

TEST_F(MediaSourcePlayerTest, DecoderJobsCannotStartWithoutAudio) {

@@ -1124,15 +1143,12 @@ TEST_F(MediaSourcePlayerTest, StartTimeTicksResetAfterDecoderUnderruns) {

// Let the decoder starve.

TriggerPlayerStarvation();

WaitForAudioDecodeDone();

- // Verify the start time ticks is cleared at this point because the

- // player is prefetching.

- EXPECT_TRUE(StartTimeTicks() == base::TimeTicks());

+ EXPECT_TRUE(StartTimeTicks() == previous);

// Send new data to the decoder so it can finish prefetching. This should

// reset the start time ticks.

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(3));

- EXPECT_TRUE(StartTimeTicks() != base::TimeTicks());

+ EXPECT_TRUE(StartTimeTicks() != previous);

base::TimeTicks current = StartTimeTicks();

EXPECT_LE(0, (current - previous).InMillisecondsF());

@@ -1199,15 +1215,12 @@ TEST_F(MediaSourcePlayerTest, AV_PlaybackCompletionAcrossConfigChange) {

Start(CreateAudioVideoDemuxerConfigs(), true);

player_.OnDemuxerDataAvailable(CreateEOSAck(true)); // Audio EOS

- EXPECT_EQ(0, demuxer_->num_config_requests());

+ DemuxerConfigs configs = CreateVideoDemuxerConfigs(kCodecVP9);

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckWithConfigChanged(

- false, 0)); // Video |kConfigChanged| as first unit.

+ false, 0, configs)); // Video |kConfigChanged| as first unit.

WaitForAudioVideoDecodeDone();

- EXPECT_EQ(1, demuxer_->num_config_requests());

- EXPECT_EQ(2, demuxer_->num_data_requests());

- player_.OnDemuxerConfigsAvailable(CreateAudioVideoDemuxerConfigs());

EXPECT_EQ(3, demuxer_->num_data_requests());

// At no time after completing audio EOS decode, above, should the

@@ -1227,17 +1240,12 @@ TEST_F(MediaSourcePlayerTest, VA_PlaybackCompletionAcrossConfigChange) {

Start(CreateAudioVideoDemuxerConfigs(), true);

player_.OnDemuxerDataAvailable(CreateEOSAck(false)); // Video EOS

- EXPECT_EQ(0, demuxer_->num_config_requests());

+ // Audio |kConfigChanged| as first unit.

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckWithConfigChanged(

- true, 0)); // Audio |kConfigChanged| as first unit.

+ true, 0, CreateAudioDemuxerConfigs(kCodecVorbis)));

WaitForAudioVideoDecodeDone();

- // TODO(wolenetz/qinmin): Prevent redundant demuxer config request and change

- // expectation to 1 here. See http://crbug.com/325528.

- EXPECT_EQ(2, demuxer_->num_config_requests());

- EXPECT_EQ(2, demuxer_->num_data_requests());

- player_.OnDemuxerConfigsAvailable(CreateAudioVideoDemuxerConfigs());

EXPECT_EQ(3, demuxer_->num_data_requests());

// At no time after completing video EOS decode, above, should the

@@ -1406,7 +1414,6 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_RegularSeekPendsBrowserSeekDone) {

// Simulate renderer requesting a regular seek while browser seek in progress.

player_.SeekTo(base::TimeDelta());

- EXPECT_FALSE(GetMediaDecoderJob(false));

// Simulate browser seek is done. Confirm player requests the regular seek,

// still has no video decoder job configured, and has not requested any

@@ -1414,16 +1421,17 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_RegularSeekPendsBrowserSeekDone) {

// BrowserSeekPlayer().

EXPECT_EQ(1, demuxer_->num_seek_requests());

player_.OnDemuxerSeekDone(base::TimeDelta());

- EXPECT_FALSE(GetMediaDecoderJob(false));

EXPECT_EQ(2, demuxer_->num_seek_requests());

EXPECT_EQ(1, demuxer_->num_browser_seek_requests());

// Simulate regular seek is done and confirm player requests more data for

// new video decoder job.

player_.OnDemuxerSeekDone(kNoTimestamp());

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_EQ(3, demuxer_->num_data_requests());

EXPECT_EQ(2, demuxer_->num_seek_requests());

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ EXPECT_TRUE(GetMediaCodecBridge(false));

}

TEST_F(MediaSourcePlayerTest, BrowserSeek_InitialReleaseAndStart) {

@@ -1440,15 +1448,14 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_InitialReleaseAndStart) {

player_.Start();

- // The new player won't be created until the pending data request is

- // processed.

+ // No data request is issued since there is still one pending.

EXPECT_EQ(1, demuxer_->num_data_requests());

- EXPECT_FALSE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

- // A browser seek should be requested.

+ // No browser seek is needed.

player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

- EXPECT_EQ(1, demuxer_->num_browser_seek_requests());

- EXPECT_EQ(1, demuxer_->num_data_requests());

+ EXPECT_EQ(0, demuxer_->num_browser_seek_requests());

+ EXPECT_EQ(2, demuxer_->num_data_requests());

}

TEST_F(MediaSourcePlayerTest, BrowserSeek_MidStreamReleaseAndStart) {

@@ -1460,8 +1467,7 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_MidStreamReleaseAndStart) {

// Simulate browser seek is done and confirm player requests more data.

player_.OnDemuxerSeekDone(base::TimeDelta());

- EXPECT_TRUE(GetMediaDecoderJob(false));

- EXPECT_EQ(2, demuxer_->num_data_requests());

+ EXPECT_EQ(3, demuxer_->num_data_requests());

EXPECT_EQ(1, demuxer_->num_seek_requests());

}

@@ -1559,10 +1565,9 @@ TEST_F(MediaSourcePlayerTest, PrerollContinuesAcrossReleaseAndStart) {

// seen by decoder, this assumption allows preroll continuation

// verification and prevents multiple in-flight data requests.

ReleasePlayer();

- player_.OnDemuxerDataAvailable(data);

- WaitForAudioDecodeDone();

- EXPECT_FALSE(GetMediaDecoderJob(true));

- StartAudioDecoderJob(true);

+ // The decoder is still decoding and will not be immediately released.

+ EXPECT_TRUE(GetMediaCodecBridge(true));

+ StartAudioDecoderJob(false);

} else {

player_.OnDemuxerDataAvailable(data);

EXPECT_TRUE(GetMediaDecoderJob(true)->is_decoding());

@@ -1588,16 +1593,14 @@ TEST_F(MediaSourcePlayerTest, PrerollContinuesAcrossConfigChange) {

EXPECT_TRUE(IsPrerolling(true));

EXPECT_EQ(100.0, GetPrerollTimestamp().InMillisecondsF());

+ DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis);

+ configs.audio_sampling_rate = 11025;

// In response to data request, simulate that demuxer signals config change by

- // sending an AU with |kConfigChanged|. Player should prepare to reconfigure

- // the audio decoder job, and should request new demuxer configs.

- DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(true, 0);

- EXPECT_EQ(0, demuxer_->num_config_requests());

+ // sending an AU with |kConfigChanged|.

+ DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(

+ true, 0, configs);

player_.OnDemuxerDataAvailable(data);

- EXPECT_EQ(1, demuxer_->num_config_requests());

- // Simulate arrival of new configs.

- player_.OnDemuxerConfigsAvailable(CreateAudioDemuxerConfigs(kCodecVorbis));

PrerollDecoderToTime(

true, base::TimeDelta(), base::TimeDelta::FromMilliseconds(100));

@@ -1611,34 +1614,29 @@ TEST_F(MediaSourcePlayerTest, SimultaneousAudioVideoConfigChange) {

// audio and video jobs is |kConfigChanged|.

CreateNextTextureAndSetVideoSurface();

Start(CreateAudioVideoDemuxerConfigs(), true);

- MediaDecoderJob* first_audio_job = GetMediaDecoderJob(true);

- MediaDecoderJob* first_video_job = GetMediaDecoderJob(false);

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(0));

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ EXPECT_TRUE(GetMediaCodecBridge(true));

+ EXPECT_TRUE(GetMediaCodecBridge(false));

+ WaitForAudioVideoDecodeDone();

// Simulate audio |kConfigChanged| prefetched as standalone access unit.

+ DemuxerConfigs audio_configs = CreateAudioDemuxerConfigs(kCodecVorbis);

+ audio_configs.audio_sampling_rate = 11025;

player_.OnDemuxerDataAvailable(

- CreateReadFromDemuxerAckWithConfigChanged(true, 0));

- EXPECT_EQ(0, demuxer_->num_config_requests()); // No OnPrefetchDone() yet.

+ CreateReadFromDemuxerAckWithConfigChanged(true, 0, audio_configs));

// Simulate video |kConfigChanged| prefetched as standalone access unit.

player_.OnDemuxerDataAvailable(

- CreateReadFromDemuxerAckWithConfigChanged(false, 0));

- EXPECT_EQ(1, demuxer_->num_config_requests()); // OnPrefetchDone() occurred.

- EXPECT_EQ(2, demuxer_->num_data_requests()); // No more data requested yet.

- // No job re-creation should occur until the requested configs arrive.

- EXPECT_EQ(first_audio_job, GetMediaDecoderJob(true));

- EXPECT_EQ(first_video_job, GetMediaDecoderJob(false));

- player_.OnDemuxerConfigsAvailable(CreateAudioVideoDemuxerConfigs());

- EXPECT_EQ(4, demuxer_->num_data_requests());

- MediaDecoderJob* second_audio_job = GetMediaDecoderJob(true);

- MediaDecoderJob* second_video_job = GetMediaDecoderJob(false);

- EXPECT_NE(first_audio_job, second_audio_job);

- EXPECT_NE(first_video_job, second_video_job);

- EXPECT_TRUE(second_audio_job && second_video_job);

- // Confirm no further demuxer configs requested.

- EXPECT_EQ(1, demuxer_->num_config_requests());

+ CreateReadFromDemuxerAckWithConfigChanged(

+ false, 0, CreateVideoDemuxerConfigs(kCodecVP9)));

+ EXPECT_EQ(6, demuxer_->num_data_requests());

+ EXPECT_TRUE(IsDrainingDecoder(true));

+ EXPECT_TRUE(IsDrainingDecoder(false));

+ // Waiting for decoder to finish draining.

+ while(IsDrainingDecoder(true) || IsDrainingDecoder(false))

wolenetz 2014/04/25 23:13:13 lint nit: Missing space before ( in while(

qinmin 2014/04/26 01:30:11 Done.

+ message_loop_.RunUntilIdle();

}

TEST_F(MediaSourcePlayerTest, DemuxerConfigRequestedIfInPrefetchUnit0) {

@@ -1691,7 +1689,8 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_PrerollAfterBrowserSeek) {

// Simulate browser seek is done, but to a later time than was requested.

EXPECT_LT(player_.GetCurrentTime().InMillisecondsF(), 100);

player_.OnDemuxerSeekDone(base::TimeDelta::FromMilliseconds(100));

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ // Because next AU is not I-frame, MediaCodecBridge will not be recreated.

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_EQ(100.0, player_.GetCurrentTime().InMillisecondsF());

EXPECT_EQ(100.0, GetPrerollTimestamp().InMillisecondsF());

EXPECT_EQ(3, demuxer_->num_data_requests());

@@ -1707,87 +1706,71 @@ TEST_F(MediaSourcePlayerTest, VideoDemuxerConfigChange) {

// configuration, and that a video decoder job results without any browser

// seek necessary once the new demuxer config arrives.

StartConfigChange(false, true, 1);

- MediaDecoderJob* first_job = GetMediaDecoderJob(false);

- EXPECT_TRUE(first_job);

- EXPECT_EQ(1, demuxer_->num_data_requests());

- EXPECT_EQ(1, demuxer_->num_config_requests());

- // Simulate arrival of new configs.

- player_.OnDemuxerConfigsAvailable(CreateVideoDemuxerConfigs());

// New video decoder job should have been created and configured, without any

// browser seek.

- MediaDecoderJob* second_job = GetMediaDecoderJob(false);

- EXPECT_TRUE(second_job);

- EXPECT_NE(first_job, second_job);

- EXPECT_EQ(2, demuxer_->num_data_requests());

- EXPECT_EQ(1, demuxer_->num_config_requests());

+ EXPECT_TRUE(GetMediaCodecBridge(false));

+ EXPECT_EQ(3, demuxer_->num_data_requests());

EXPECT_EQ(0, demuxer_->num_seek_requests());

}

-TEST_F(MediaSourcePlayerTest, VideoConfigChangeContinuesAcrossSeek) {

+TEST_F(MediaSourcePlayerTest, DecoderDrainInterruptedBySeek) {

SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();

- // Test if a demuxer config request is pending (due to previously receiving

- // |kConfigChanged|), and a seek request arrives prior to demuxer configs,

- // then seek is processed first, followed by the decoder config change.

- // This assumes the demuxer sends |kConfigChanged| read response prior to

- // canceling any reads pending seek; no |kAborted| is involved in this test.

- StartConfigChange(false, false, 1);

- MediaDecoderJob* first_job = GetMediaDecoderJob(false);

- EXPECT_TRUE(first_job);

- EXPECT_EQ(1, demuxer_->num_config_requests());

- EXPECT_EQ(2, demuxer_->num_data_requests());

- EXPECT_EQ(0, demuxer_->num_seek_requests());

+ // Test if a decoder is being drained while receiving a seek request, draining

+ // is canceled.

+ SendConfigChangeToDecoder(true, false, 0);

+ EXPECT_TRUE(IsDrainingDecoder(true));

player_.SeekTo(base::TimeDelta::FromMilliseconds(100));

+ WaitForAudioDecodeDone();

+ player_.OnDemuxerSeekDone(kNoTimestamp());

- // Verify that the seek is requested immediately.

EXPECT_EQ(1, demuxer_->num_seek_requests());

+ EXPECT_EQ(4, demuxer_->num_data_requests());

+ EXPECT_FALSE(IsDrainingDecoder(true));

- // Simulate unlikely delayed arrival of the demuxer configs, completing the

- // config change.

- // TODO(wolenetz): Is it even possible for requested demuxer configs to be

- // delayed until after a SeekTo request arrives?

- player_.OnDemuxerConfigsAvailable(CreateVideoDemuxerConfigs());

+TEST_F(MediaSourcePlayerTest, DecoderDrainInterruptedByRelease) {

+ SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();

- MediaDecoderJob* second_job = GetMediaDecoderJob(false);

- EXPECT_NE(first_job, second_job);

- EXPECT_TRUE(second_job);

+ // Test if a decoder is being drained while receiving a release request,

+ // draining is canceled.

+ SendConfigChangeToDecoder(true, false, 0);

+ EXPECT_TRUE(IsDrainingDecoder(true));

- // Send back the seek done notification. This should finish the seek and

- // trigger the player to request more data.

- EXPECT_EQ(2, demuxer_->num_data_requests());

- player_.OnDemuxerSeekDone(kNoTimestamp());

+ ReleasePlayer();

+ WaitForAudioDecodeDone();

+ EXPECT_EQ(3, demuxer_->num_data_requests());

+ EXPECT_FALSE(IsDrainingDecoder(true));

+ EXPECT_FALSE(GetMediaCodecBridge(true));

+ EXPECT_FALSE(player_.IsPlaying());

+ player_.Start();

+ EXPECT_TRUE(player_.IsPlaying());

EXPECT_EQ(3, demuxer_->num_data_requests());

}

-TEST_F(MediaSourcePlayerTest, NewSurfaceWhileChangingConfigs) {

+TEST_F(MediaSourcePlayerTest, DecoderDrainInterruptedBySurfaceChange) {

SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();

- // Test that no seek or duplicated demuxer config request results from a

- // SetVideoSurface() that occurs while the player is expecting new demuxer

- // configs. This test may be good to keep beyond browser seek hack.

- StartConfigChange(false, false, 1);

- MediaDecoderJob* first_job = GetMediaDecoderJob(false);

- EXPECT_TRUE(first_job);

- EXPECT_EQ(1, demuxer_->num_config_requests());

- EXPECT_EQ(2, demuxer_->num_data_requests());

+ // Test if a video decoder is being drained while surface changes, draining

+ // is canceled.

+ SendConfigChangeToDecoder(false, false, 0);

+ EXPECT_TRUE(IsDrainingDecoder(false));

CreateNextTextureAndSetVideoSurface();

+ WaitForVideoDecodeDone();

- // Surface change processing (including decoder job re-creation) should

- // not occur until the pending video config change is completed.

- EXPECT_EQ(first_job, GetMediaDecoderJob(false));

- player_.OnDemuxerConfigsAvailable(CreateVideoDemuxerConfigs());

- MediaDecoderJob* second_job = GetMediaDecoderJob(false);

- EXPECT_NE(first_job, second_job);

- EXPECT_TRUE(second_job);

+ EXPECT_FALSE(IsDrainingDecoder(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

+ EXPECT_TRUE(player_.IsPlaying());

EXPECT_EQ(3, demuxer_->num_data_requests());

- EXPECT_EQ(1, demuxer_->num_config_requests());

- EXPECT_EQ(0, demuxer_->num_seek_requests());

+ // Finish the browser seek introduced by surface change.

+ player_.OnDemuxerSeekDone(base::TimeDelta());

+ EXPECT_EQ(4, demuxer_->num_data_requests());

}

TEST_F(MediaSourcePlayerTest,

@@ -1811,7 +1794,9 @@ TEST_F(MediaSourcePlayerTest,

player_.OnDemuxerDataAvailable(data);

EXPECT_EQ(1, demuxer_->num_browser_seek_requests());

player_.OnDemuxerSeekDone(base::TimeDelta());

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ // After seek is done, prefetch is handled first. MediaCodecBridge is not

+ // created at this moment.

+ EXPECT_FALSE(GetMediaCodecBridge(false));

// A new data request should be sent.

EXPECT_EQ(3, demuxer_->num_data_requests());

@@ -1836,7 +1821,8 @@ TEST_F(MediaSourcePlayerTest, ReleaseWithOnPrefetchDoneAlreadyPosted) {

// triggered by starvation to simulate decoder underrun, can trivially

// post task to run OnPrefetchDone().

player_.OnDemuxerDataAvailable(

- CreateReadFromDemuxerAckWithConfigChanged(true, 4));

+ CreateReadFromDemuxerAckWithConfigChanged(

+ true, 4, CreateAudioDemuxerConfigs(kCodecVorbis)));

EXPECT_TRUE(GetMediaDecoderJob(true)->is_decoding());

// Simulate decoder underrun, so trivial prefetch starts while still decoding.

@@ -1850,11 +1836,12 @@ TEST_F(MediaSourcePlayerTest, ReleaseWithOnPrefetchDoneAlreadyPosted) {

OnNextTestDecodeCallbackPostTaskToReleasePlayer();

WaitForAudioDecodeDone();

- EXPECT_TRUE(decoder_callback_hook_executed_);

- EXPECT_EQ(2, demuxer_->num_data_requests());

- // Player should have no decoder job until after Start().

- StartAudioDecoderJob(true);

+ EXPECT_EQ(3, demuxer_->num_data_requests());

+ // Player should not request any new data since the access units haven't

+ // been fully decoded yet.

+ StartAudioDecoderJob(false);

}

TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenDemuxerSeekAndDone) {

@@ -1867,11 +1854,13 @@ TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenDemuxerSeekAndDone) {

StartAudioDecoderJobAndSeekToWhileDecoding(

base::TimeDelta::FromMilliseconds(100));

ReleasePlayer();

+ EXPECT_EQ(0, demuxer_->num_seek_requests());

+ WaitForAudioDecodeDone();

EXPECT_EQ(1, demuxer_->num_seek_requests());

player_.OnDemuxerSeekDone(kNoTimestamp());

EXPECT_EQ(100.0, GetPrerollTimestamp().InMillisecondsF());

- EXPECT_FALSE(GetMediaDecoderJob(true));

+ EXPECT_FALSE(GetMediaCodecBridge(true));

EXPECT_FALSE(player_.IsPlaying());

// Player should begin prefetch and resume preroll upon Start().

@@ -1895,13 +1884,15 @@ TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenDemuxerSeekThenStart) {

StartAudioDecoderJobAndSeekToWhileDecoding(

base::TimeDelta::FromMilliseconds(100));

ReleasePlayer();

- EXPECT_EQ(1, demuxer_->num_seek_requests());

+ EXPECT_EQ(0, demuxer_->num_seek_requests());

// Player should not prefetch upon Start() nor create the decoder job, due to

// awaiting DemuxerSeekDone.

EXPECT_EQ(2, demuxer_->num_data_requests());

StartAudioDecoderJob(false);

+ WaitForAudioDecodeDone();

+ EXPECT_EQ(1, demuxer_->num_seek_requests());

player_.OnDemuxerSeekDone(kNoTimestamp());

EXPECT_TRUE(GetMediaDecoderJob(true));

EXPECT_TRUE(IsPrerolling(true));

@@ -1926,7 +1917,7 @@ TEST_F(MediaSourcePlayerTest, SeekToThenDemuxerSeekThenReleaseThenSeekDone) {

ReleasePlayer();

player_.OnDemuxerSeekDone(kNoTimestamp());

EXPECT_FALSE(player_.IsPlaying());

- EXPECT_FALSE(GetMediaDecoderJob(true));

+ EXPECT_FALSE(GetMediaCodecBridge(true));

EXPECT_EQ(100.0, GetPrerollTimestamp().InMillisecondsF());

// Player should begin prefetch and resume preroll upon Start().

@@ -1956,7 +1947,7 @@ TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenStart) {

StartAudioDecoderJob(false);

player_.OnDemuxerSeekDone(kNoTimestamp());

- EXPECT_TRUE(GetMediaDecoderJob(true));

+ EXPECT_FALSE(GetMediaCodecBridge(true));

EXPECT_TRUE(IsPrerolling(true));

EXPECT_EQ(100.0, GetPrerollTimestamp().InMillisecondsF());

EXPECT_EQ(3, demuxer_->num_data_requests());

@@ -1968,26 +1959,27 @@ TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenStart) {

TEST_F(MediaSourcePlayerTest, ConfigChangedThenReleaseThenConfigsAvailable) {

SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();

- // Test if Release() occurs after |kConfigChanged| detected, new configs

- // requested of demuxer, and the requested configs arrive before the next

- // Start(), then the player completes the pending config change processing on

- // their receipt.

+ // Test if Release() occurs after |kConfigChanged| is processed, new data

+ // requested of demuxer, and the requested data arrive before the next

+ // Start(), then the player starts to decode the new data without any browser

+ // seek.

StartConfigChange(true, true, 0);

ReleasePlayer();

- player_.OnDemuxerConfigsAvailable(CreateAudioDemuxerConfigs(kCodecVorbis));

- EXPECT_FALSE(GetMediaDecoderJob(true));

+ EXPECT_TRUE(GetMediaCodecBridge(true));

EXPECT_FALSE(player_.IsPlaying());

- EXPECT_EQ(1, demuxer_->num_data_requests());

+ EXPECT_EQ(3, demuxer_->num_data_requests());

+ player_.OnDemuxerDataAvailable(

+ CreateReadFromDemuxerAckWithConfigChanged(

+ true, 4, CreateAudioDemuxerConfigs(kCodecVorbis)));

+ WaitForAudioDecodeDone();

+ EXPECT_FALSE(GetMediaCodecBridge(true));

// Player should resume upon Start(), even without further configs supplied.

player_.Start();

- EXPECT_TRUE(GetMediaDecoderJob(true));

EXPECT_TRUE(player_.IsPlaying());

- EXPECT_EQ(2, demuxer_->num_data_requests());

- // No further config request should have occurred since StartConfigChange().

- EXPECT_EQ(1, demuxer_->num_config_requests());

+ EXPECT_EQ(3, demuxer_->num_data_requests());

+ EXPECT_EQ(0, demuxer_->num_seek_requests());

}

TEST_F(MediaSourcePlayerTest, ConfigChangedThenReleaseThenStart) {

@@ -2001,15 +1993,15 @@ TEST_F(MediaSourcePlayerTest, ConfigChangedThenReleaseThenStart) {

player_.Start();

EXPECT_TRUE(player_.IsPlaying());

- EXPECT_FALSE(GetMediaDecoderJob(true));

- EXPECT_EQ(1, demuxer_->num_data_requests());

- player_.OnDemuxerConfigsAvailable(CreateAudioDemuxerConfigs(kCodecVorbis));

- EXPECT_TRUE(GetMediaDecoderJob(true));

- EXPECT_EQ(2, demuxer_->num_data_requests());

+ // The previous MediaCodecBridge still haven't finished decoding the data

+ // yet.

+ EXPECT_TRUE(GetMediaCodecBridge(true));

+ EXPECT_EQ(3, demuxer_->num_data_requests());

- // No further config request should have occurred since StartConfigChange().

- EXPECT_EQ(1, demuxer_->num_config_requests());

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(0));

+ EXPECT_EQ(3, demuxer_->num_data_requests());

+ WaitForAudioDecodeDone();

+ EXPECT_FALSE(GetMediaCodecBridge(true));

}

TEST_F(MediaSourcePlayerTest, BrowserSeek_ThenReleaseThenDemuxerSeekDone) {

@@ -2025,7 +2017,7 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_ThenReleaseThenDemuxerSeekDone) {

player_.OnDemuxerSeekDone(expected_preroll_timestamp);

EXPECT_FALSE(player_.IsPlaying());

- EXPECT_FALSE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_EQ(expected_preroll_timestamp, GetPrerollTimestamp());

// Player should begin prefetch and resume preroll upon Start().

@@ -2057,7 +2049,8 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_ThenReleaseThenStart) {

StartVideoDecoderJob(false);

player_.OnDemuxerSeekDone(expected_preroll_timestamp);

- EXPECT_TRUE(GetMediaDecoderJob(false));

+ // Prefetch takes place first, and the decoder is not created yet.

+ EXPECT_FALSE(GetMediaCodecBridge(false));

EXPECT_TRUE(IsPrerolling(false));

EXPECT_EQ(expected_preroll_timestamp, GetPrerollTimestamp());

EXPECT_EQ(expected_preroll_timestamp, player_.GetCurrentTime());

@@ -2065,6 +2058,11 @@ TEST_F(MediaSourcePlayerTest, BrowserSeek_ThenReleaseThenStart) {

// No further seek should have been requested since BrowserSeekPlayer().

EXPECT_EQ(1, demuxer_->num_seek_requests());

+ // Decoder will be created once data is received.

+ player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForVideo());

+ while (!GetMediaCodecBridge(false))

+ message_loop_.RunUntilIdle();

}

// TODO(xhwang): Once we add tests to cover DrmBridge, update this test to

@@ -2078,13 +2076,12 @@ TEST_F(MediaSourcePlayerTest, SurfaceChangeClearedEvenIfMediaCryptoAbsent) {

// Test that |SURFACE_CHANGE_EVENT_PENDING| is not pending after

// SetVideoSurface() for a player configured for encrypted video, when the

// player has not yet received media crypto.

- DemuxerConfigs configs = CreateVideoDemuxerConfigs();

+ DemuxerConfigs configs = CreateVideoDemuxerConfigs(kCodecVP8);

configs.is_video_encrypted = true;

player_.OnDemuxerConfigsAvailable(configs);

CreateNextTextureAndSetVideoSurface();

- EXPECT_FALSE(IsPendingSurfaceChange());

- EXPECT_FALSE(GetMediaDecoderJob(false));

+ EXPECT_FALSE(GetMediaCodecBridge(false));

}

TEST_F(MediaSourcePlayerTest, CurrentTimeUpdatedWhileDecoderStarved) {

@@ -2113,12 +2110,12 @@ TEST_F(MediaSourcePlayerTest, CurrentTimeKeepsIncreasingAfterConfigChange) {

DecodeAudioDataUntilOutputBecomesAvailable();

- DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(true, 0);

+ DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis);

+ configs.audio_sampling_rate = 11025;

+ DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(

+ true, 0, configs);

player_.OnDemuxerDataAvailable(data);

WaitForAudioDecodeDone();

- // Simulate arrival of new configs.

- player_.OnDemuxerConfigsAvailable(CreateAudioDemuxerConfigs(kCodecVorbis));

DecodeAudioDataUntilOutputBecomesAvailable();

}

« media/base/android/demuxer_stream_player_params.h ('K') | « media/base/android/media_source_player.cc ('k') | media/base/android/video_decoder_job.h » ('j') | no next file with comments »