Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1187)

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 8418017: Miscellaneous header file cleanup for src/media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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/filters/ffmpeg_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index cd00bd31ece1c2cc70528655a28dc654e697d01c..b7cfcbe9188819a9cb9d28161cc912197e2d9f61 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -7,11 +7,8 @@
#include <deque>
-#include "base/gtest_prod_util.h"
-#include "base/time.h"
#include "media/base/filters.h"
#include "media/base/pts_stream.h"
-#include "media/base/video_frame.h"
#include "media/video/video_decode_engine.h"
scherkus (not reviewing) 2011/10/28 16:45:02 there should be one here for ui/gfx/size.h
Ami GONE FROM CHROMIUM 2011/10/28 16:54:22 So why not add it?
namespace media {
@@ -52,17 +49,6 @@ class MEDIA_EXPORT FFmpegVideoDecoder
scoped_refptr<VideoFrame> frame,
const PipelineStatistics& statistics) OVERRIDE;
- friend class DecoderPrivateMock;
- friend class FFmpegVideoDecoderTest;
- FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest, PtsStream);
- FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest,
- DoDecode_EnqueueVideoFrameError);
- FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest,
- DoDecode_FinishEnqueuesEmptyFrames);
- FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest,
- DoDecode_TestStateTransition);
- FRIEND_TEST_ALL_PREFIXES(FFmpegVideoDecoderTest, DoSeek);
-
enum DecoderState {
kUnInitialized,
kInitializing,

Powered by Google App Engine
This is Rietveld 408576698