| 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/ffmpeg/ffmpeg_common.h" | 5 #include "media/ffmpeg/ffmpeg_common.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 DVLOG(1) << "Unknown AudioCodec: " << audio_codec; | 147 DVLOG(1) << "Unknown AudioCodec: " << audio_codec; |
| 148 } | 148 } |
| 149 return AV_CODEC_ID_NONE; | 149 return AV_CODEC_ID_NONE; |
| 150 } | 150 } |
| 151 | 151 |
| 152 // Converts an FFmpeg video codec ID into its corresponding supported codec id. | 152 // Converts an FFmpeg video codec ID into its corresponding supported codec id. |
| 153 static VideoCodec CodecIDToVideoCodec(AVCodecID codec_id) { | 153 static VideoCodec CodecIDToVideoCodec(AVCodecID codec_id) { |
| 154 switch (codec_id) { | 154 switch (codec_id) { |
| 155 case AV_CODEC_ID_H264: | 155 case AV_CODEC_ID_H264: |
| 156 return kCodecH264; | 156 return kCodecH264; |
| 157 #if defined(ENABLE_HEVC_DEMUXING) |
| 158 case AV_CODEC_ID_HEVC: |
| 159 return kCodecHEVC; |
| 160 #endif |
| 157 case AV_CODEC_ID_THEORA: | 161 case AV_CODEC_ID_THEORA: |
| 158 return kCodecTheora; | 162 return kCodecTheora; |
| 159 case AV_CODEC_ID_MPEG4: | 163 case AV_CODEC_ID_MPEG4: |
| 160 return kCodecMPEG4; | 164 return kCodecMPEG4; |
| 161 case AV_CODEC_ID_VP8: | 165 case AV_CODEC_ID_VP8: |
| 162 return kCodecVP8; | 166 return kCodecVP8; |
| 163 case AV_CODEC_ID_VP9: | 167 case AV_CODEC_ID_VP9: |
| 164 return kCodecVP9; | 168 return kCodecVP9; |
| 165 default: | 169 default: |
| 166 DVLOG(1) << "Unknown video CodecID: " << codec_id; | 170 DVLOG(1) << "Unknown video CodecID: " << codec_id; |
| 167 } | 171 } |
| 168 return kUnknownVideoCodec; | 172 return kUnknownVideoCodec; |
| 169 } | 173 } |
| 170 | 174 |
| 171 static AVCodecID VideoCodecToCodecID(VideoCodec video_codec) { | 175 static AVCodecID VideoCodecToCodecID(VideoCodec video_codec) { |
| 172 switch (video_codec) { | 176 switch (video_codec) { |
| 173 case kCodecH264: | 177 case kCodecH264: |
| 174 return AV_CODEC_ID_H264; | 178 return AV_CODEC_ID_H264; |
| 179 #if defined(ENABLE_HEVC_DEMUXING) |
| 180 case kCodecHEVC: |
| 181 return AV_CODEC_ID_HEVC; |
| 182 #endif |
| 175 case kCodecTheora: | 183 case kCodecTheora: |
| 176 return AV_CODEC_ID_THEORA; | 184 return AV_CODEC_ID_THEORA; |
| 177 case kCodecMPEG4: | 185 case kCodecMPEG4: |
| 178 return AV_CODEC_ID_MPEG4; | 186 return AV_CODEC_ID_MPEG4; |
| 179 case kCodecVP8: | 187 case kCodecVP8: |
| 180 return AV_CODEC_ID_VP8; | 188 return AV_CODEC_ID_VP8; |
| 181 case kCodecVP9: | 189 case kCodecVP9: |
| 182 return AV_CODEC_ID_VP9; | 190 return AV_CODEC_ID_VP9; |
| 183 default: | 191 default: |
| 184 DVLOG(1) << "Unknown VideoCodec: " << video_codec; | 192 DVLOG(1) << "Unknown VideoCodec: " << video_codec; |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 return false; | 607 return false; |
| 600 | 608 |
| 601 *out = parsed_time; | 609 *out = parsed_time; |
| 602 return true; | 610 return true; |
| 603 } | 611 } |
| 604 | 612 |
| 605 return false; | 613 return false; |
| 606 } | 614 } |
| 607 | 615 |
| 608 } // namespace media | 616 } // namespace media |
| OLD | NEW |