Add CDM video decoder.

webkit/media/crypto/decoders/ffmpeg_util.h

Index: webkit/media/crypto/decoders/ffmpeg_util.h
diff --git a/webkit/media/crypto/decoders/ffmpeg_util.h b/webkit/media/crypto/decoders/ffmpeg_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..1bebefb699480623d81ce0a3ac921d91dd310465
--- /dev/null
+++ b/webkit/media/crypto/decoders/ffmpeg_util.h
@@ -0,0 +1,35 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.

[ddorwin, 2012/08/29 17:33:49]

Do we expect a lot of decoders for the clear key CDM? If not, I think this
should just go in ppapi. A separate directory for a few files used for only one
thing seems overkill.

[Tom Finegan, 2012/08/30 17:09:23]

I thought it might be handy to have a decoders subdir for ffmpeg_vorbis_decoder
(if we go with that name), and whatever we end up w/as far as libvpx and
libvorbis. It also seems nice to hide everything ffmpeg related in a subdir. 

I'll move things up a level in a later patch set if you prefer. The above seems
like hand waving now that I reread it. :)

[ddorwin, 2012/09/02 21:39:07]

The decoders are explicitly for the clear key PPAPI CDM and not crypto in
general, so having a subdir in crypto/ does not make sense. If anything, maybe
we should move clearkey to a subdir of ppapi/

We'll use FFmpeg for all codecs, so we should have just one more (audio) set of
files.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_MEDIA_CRYPTO_DECODERS_FFMPEG_UTIL_H_
+#define WEBKIT_MEDIA_CRYPTO_DECODERS_FFMPEG_UTIL_H_
+
+// Used for FFmpeg error codes.
+#include <cerrno>
+
+#include "webkit/media/crypto/ppapi/content_decryption_module.h"
+
+// Include FFmpeg header files.
+extern "C" {
+// Temporarily disable possible loss of data warning.
+MSVC_PUSH_DISABLE_WARNING(4244);
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+#include <libavformat/url.h>
+#include <libavutil/avutil.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/log.h>
+#include <libavutil/imgutils.h>
+MSVC_POP_WARNING();
+}  // extern "C"
+
+namespace webkit_media {
+
+// Converts FFmpeg's pixel formats to its corresponding supported video format.
+cdm::VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format);
+
+}  // namespace webkit_media
+
+#endif  // WEBKIT_MEDIA_CRYPTO_DECODERS_FFMPEG_UTIL_H_