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

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 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/crypto/decryptor_client.h ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 3c4d39a4a7ee90639c189d2d85be5a4ee4b9d09f..f4937920fe9ce12f79b0b0e6648049ad8a0e5064 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -10,7 +10,6 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "media/base/video_decoder.h"
-#include "media/crypto/aes_decryptor.h"
class MessageLoop;
@@ -20,6 +19,7 @@ struct AVFrame;
namespace media {
class DecoderBuffer;
+class Decryptor;
class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
public:
@@ -36,7 +36,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
// Must be called prior to initialization if decrypted buffers will be
// encountered.
- void set_decryptor(AesDecryptor* decryptor);
+ void set_decryptor(Decryptor* decryptor);
protected:
virtual ~FFmpegVideoDecoder();
@@ -102,7 +102,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
// Pointer to the demuxer stream that will feed us compressed buffers.
scoped_refptr<DemuxerStream> demuxer_stream_;
- AesDecryptor* decryptor_;
+ Decryptor* decryptor_;
DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
};
« no previous file with comments | « media/crypto/decryptor_client.h ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698