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 | 6 |
7 namespace media { | 7 namespace media { |
8 | 8 |
9 DemuxerConfigs::DemuxerConfigs() | 9 DemuxerConfigs::DemuxerConfigs() |
10 : audio_codec(kUnknownAudioCodec), | 10 : audio_codec(kUnknownAudioCodec), |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 RETURN_STRING(kCodecALAC); | 52 RETURN_STRING(kCodecALAC); |
53 } | 53 } |
54 NOTREACHED(); | 54 NOTREACHED(); |
55 return nullptr; // crash early | 55 return nullptr; // crash early |
56 } | 56 } |
57 | 57 |
58 const char* AsString(VideoCodec codec) { | 58 const char* AsString(VideoCodec codec) { |
59 switch (codec) { | 59 switch (codec) { |
60 RETURN_STRING(kUnknownVideoCodec); | 60 RETURN_STRING(kUnknownVideoCodec); |
61 RETURN_STRING(kCodecH264); | 61 RETURN_STRING(kCodecH264); |
| 62 RETURN_STRING(kCodecHEVC); |
62 RETURN_STRING(kCodecVC1); | 63 RETURN_STRING(kCodecVC1); |
63 RETURN_STRING(kCodecMPEG2); | 64 RETURN_STRING(kCodecMPEG2); |
64 RETURN_STRING(kCodecMPEG4); | 65 RETURN_STRING(kCodecMPEG4); |
65 RETURN_STRING(kCodecTheora); | 66 RETURN_STRING(kCodecTheora); |
66 RETURN_STRING(kCodecVP8); | 67 RETURN_STRING(kCodecVP8); |
67 RETURN_STRING(kCodecVP9); | 68 RETURN_STRING(kCodecVP9); |
68 } | 69 } |
69 NOTREACHED(); | 70 NOTREACHED(); |
70 return nullptr; // crash early | 71 return nullptr; // crash early |
71 } | 72 } |
(...skipping 28 matching lines...) Expand all Loading... |
100 } | 101 } |
101 | 102 |
102 if (conf.video_codec != media::kUnknownVideoCodec) { | 103 if (conf.video_codec != media::kUnknownVideoCodec) { |
103 os << " video:" << media::AsString(conf.video_codec) << " " | 104 os << " video:" << media::AsString(conf.video_codec) << " " |
104 << conf.video_size.width() << "x" << conf.video_size.height() | 105 << conf.video_size.width() << "x" << conf.video_size.height() |
105 << (conf.is_video_encrypted ? " encrypted" : ""); | 106 << (conf.is_video_encrypted ? " encrypted" : ""); |
106 } | 107 } |
107 | 108 |
108 return os; | 109 return os; |
109 } | 110 } |
OLD | NEW |