Add FFmpeg audio decoder for the clear key CDM.

webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc

 // 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.
 
 #include "webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
-#include "media/ffmpeg/ffmpeg_common.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>
 MSVC_POP_WARNING();
 }  // extern "C"
 
@@ skipping 96 matching lines @@
   if (!IsValidOutputConfig(config.format, config.coded_size)) {
     LOG(ERROR) << "Initialize(): invalid video decoder configuration.";
     return false;
   }
 
   if (is_initialized_) {
     LOG(ERROR) << "Initialize(): Already initialized.";
     return false;
   }
 
-  av_register_all();
-
-  // Release existing resources if necessary.
-  ReleaseFFmpegResources();

[ddorwin, 2012/10/25 01:34:17]

Do we not need this anymore? I don't see it being called.

[Tom Finegan, 2012/10/25 04:58:37]

It's called in ~FFmpegCdmVideoDecoder() and Deinitialize(), and is_initialized_
prevents it from being necessary to call it here.

-
   // Initialize AVCodecContext structure.
   codec_context_ = avcodec_alloc_context3(NULL);
   CdmVideoDecoderConfigToAVCodecContext(config, codec_context_);
 
   // Enable motion vector search (potentially slow), strong deblocking filter
   // for damaged macroblocks, and set our error detection sensitivity.
   codec_context_->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
   codec_context_->err_recognition = AV_EF_CAREFUL;
   codec_context_->thread_count = kDecodeThreads;
   codec_context_->opaque = this;
@@ skipping 169 matching lines @@
     av_free(codec_context_);
     codec_context_ = NULL;
   }
   if (av_frame_) {
     av_free(av_frame_);
     av_frame_ = NULL;
   }
 }
 
 }  // namespace webkit_media