| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 RETURN_STRING(kCodecALAC); | 70 RETURN_STRING(kCodecALAC); |
| 71 } | 71 } |
| 72 NOTREACHED(); | 72 NOTREACHED(); |
| 73 return nullptr; // crash early | 73 return nullptr; // crash early |
| 74 } | 74 } |
| 75 | 75 |
| 76 const char* AsString(VideoCodec codec) { | 76 const char* AsString(VideoCodec codec) { |
| 77 switch (codec) { | 77 switch (codec) { |
| 78 RETURN_STRING(kUnknownVideoCodec); | 78 RETURN_STRING(kUnknownVideoCodec); |
| 79 RETURN_STRING(kCodecH264); | 79 RETURN_STRING(kCodecH264); |
| 80 RETURN_STRING(kCodecHEVC); |
| 80 RETURN_STRING(kCodecVC1); | 81 RETURN_STRING(kCodecVC1); |
| 81 RETURN_STRING(kCodecMPEG2); | 82 RETURN_STRING(kCodecMPEG2); |
| 82 RETURN_STRING(kCodecMPEG4); | 83 RETURN_STRING(kCodecMPEG4); |
| 83 RETURN_STRING(kCodecTheora); | 84 RETURN_STRING(kCodecTheora); |
| 84 RETURN_STRING(kCodecVP8); | 85 RETURN_STRING(kCodecVP8); |
| 85 RETURN_STRING(kCodecVP9); | 86 RETURN_STRING(kCodecVP9); |
| 86 } | 87 } |
| 87 NOTREACHED(); | 88 NOTREACHED(); |
| 88 return nullptr; // crash early | 89 return nullptr; // crash early |
| 89 } | 90 } |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 } | 147 } |
| 147 | 148 |
| 148 if (conf.video_codec != media::kUnknownVideoCodec) { | 149 if (conf.video_codec != media::kUnknownVideoCodec) { |
| 149 os << " video:" << media::AsString(conf.video_codec) << " " | 150 os << " video:" << media::AsString(conf.video_codec) << " " |
| 150 << conf.video_size.width() << "x" << conf.video_size.height() | 151 << conf.video_size.width() << "x" << conf.video_size.height() |
| 151 << (conf.is_video_encrypted ? " encrypted" : ""); | 152 << (conf.is_video_encrypted ? " encrypted" : ""); |
| 152 } | 153 } |
| 153 | 154 |
| 154 return os; | 155 return os; |
| 155 } | 156 } |
| OLD | NEW |