Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(647)

Unified Diff: content/renderer/media/media_recorder_handler.cc

Issue 2623353004: RELAND: MediaRecorder: use VideoTrackRecorder::GetPreferredCodecId() when available (Closed)
Patch Set: Avoid H264 if !BUILDFLAG(RTC_USE_H264) Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_recorder_handler.cc
diff --git a/content/renderer/media/media_recorder_handler.cc b/content/renderer/media/media_recorder_handler.cc
index cea6710b159b6332dcdd7feea700c524ba27d134..d505226be056b8b6bf1f876bd0933ea965d5b26d 100644
--- a/content/renderer/media/media_recorder_handler.cc
+++ b/content/renderer/media/media_recorder_handler.cc
@@ -40,8 +40,12 @@ media::VideoCodec CodecIdToMediaVideoCodec(VideoTrackRecorder::CodecId id) {
return media::kCodecVP8;
case VideoTrackRecorder::CodecId::VP9:
return media::kCodecVP9;
+#if BUILDFLAG(RTC_USE_H264)
case VideoTrackRecorder::CodecId::H264:
return media::kCodecH264;
+#endif
+ case VideoTrackRecorder::CodecId::LAST:
+ return media::kUnknownVideoCodec;
}
NOTREACHED() << "Unsupported codec";
return media::kUnknownVideoCodec;
@@ -119,8 +123,7 @@ bool MediaRecorderHandler::initialize(
UpdateWebRTCMethodCount(WEBKIT_MEDIA_STREAM_RECORDER);
if (!canSupportMimeType(type, codecs)) {
- DLOG(ERROR) << "Can't support " << type.utf8()
- << ";codecs=" << codecs.utf8();
+ DLOG(ERROR) << "Unsupported " << type.utf8() << ";codecs=" << codecs.utf8();
return false;
}
@@ -136,6 +139,11 @@ bool MediaRecorderHandler::initialize(
else if (codecs_str.find("avc1") != std::string::npos)
codec_id_ = VideoTrackRecorder::CodecId::H264;
#endif
+ else
+ codec_id_ = VideoTrackRecorder::GetPreferredCodecId();
+
+ DVLOG_IF(1, codecs_str.empty()) << "Falling back to preferred codec id "
+ << static_cast<int>(codec_id_);
media_stream_ = media_stream;
DCHECK(client);
« no previous file with comments | « content/browser/webrtc/webrtc_media_recorder_browsertest.cc ('k') | content/renderer/media/video_track_recorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698