Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: media/blink/webmediaplayer_util.cc

Issue 2770293002: Detect HLS from demuxing results (Closed)
Patch Set: Minor changes in comments Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 23 matching lines...) Expand all
34 case PIPELINE_ERROR_READ: 34 case PIPELINE_ERROR_READ:
35 case CHUNK_DEMUXER_ERROR_EOS_STATUS_NETWORK_ERROR: 35 case CHUNK_DEMUXER_ERROR_EOS_STATUS_NETWORK_ERROR:
36 return blink::WebMediaPlayer::kNetworkStateNetworkError; 36 return blink::WebMediaPlayer::kNetworkStateNetworkError;
37 37
38 case PIPELINE_ERROR_INITIALIZATION_FAILED: 38 case PIPELINE_ERROR_INITIALIZATION_FAILED:
39 case PIPELINE_ERROR_COULD_NOT_RENDER: 39 case PIPELINE_ERROR_COULD_NOT_RENDER:
40 case PIPELINE_ERROR_EXTERNAL_RENDERER_FAILED: 40 case PIPELINE_ERROR_EXTERNAL_RENDERER_FAILED:
41 case DEMUXER_ERROR_COULD_NOT_OPEN: 41 case DEMUXER_ERROR_COULD_NOT_OPEN:
42 case DEMUXER_ERROR_COULD_NOT_PARSE: 42 case DEMUXER_ERROR_COULD_NOT_PARSE:
43 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: 43 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
44 case DEMUXER_ERROR_DETECTED_HLS:
44 case DECODER_ERROR_NOT_SUPPORTED: 45 case DECODER_ERROR_NOT_SUPPORTED:
45 return blink::WebMediaPlayer::kNetworkStateFormatError; 46 return blink::WebMediaPlayer::kNetworkStateFormatError;
46 47
47 case PIPELINE_ERROR_DECODE: 48 case PIPELINE_ERROR_DECODE:
48 case PIPELINE_ERROR_ABORT: 49 case PIPELINE_ERROR_ABORT:
49 case PIPELINE_ERROR_INVALID_STATE: 50 case PIPELINE_ERROR_INVALID_STATE:
50 case CHUNK_DEMUXER_ERROR_APPEND_FAILED: 51 case CHUNK_DEMUXER_ERROR_APPEND_FAILED:
51 case CHUNK_DEMUXER_ERROR_EOS_STATUS_DECODE_ERROR: 52 case CHUNK_DEMUXER_ERROR_EOS_STATUS_DECODE_ERROR:
52 case AUDIO_RENDERER_ERROR: 53 case AUDIO_RENDERER_ERROR:
53 return blink::WebMediaPlayer::kNetworkStateDecodeError; 54 return blink::WebMediaPlayer::kNetworkStateDecodeError;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 237
237 } // namespace 238 } // namespace
238 239
239 OutputDeviceStatusCB ConvertToOutputDeviceStatusCB( 240 OutputDeviceStatusCB ConvertToOutputDeviceStatusCB(
240 blink::WebSetSinkIdCallbacks* web_callbacks) { 241 blink::WebSetSinkIdCallbacks* web_callbacks) {
241 return media::BindToCurrentLoop( 242 return media::BindToCurrentLoop(
242 base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks))); 243 base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks)));
243 } 244 }
244 245
245 } // namespace media 246 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698