| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/blink/webmediaplayer_util.h" | 5 #include "media/blink/webmediaplayer_util.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: | 43 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: |
| 44 case DECODER_ERROR_NOT_SUPPORTED: | 44 case DECODER_ERROR_NOT_SUPPORTED: |
| 45 return blink::WebMediaPlayer::NetworkStateFormatError; | 45 return blink::WebMediaPlayer::NetworkStateFormatError; |
| 46 | 46 |
| 47 case PIPELINE_ERROR_DECODE: | 47 case PIPELINE_ERROR_DECODE: |
| 48 case PIPELINE_ERROR_ABORT: | 48 case PIPELINE_ERROR_ABORT: |
| 49 case PIPELINE_ERROR_INVALID_STATE: | 49 case PIPELINE_ERROR_INVALID_STATE: |
| 50 case CHUNK_DEMUXER_ERROR_APPEND_FAILED: | 50 case CHUNK_DEMUXER_ERROR_APPEND_FAILED: |
| 51 case CHUNK_DEMUXER_ERROR_EOS_STATUS_DECODE_ERROR: | 51 case CHUNK_DEMUXER_ERROR_EOS_STATUS_DECODE_ERROR: |
| 52 case AUDIO_RENDERER_ERROR: | 52 case AUDIO_RENDERER_ERROR: |
| 53 case AUDIO_RENDERER_ERROR_SPLICE_FAILED: | |
| 54 return blink::WebMediaPlayer::NetworkStateDecodeError; | 53 return blink::WebMediaPlayer::NetworkStateDecodeError; |
| 55 | 54 |
| 56 case PIPELINE_OK: | 55 case PIPELINE_OK: |
| 57 NOTREACHED() << "Unexpected status! " << error; | 56 NOTREACHED() << "Unexpected status! " << error; |
| 58 } | 57 } |
| 59 return blink::WebMediaPlayer::NetworkStateFormatError; | 58 return blink::WebMediaPlayer::NetworkStateFormatError; |
| 60 } | 59 } |
| 61 | 60 |
| 62 namespace { | 61 namespace { |
| 63 | 62 |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 | 248 |
| 250 } // namespace | 249 } // namespace |
| 251 | 250 |
| 252 OutputDeviceStatusCB ConvertToOutputDeviceStatusCB( | 251 OutputDeviceStatusCB ConvertToOutputDeviceStatusCB( |
| 253 blink::WebSetSinkIdCallbacks* web_callbacks) { | 252 blink::WebSetSinkIdCallbacks* web_callbacks) { |
| 254 return media::BindToCurrentLoop( | 253 return media::BindToCurrentLoop( |
| 255 base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks))); | 254 base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks))); |
| 256 } | 255 } |
| 257 | 256 |
| 258 } // namespace media | 257 } // namespace media |
| OLD | NEW |