Add a media pipeline status error code for decryption error.

webkit/media/webmediaplayer_impl.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/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 860 matching lines @@
     case media::DEMUXER_ERROR_COULD_NOT_PARSE:
     case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
     case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
     case media::DECODER_ERROR_NOT_SUPPORTED:
     case media::DATASOURCE_ERROR_URL_NOT_SUPPORTED:
       // Format error.
       SetNetworkState(WebMediaPlayer::NetworkStateFormatError);
       break;
 
     case media::PIPELINE_ERROR_DECODE:
+    case media::PIPELINE_ERROR_DECRYPT:

[ddorwin, 2012/04/20 19:18:50]

WebKit now has a decrypt error. We should add a WebMediaPlayer function to send
it.

[xhwang, 2012/04/20 19:51:01]

Do you mean adding something like NetworkStateDecodeError in WebMediaPlayer? In
that case I'll do it in another CL as it'll depend on a WebKit change. Correct
me if I am wrong (I am really new to WebKit).

[ddorwin, 2012/04/20 22:55:19]

Right. I looked at the WebKit code more and found that we just need to add a new
NetworkStateDecryptError. This will require WebKit changes and minor Chromium
changes. I filed crbug.com/124486.

I suggest breaking this case out, copying the code below, and putting a TODO
that refers to the new bug.

[xhwang, 2012/04/21 00:53:01]

Done.

     case media::PIPELINE_ERROR_ABORT:
     case media::PIPELINE_ERROR_OUT_OF_MEMORY:
     case media::PIPELINE_ERROR_AUDIO_HARDWARE:
     case media::PIPELINE_ERROR_OPERATION_PENDING:
     case media::PIPELINE_ERROR_INVALID_STATE:
       // Decode error.
       SetNetworkState(WebMediaPlayer::NetworkStateDecodeError);
       break;
   }
 
@@ skipping 132 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media