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

Unified Diff: webkit/renderer/media/crypto/ppapi/libvpx_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
Index: webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
diff --git a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h b/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
deleted file mode 100644
index 59674b6de9f3187bf995525eb1a7d68f0911dbd9..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
+++ /dev/null
@@ -1,55 +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.
-
-#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_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"
-
-struct vpx_codec_ctx;
-struct vpx_image;
-
-namespace webkit_media {
-
-class LibvpxCdmVideoDecoder : public CdmVideoDecoder {
- public:
- explicit LibvpxCdmVideoDecoder(cdm::Host* host);
- virtual ~LibvpxCdmVideoDecoder();
-
- // CdmVideoDecoder implementation.
- virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE;
- virtual void Deinitialize() OVERRIDE;
- virtual void Reset() OVERRIDE;
- virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,
- int32_t compressed_frame_size,
- int64_t timestamp,
- cdm::VideoFrame* decoded_frame) OVERRIDE;
- virtual bool is_initialized() const OVERRIDE { return is_initialized_; }
-
- // Returns true when |format| and |data_size| specify a supported video
- // output configuration.
- static bool IsValidOutputConfig(cdm::VideoFormat format,
- const cdm::Size& data_size);
-
- private:
- // Allocates storage, then copies video frame stored in |vpx_image_| to
- // |cdm_video_frame|. Returns true when allocation and copy succeed.
- bool CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame);
-
- bool is_initialized_;
-
- cdm::Host* const host_;
-
- vpx_codec_ctx* vpx_codec_;
- vpx_image* vpx_image_;
-
- DISALLOW_COPY_AND_ASSIGN(LibvpxCdmVideoDecoder);
-};
-
-} // namespace webkit_media
-
-#endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_

Powered by Google App Engine
This is Rietveld 408576698