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

Side by Side Diff: media/base/media_log.cc

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix compile errors 11/21 #6 Created 7 years, 1 month 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/filter_collection.cc ('k') | media/base/media_log_event.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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 case MediaLogEvent::DURATION_SET: 43 case MediaLogEvent::DURATION_SET:
44 return "DURATION_SET"; 44 return "DURATION_SET";
45 case MediaLogEvent::TOTAL_BYTES_SET: 45 case MediaLogEvent::TOTAL_BYTES_SET:
46 return "TOTAL_BYTES_SET"; 46 return "TOTAL_BYTES_SET";
47 case MediaLogEvent::NETWORK_ACTIVITY_SET: 47 case MediaLogEvent::NETWORK_ACTIVITY_SET:
48 return "NETWORK_ACTIVITY_SET"; 48 return "NETWORK_ACTIVITY_SET";
49 case MediaLogEvent::AUDIO_ENDED: 49 case MediaLogEvent::AUDIO_ENDED:
50 return "AUDIO_ENDED"; 50 return "AUDIO_ENDED";
51 case MediaLogEvent::VIDEO_ENDED: 51 case MediaLogEvent::VIDEO_ENDED:
52 return "VIDEO_ENDED"; 52 return "VIDEO_ENDED";
53 case MediaLogEvent::TEXT_ENDED:
54 return "TEXT_ENDED";
53 case MediaLogEvent::AUDIO_RENDERER_DISABLED: 55 case MediaLogEvent::AUDIO_RENDERER_DISABLED:
54 return "AUDIO_RENDERER_DISABLED"; 56 return "AUDIO_RENDERER_DISABLED";
55 case MediaLogEvent::BUFFERED_EXTENTS_CHANGED: 57 case MediaLogEvent::BUFFERED_EXTENTS_CHANGED:
56 return "BUFFERED_EXTENTS_CHANGED"; 58 return "BUFFERED_EXTENTS_CHANGED";
57 case MediaLogEvent::MEDIA_SOURCE_ERROR: 59 case MediaLogEvent::MEDIA_SOURCE_ERROR:
58 return "MEDIA_SOURCE_ERROR"; 60 return "MEDIA_SOURCE_ERROR";
59 case MediaLogEvent::PROPERTY_CHANGE: 61 case MediaLogEvent::PROPERTY_CHANGE:
60 return "PROPERTY_CHANGE"; 62 return "PROPERTY_CHANGE";
61 } 63 }
62 NOTREACHED(); 64 NOTREACHED();
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 } 224 }
223 225
224 void MediaLog::SetBooleanProperty( 226 void MediaLog::SetBooleanProperty(
225 const char* key, bool value) { 227 const char* key, bool value) {
226 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE)); 228 scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
227 event->params.SetBoolean(key, value); 229 event->params.SetBoolean(key, value);
228 AddEvent(event.Pass()); 230 AddEvent(event.Pass());
229 } 231 }
230 232
231 } //namespace media 233 } //namespace media
OLDNEW
« no previous file with comments | « media/base/filter_collection.cc ('k') | media/base/media_log_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698