| OLD | NEW |
| 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/video_decoder_config.h" | 5 #include "media/base/video_decoder_config.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 | 9 |
| 10 namespace media { | 10 namespace media { |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 return s.str(); | 129 return s.str(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 // The names come from src/third_party/ffmpeg/libavcodec/codec_desc.c | 132 // The names come from src/third_party/ffmpeg/libavcodec/codec_desc.c |
| 133 std::string VideoDecoderConfig::GetHumanReadableCodecName() const { | 133 std::string VideoDecoderConfig::GetHumanReadableCodecName() const { |
| 134 switch (codec()) { | 134 switch (codec()) { |
| 135 case kUnknownVideoCodec: | 135 case kUnknownVideoCodec: |
| 136 return "unknown"; | 136 return "unknown"; |
| 137 case kCodecH264: | 137 case kCodecH264: |
| 138 return "h264"; | 138 return "h264"; |
| 139 case kCodecHEVC: |
| 140 return "hevc"; |
| 139 case kCodecVC1: | 141 case kCodecVC1: |
| 140 return "vc1"; | 142 return "vc1"; |
| 141 case kCodecMPEG2: | 143 case kCodecMPEG2: |
| 142 return "mpeg2video"; | 144 return "mpeg2video"; |
| 143 case kCodecMPEG4: | 145 case kCodecMPEG4: |
| 144 return "mpeg4"; | 146 return "mpeg4"; |
| 145 case kCodecTheora: | 147 case kCodecTheora: |
| 146 return "theora"; | 148 return "theora"; |
| 147 case kCodecVP8: | 149 case kCodecVP8: |
| 148 return "vp8"; | 150 return "vp8"; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 | 187 |
| 186 size_t VideoDecoderConfig::extra_data_size() const { | 188 size_t VideoDecoderConfig::extra_data_size() const { |
| 187 return extra_data_.size(); | 189 return extra_data_.size(); |
| 188 } | 190 } |
| 189 | 191 |
| 190 bool VideoDecoderConfig::is_encrypted() const { | 192 bool VideoDecoderConfig::is_encrypted() const { |
| 191 return is_encrypted_; | 193 return is_encrypted_; |
| 192 } | 194 } |
| 193 | 195 |
| 194 } // namespace media | 196 } // namespace media |
| OLD | NEW |