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..faa53771222df08f34377847f1ad36056c4b2d96
--- /dev/null
+++ b/webkit/media/crypto/decoders/ffmpeg_util.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2012 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_MEDIA_CRYPTO_DECODERS_FFMPEG_UTIL_H_
+#define WEBKIT_MEDIA_CRYPTO_DECODERS_FFMPEG_UTIL_H_
+
+// Used for FFmpeg error codes.
+#include <cerrno>
+
+#include "base/compiler_specific.h"
+#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>

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

We don't need all of these here.

+#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::ColorFormat PixelFormatToVideoFormat(PixelFormat pixel_format);

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

Only FFmpegVideoDecoder::GetVideoBuffer() uses this. If no other files will use
it, is there a reason not to move it there?

+
+}  // namespace webkit_media
+
+#endif  // WEBKIT_MEDIA_CRYPTO_DECODERS_FFMPEG_UTIL_H_