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

Side by Side Diff: media/base/media_log.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 | « media/base/channel_mixer_unittest.cc ('k') | media/base/pipeline_status.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base/media_log.h" 5 #include "media/base/media_log.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 case PIPELINE_ERROR_INVALID_STATE: 90 case PIPELINE_ERROR_INVALID_STATE:
91 return "pipeline: invalid state"; 91 return "pipeline: invalid state";
92 case DEMUXER_ERROR_COULD_NOT_OPEN: 92 case DEMUXER_ERROR_COULD_NOT_OPEN:
93 return "demuxer: could not open"; 93 return "demuxer: could not open";
94 case DEMUXER_ERROR_COULD_NOT_PARSE: 94 case DEMUXER_ERROR_COULD_NOT_PARSE:
95 return "dumuxer: could not parse"; 95 return "dumuxer: could not parse";
96 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS: 96 case DEMUXER_ERROR_NO_SUPPORTED_STREAMS:
97 return "demuxer: no supported streams"; 97 return "demuxer: no supported streams";
98 case DECODER_ERROR_NOT_SUPPORTED: 98 case DECODER_ERROR_NOT_SUPPORTED:
99 return "decoder: not supported"; 99 return "decoder: not supported";
100 case PIPELINE_STATUS_MAX:
101 NOTREACHED();
102 } 100 }
103 NOTREACHED(); 101 NOTREACHED();
104 return NULL; 102 return NULL;
105 } 103 }
106 104
107 LogHelper::LogHelper(const LogCB& log_cb) : log_cb_(log_cb) {} 105 LogHelper::LogHelper(const LogCB& log_cb) : log_cb_(log_cb) {}
108 106
109 LogHelper::~LogHelper() { 107 LogHelper::~LogHelper() {
110 if (log_cb_.is_null()) 108 if (log_cb_.is_null())
111 return; 109 return;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 } 222 }
225 223
226 void MediaLog::SetBooleanProperty( 224 void MediaLog::SetBooleanProperty(
227 const char* key, bool value) { 225 const char* key, bool value) {
228 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE)); 226 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
229 event->params.SetBoolean(key, value); 227 event->params.SetBoolean(key, value);
230 AddEvent(event.Pass()); 228 AddEvent(event.Pass());
231 } 229 }
232 230
233 } //namespace media 231 } //namespace media
OLDNEW
« no previous file with comments | « media/base/channel_mixer_unittest.cc ('k') | media/base/pipeline_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698