media/filters/ffmpeg_audio_decoder_unittest.cc - Issue 10831020: Refactor FFmpegAudioDecoder output timestamp logic.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_audio_decoder_unittest.cc

Issue 10831020: Refactor FFmpegAudioDecoder output timestamp logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Replace round(x) with floor(0.5+x) to make windows happy. Created 8 years, 4 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:

Index: media/filters/ffmpeg_audio_decoder_unittest.cc

diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc

index f3dfaea033203e5bb1762e5d93eaa22409cbdd57..ae5b82c0774e08129e2075db0bd7137be1366c6a 100644

--- a/media/filters/ffmpeg_audio_decoder_unittest.cc

+++ b/media/filters/ffmpeg_audio_decoder_unittest.cc

@@ -68,7 +68,7 @@ class FFmpegAudioDecoderTest : public testing::Test {

void Initialize() {

EXPECT_CALL(*demuxer_, audio_decoder_config())

- .WillOnce(ReturnRef(config_));

+ .WillRepeatedly(ReturnRef(config_));

decoder_->Initialize(demuxer_,

NewExpectedStatusCB(PIPELINE_OK),

@@ -151,13 +151,10 @@ TEST_F(FFmpegAudioDecoderTest, ProduceAudioSamples) {

Read();

- // We should have three decoded audio buffers.

- //

- // TODO(scherkus): timestamps are off by one packet due to decoder delay.

ASSERT_EQ(3u, decoded_audio_.size());

ExpectDecodedAudio(0, 0, 2902);

- ExpectDecodedAudio(1, 0, 13061);

- ExpectDecodedAudio(2, 2902, 23219);

+ ExpectDecodedAudio(1, 2902, 13061);

+ ExpectDecodedAudio(2, 15963, 23220);

// Call one more time to trigger EOS.

Read();