media: Reland "Simplify {Audio|Video}Decoder initialization callback."

content/renderer/pepper/video_decoder_shim.cc

 // Copyright 2014 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 "content/renderer/pepper/video_decoder_shim.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 615 matching lines @@
  public:
   explicit DecoderImpl(const base::WeakPtr<VideoDecoderShim>& proxy);
   ~DecoderImpl();
 
   void Initialize(media::VideoDecoderConfig config);
   void Decode(uint32_t decode_id, scoped_refptr<media::DecoderBuffer> buffer);
   void Reset();
   void Stop();
 
  private:
-  void OnPipelineStatus(media::PipelineStatus status);
+  void OnInitDone(bool success);
   void DoDecode();
   void OnDecodeComplete(media::VideoDecoder::Status status);
   void OnOutputComplete(const scoped_refptr<media::VideoFrame>& frame);
   void OnResetComplete();
 
   // WeakPtr is bound to main_message_loop_. Use only in shim callbacks.
   base::WeakPtr<VideoDecoderShim> shim_;
   scoped_ptr<media::VideoDecoder> decoder_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   // Queue of decodes waiting for the decoder.
@@ skipping 38 matching lines @@
     ffmpeg_video_decoder->set_decode_nalus(true);
     decoder_ = ffmpeg_video_decoder.Pass();
   }
 
   // VpxVideoDecoder and FFmpegVideoDecoder support only one pending Decode()
   // request.
   DCHECK_EQ(decoder_->GetMaxDecodeRequests(), 1);
 
   decoder_->Initialize(
       config, true /* low_delay */,
-      base::Bind(&VideoDecoderShim::DecoderImpl::OnPipelineStatus,
+      base::Bind(&VideoDecoderShim::DecoderImpl::OnInitDone,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&VideoDecoderShim::DecoderImpl::OnOutputComplete,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void VideoDecoderShim::DecoderImpl::Decode(
     uint32_t decode_id,
     scoped_refptr<media::DecoderBuffer> buffer) {
   DCHECK(decoder_);
   pending_decodes_.push(PendingDecode(decode_id, buffer));
@@ skipping 18 matching lines @@
 void VideoDecoderShim::DecoderImpl::Stop() {
   DCHECK(decoder_);
   // Clear pending decodes now. We don't want OnDecodeComplete to call DoDecode
   // again.
   while (!pending_decodes_.empty())
     pending_decodes_.pop();
   decoder_.reset();
   // This instance is deleted once we exit this scope.
 }
 
-void VideoDecoderShim::DecoderImpl::OnPipelineStatus(
-    media::PipelineStatus status) {
-  int32_t result;
-  switch (status) {
-    case media::PIPELINE_OK:
-      result = PP_OK;
-      break;
-    case media::DECODER_ERROR_NOT_SUPPORTED:
-      result = PP_ERROR_NOTSUPPORTED;
-      break;
-    default:
-      result = PP_ERROR_FAILED;
-      break;
-  }
+void VideoDecoderShim::DecoderImpl::OnInitDone(bool success) {
+  int32_t result = success ? PP_OK : PP_ERROR_NOTSUPPORTED;
 
   // Calculate how many textures the shim should create.
   uint32_t shim_texture_pool_size = media::limits::kMaxVideoFrames + 1;
   main_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VideoDecoderShim::OnInitializeComplete, shim_,
                             result, shim_texture_pool_size));
 }
 
 void VideoDecoderShim::DecoderImpl::DoDecode() {
   if (pending_decodes_.empty() || awaiting_decoder_)
@@ skipping 348 matching lines @@
 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   gles2->DeleteTextures(1, &texture_id);
 }
 
 void VideoDecoderShim::FlushCommandBuffer() {
   context_provider_->ContextGL()->Flush();
 }
 
 }  // namespace content