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

Unified Diff: media/filters/ffmpeg_glue.h

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable DecodeFrame_LargerXXX tests to make Valgrind happy. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue.h
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
index a98c50219d1445083f086af4e8637ab4770a7ead..0e91fd3df62d77778c00c214b397b89031283b6b 100644
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -32,15 +32,15 @@
#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"
+struct URLProtocol;
+
namespace media {
class FFmpegURLProtocol {
public:
- FFmpegURLProtocol() {
- }
+ FFmpegURLProtocol() {}
- virtual ~FFmpegURLProtocol() {
- }
+ virtual ~FFmpegURLProtocol() {}
// Read the given amount of bytes into data, returns the number of bytes read
// if successful, kReadError otherwise.
@@ -99,6 +99,9 @@ class FFmpegGlue {
typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;
ProtocolMap protocols_;
+ friend class FFmpegGlueTest;
+ static URLProtocol* url_protocol();
+
DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
};
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698