Merge 22125 - Change to WebMediaPlayerImpl incorrectly translated some pipel...

Merge 22125 - Change to WebMediaPlayerImpl incorrectly  translated some pipeline errors.
BUG=16738
TEST=run the media LayoutTests
Review URL: http://codereview.chromium.org/159669

TBR=kylep@chromium.org


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=22828

[kylep, 2009-08-08 00:46:47]

LGTM

On Fri, Aug 7, 2009 at 4:15 PM, <laforge@chromium.org> wrote:

> Reviewers: kylep,
>
> Description:
> Merge 22125 - Change to WebMediaPlayerImpl incorrectly  translated some
> pipeline errors.
> BUG=16738
> TEST=run the media LayoutTests
> Review URL: http://codereview.chromium.org/159669
>
> TBR=kylep@chromium.org
>
>
> Please review this at http://codereview.chromium.org/164206
>
> SVN Base: svn://chrome-svn/chrome/branches/195/src/
>
> Affected files:
>  MM    webkit/glue/webmediaplayer_impl.cc
>
>
> Index: webkit/glue/webmediaplayer_impl.cc
> ===================================================================
> --- webkit/glue/webmediaplayer_impl.cc  (revision 22827)
> +++ webkit/glue/webmediaplayer_impl.cc  (working copy)
> @@ -432,21 +432,21 @@
>     case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
>     case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
>     case media::PIPELINE_ERROR_COULD_NOT_RENDER:
> +    case media::PIPELINE_ERROR_URL_NOT_FOUND:
> +    case media::PIPELINE_ERROR_NETWORK:
> +    case media::PIPELINE_ERROR_READ:
> +    case media::DEMUXER_ERROR_COULD_NOT_OPEN:
> +    case media::DEMUXER_ERROR_COULD_NOT_PARSE:
> +    case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
> +    case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
>       // Format error.
>       SetNetworkState(WebMediaPlayer::FormatError);
>       break;
>
> -    case media::PIPELINE_ERROR_URL_NOT_FOUND:
> -    case media::PIPELINE_ERROR_NETWORK:
>     case media::PIPELINE_ERROR_DECODE:
>     case media::PIPELINE_ERROR_ABORT:
>     case media::PIPELINE_ERROR_OUT_OF_MEMORY:
> -    case media::PIPELINE_ERROR_READ:
>     case media::PIPELINE_ERROR_AUDIO_HARDWARE:
> -    case media::DEMUXER_ERROR_COULD_NOT_OPEN:
> -    case media::DEMUXER_ERROR_COULD_NOT_PARSE:
> -    case media::DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
> -    case media::DEMUXER_ERROR_COULD_NOT_CREATE_THREAD:
>       // Decode error.
>       SetNetworkState(WebMediaPlayer::DecodeError);
>       break;
>
> Property changes on: webkit\glue\webmediaplayer_impl.cc
> ___________________________________________________________________
> Modified: svn:mergeinfo
>   Merged /trunk/src/webkit/glue/webmediaplayer_impl.cc:r22125
>
>
>
>