media/base/audio_splicer_unittest.cc - Issue 1542013004: Switch to standard integer types in media/, take 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/base/audio_splicer_unittest.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more stddef Created 4 years, 12 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/macros.h"

5 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

6 #include "media/base/audio_buffer.h"	7 #include "media/base/audio_buffer.h"

7 #include "media/base/audio_bus.h"	8 #include "media/base/audio_bus.h"

8 #include "media/base/audio_splicer.h"	9 #include "media/base/audio_splicer.h"

9 #include "media/base/audio_timestamp_helper.h"	10 #include "media/base/audio_timestamp_helper.h"

10 #include "media/base/test_helpers.h"	11 #include "media/base/test_helpers.h"

11 #include "media/base/timestamp_constants.h"	12 #include "media/base/timestamp_constants.h"

12 #include "testing/gtest/include/gtest/gtest.h"	13 #include "testing/gtest/include/gtest/gtest.h"

13	14

14 namespace media {	15 namespace media {

(...skipping 743 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
758 second_buffer->timestamp() + second_buffer->duration();	759 second_buffer->timestamp() + second_buffer->duration();

759 scoped_refptr<AudioBuffer> output = splicer_.GetNextBuffer();	760 scoped_refptr<AudioBuffer> output = splicer_.GetNextBuffer();

760 EXPECT_EQ(second_buffer_end_ts, output->timestamp());	761 EXPECT_EQ(second_buffer_end_ts, output->timestamp());

761 EXPECT_EQ(third_buffer->duration() -	762 EXPECT_EQ(third_buffer->duration() -

762 (second_buffer_end_ts - third_buffer->timestamp()),	763 (second_buffer_end_ts - third_buffer->timestamp()),

763 output->duration());	764 output->duration());

764 EXPECT_TRUE(VerifyData(output, GetValue(third_buffer)));	765 EXPECT_TRUE(VerifyData(output, GetValue(third_buffer)));

765 }	766 }

766	767

767 } // namespace media	768 } // namespace media

OLD	NEW

« no previous file with comments | « media/base/audio_splicer.cc ('k') | media/base/audio_timestamp_helper.h » ('j') | no next file with comments »