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

Side by Side Diff: media/base/media_log.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 | « gpu/ipc/service/stream_texture_android.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 <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_DECODE); 93 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_DECODE);
94 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_ABORT); 94 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_ABORT);
95 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_INITIALIZATION_FAILED); 95 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_INITIALIZATION_FAILED);
96 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_COULD_NOT_RENDER); 96 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_COULD_NOT_RENDER);
97 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_EXTERNAL_RENDERER_FAILED); 97 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_EXTERNAL_RENDERER_FAILED);
98 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_READ); 98 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_READ);
99 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_INVALID_STATE); 99 STRINGIFY_STATUS_CASE(PIPELINE_ERROR_INVALID_STATE);
100 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_COULD_NOT_OPEN); 100 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_COULD_NOT_OPEN);
101 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_COULD_NOT_PARSE); 101 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_COULD_NOT_PARSE);
102 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_NO_SUPPORTED_STREAMS); 102 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_NO_SUPPORTED_STREAMS);
103 STRINGIFY_STATUS_CASE(DEMUXER_ERROR_DETECTED_HLS);
103 STRINGIFY_STATUS_CASE(DECODER_ERROR_NOT_SUPPORTED); 104 STRINGIFY_STATUS_CASE(DECODER_ERROR_NOT_SUPPORTED);
104 STRINGIFY_STATUS_CASE(CHUNK_DEMUXER_ERROR_APPEND_FAILED); 105 STRINGIFY_STATUS_CASE(CHUNK_DEMUXER_ERROR_APPEND_FAILED);
105 STRINGIFY_STATUS_CASE(CHUNK_DEMUXER_ERROR_EOS_STATUS_DECODE_ERROR); 106 STRINGIFY_STATUS_CASE(CHUNK_DEMUXER_ERROR_EOS_STATUS_DECODE_ERROR);
106 STRINGIFY_STATUS_CASE(CHUNK_DEMUXER_ERROR_EOS_STATUS_NETWORK_ERROR); 107 STRINGIFY_STATUS_CASE(CHUNK_DEMUXER_ERROR_EOS_STATUS_NETWORK_ERROR);
107 STRINGIFY_STATUS_CASE(AUDIO_RENDERER_ERROR); 108 STRINGIFY_STATUS_CASE(AUDIO_RENDERER_ERROR);
108 } 109 }
109 110
110 #undef STRINGIFY_STATUS_CASE 111 #undef STRINGIFY_STATUS_CASE
111 112
112 NOTREACHED(); 113 NOTREACHED();
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 LogHelper::LogHelper(MediaLog::MediaLogLevel level, MediaLog* media_log) 303 LogHelper::LogHelper(MediaLog::MediaLogLevel level, MediaLog* media_log)
303 : level_(level), media_log_(media_log) { 304 : level_(level), media_log_(media_log) {
304 DCHECK(media_log_); 305 DCHECK(media_log_);
305 } 306 }
306 307
307 LogHelper::~LogHelper() { 308 LogHelper::~LogHelper() {
308 media_log_->AddLogEvent(level_, stream_.str()); 309 media_log_->AddLogEvent(level_, stream_.str());
309 } 310 }
310 311
311 } //namespace media 312 } //namespace media
OLDNEW
« no previous file with comments | « gpu/ipc/service/stream_texture_android.cc ('k') | media/base/pipeline_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698