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

Unified Diff: media/cdm/ppapi/ffmpeg_cdm_video_decoder.h

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromeos crypto dep explicit. Created 7 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/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc ('k') | media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/ffmpeg_cdm_video_decoder.h
diff --git a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h
similarity index 79%
rename from webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
rename to media/cdm/ppapi/ffmpeg_cdm_video_decoder.h
index 5c4bb2b4e8562228ddcff5a7c3fe3f038fd3e5c5..17e2b5783bd1ab59afcffa69280c567fbf0dcfd2 100644
--- a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
+++ b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
+#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/ppapi/cdm_video_decoder.h"
struct AVCodecContext;
struct AVFrame;
-namespace webkit_media {
+namespace media {
class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
public:
@@ -53,6 +53,6 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);
};
-} // namespace webkit_media
+} // namespace media
-#endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#endif // MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
« no previous file with comments | « media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc ('k') | media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698