Chromium Code Reviews| Index: content/renderer/media_recorder/media_recorder_handler.cc |
| diff --git a/content/renderer/media_recorder/media_recorder_handler.cc b/content/renderer/media_recorder/media_recorder_handler.cc |
| index 9cc45602ffe7e4ce4d5168815c1848651ac9a9eb..df05b17ced55f4c0a1ccaac6d84b1a1a5687e1fe 100644 |
| --- a/content/renderer/media_recorder/media_recorder_handler.cc |
| +++ b/content/renderer/media_recorder/media_recorder_handler.cc |
| @@ -40,7 +40,7 @@ media::VideoCodec CodecIdToMediaVideoCodec(VideoTrackRecorder::CodecId id) { |
| return media::kCodecVP8; |
| case VideoTrackRecorder::CodecId::VP9: |
| return media::kCodecVP9; |
| -#if BUILDFLAG(RTC_USE_H264) |
| +#if BUILDFLAG(RTC_USE_H264) || defined(OS_ANDROID) |
|
mcasas
2017/04/17 20:10:38
This check
#if BUILDFLAG(RTC_USE_H264) || defin
braveyao
2017/04/18 16:15:38
Done.
|
| case VideoTrackRecorder::CodecId::H264: |
| return media::kCodecH264; |
| #endif |
| @@ -133,7 +133,7 @@ bool MediaRecorderHandler::initialize( |
| codec_id_ = VideoTrackRecorder::CodecId::VP8; |
| else if (codecs_str.find("vp9") != std::string::npos) |
| codec_id_ = VideoTrackRecorder::CodecId::VP9; |
| -#if BUILDFLAG(RTC_USE_H264) |
| +#if BUILDFLAG(RTC_USE_H264) || defined(OS_ANDROID) |
| else if (codecs_str.find("h264") != std::string::npos) |
| codec_id_ = VideoTrackRecorder::CodecId::H264; |
| else if (codecs_str.find("avc1") != std::string::npos) |