content/renderer/media/webmediaplayer_util.cc - Issue 148553003: Clean up histogram'd media enum max values.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/media/webmediaplayer_util.cc

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix naming collision Created 6 years, 9 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 | « content/renderer/media/rtc_video_encoder.cc ('k') | content/renderer/media/webrtc_audio_capturer.cc » ('j') | no next file with comments »

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 "content/renderer/media/webmediaplayer_util.h"	5 #include "content/renderer/media/webmediaplayer_util.h"

6	6

7 #include <math.h>	7 #include <math.h>

8	8

9 #include "media/base/media_keys.h"	9 #include "media/base/media_keys.h"

10 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"	10 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 case media::PIPELINE_ERROR_OPERATION_PENDING:	64 case media::PIPELINE_ERROR_OPERATION_PENDING:

65 case media::PIPELINE_ERROR_INVALID_STATE:	65 case media::PIPELINE_ERROR_INVALID_STATE:

66 return blink::WebMediaPlayer::NetworkStateDecodeError;	66 return blink::WebMediaPlayer::NetworkStateDecodeError;

67	67

68 case media::PIPELINE_ERROR_DECRYPT:	68 case media::PIPELINE_ERROR_DECRYPT:

69 // TODO(xhwang): Change to use NetworkStateDecryptError once it's added in	69 // TODO(xhwang): Change to use NetworkStateDecryptError once it's added in

70 // Webkit (see http://crbug.com/124486).	70 // Webkit (see http://crbug.com/124486).

71 return blink::WebMediaPlayer::NetworkStateDecodeError;	71 return blink::WebMediaPlayer::NetworkStateDecodeError;

72	72

73 case media::PIPELINE_OK:	73 case media::PIPELINE_OK:

74 case media::PIPELINE_STATUS_MAX:

75 NOTREACHED() << "Unexpected status! " << error;	74 NOTREACHED() << "Unexpected status! " << error;

76 }	75 }

77 return blink::WebMediaPlayer::NetworkStateFormatError;	76 return blink::WebMediaPlayer::NetworkStateFormatError;

78 }	77 }

79	78

80 } // namespace content	79 } // namespace content

OLD	NEW