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

Unified Diff: webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc

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
Index: webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc
diff --git a/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc b/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc
deleted file mode 100644
index 5f2d71dbc6c8245fb00dca91a69e3c694a250919..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
-
-#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-#include "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h"
-#endif
-
-#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
-#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
-#endif
-
-#if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)
-#include "webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
-#endif
-
-namespace webkit_media {
-
-scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
- cdm::Host* host, const cdm::VideoDecoderConfig& config) {
- scoped_ptr<CdmVideoDecoder> video_decoder;
-#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
- video_decoder.reset(new FakeCdmVideoDecoder(host));
-
- if (!video_decoder->Initialize(config))
- video_decoder.reset();
-#else
-
-#if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)
- if (config.codec == cdm::VideoDecoderConfig::kCodecVp8) {
- video_decoder.reset(new LibvpxCdmVideoDecoder(host));
-
- if (!video_decoder->Initialize(config))
- video_decoder.reset();
-
- return video_decoder.Pass();
- }
-#endif
-
-#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
- video_decoder.reset(new FFmpegCdmVideoDecoder(host));
-
- if (!video_decoder->Initialize(config))
- video_decoder.reset();
-#endif
-
-#endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
-
- return video_decoder.Pass();
-}
-
-} // namespace webkit_media
« no previous file with comments | « webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h ('k') | webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698