media/base/mock_ffmpeg.h - Issue 7658017: Revert 96974 - Remove mock_ffmpeg and update media unittests.

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/mock_ffmpeg.h

Issue 7658017: Revert 96974 - Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 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:

« no previous file with comments | « media/base/media_win.cc ('k') | media/base/mock_ffmpeg.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #ifndef MEDIA_BASE_MOCK_FFMPEG_H_	5 #ifndef MEDIA_BASE_MOCK_FFMPEG_H_

6 #define MEDIA_BASE_MOCK_FFMPEG_H_	6 #define MEDIA_BASE_MOCK_FFMPEG_H_

7	7

8 // TODO(scherkus): See if we can remove ffmpeg_common from this file.	8 // TODO(scherkus): See if we can remove ffmpeg_common from this file.

9 #include "media/ffmpeg/ffmpeg_common.h"	9 #include "media/ffmpeg/ffmpeg_common.h"

10 #include "testing/gmock/include/gmock/gmock.h"	10 #include "testing/gmock/include/gmock/gmock.h"

(...skipping 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
153 arg0->destruct(arg0);	153 arg0->destruct(arg0);

154 }	154 }

155	155

156 // Decrement number of packets allocated.	156 // Decrement number of packets allocated.

157 MockFFmpeg::get()->dec_outstanding_packets();	157 MockFFmpeg::get()->dec_outstanding_packets();

158 }	158 }

159	159

160 } // namespace media	160 } // namespace media

161	161

162 #endif // MEDIA_BASE_MOCK_FFMPEG_H_	162 #endif // MEDIA_BASE_MOCK_FFMPEG_H_

OLD	NEW