| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/base/android/demuxer_stream_player_params.h" | 5 #include "media/base/android/demuxer_stream_player_params.h" |
| 6 #include <iomanip> | 6 #include <iomanip> |
| 7 | 7 |
| 8 namespace media { | 8 namespace media { |
| 9 | 9 |
| 10 DemuxerConfigs::DemuxerConfigs() | 10 DemuxerConfigs::DemuxerConfigs() |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 const char* AsString(DemuxerStream::Type stream_type) { | 38 const char* AsString(DemuxerStream::Type stream_type) { |
| 39 switch (stream_type) { | 39 switch (stream_type) { |
| 40 case DemuxerStream::UNKNOWN: | 40 case DemuxerStream::UNKNOWN: |
| 41 return "UNKNOWN"; | 41 return "UNKNOWN"; |
| 42 case DemuxerStream::AUDIO: | 42 case DemuxerStream::AUDIO: |
| 43 return "AUDIO"; | 43 return "AUDIO"; |
| 44 case DemuxerStream::VIDEO: | 44 case DemuxerStream::VIDEO: |
| 45 return "VIDEO"; | 45 return "VIDEO"; |
| 46 case DemuxerStream::TEXT: | 46 case DemuxerStream::TEXT: |
| 47 return "TEXT"; | 47 return "TEXT"; |
| 48 case DemuxerStream::URL: |
| 49 return "URL"; |
| 48 case DemuxerStream::NUM_TYPES: | 50 case DemuxerStream::NUM_TYPES: |
| 49 return "NUM_TYPES"; | 51 return "NUM_TYPES"; |
| 50 } | 52 } |
| 51 NOTREACHED(); | 53 NOTREACHED(); |
| 52 return nullptr; // crash early | 54 return nullptr; // crash early |
| 53 } | 55 } |
| 54 | 56 |
| 55 const char* AsString(DemuxerStream::Status status) { | 57 const char* AsString(DemuxerStream::Status status) { |
| 56 switch (status) { | 58 switch (status) { |
| 57 case DemuxerStream::kOk: | 59 case DemuxerStream::kOk: |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } | 110 } |
| 109 | 111 |
| 110 if (conf.video_codec != media::kUnknownVideoCodec) { | 112 if (conf.video_codec != media::kUnknownVideoCodec) { |
| 111 os << " video:" << media::GetCodecName(conf.video_codec) << " " | 113 os << " video:" << media::GetCodecName(conf.video_codec) << " " |
| 112 << conf.video_size.width() << "x" << conf.video_size.height() | 114 << conf.video_size.width() << "x" << conf.video_size.height() |
| 113 << (conf.is_video_encrypted ? " encrypted" : ""); | 115 << (conf.is_video_encrypted ? " encrypted" : ""); |
| 114 } | 116 } |
| 115 | 117 |
| 116 return os; | 118 return os; |
| 117 } | 119 } |
| OLD | NEW |