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

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

Issue 1412943003: Update VideoFrameType to FrameType in RTC coders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/rtc_video_encoder.cc
diff --git a/content/renderer/media/rtc_video_encoder.cc b/content/renderer/media/rtc_video_encoder.cc
index 3a21fa210ec0d09fe53c4e85077c6e21c0505027..749b41723a42df6d2baf390254d82e5abf42fa05 100644
--- a/content/renderer/media/rtc_video_encoder.cc
+++ b/content/renderer/media/rtc_video_encoder.cc
@@ -432,7 +432,8 @@ void RTCVideoEncoder::Impl::BitstreamBufferReady(int32 bitstream_buffer_id,
image->_encodedHeight = input_visible_size_.height();
image->_timeStamp = rtp_timestamp;
image->capture_time_ms_ = capture_time_ms;
- image->_frameType = (key_frame ? webrtc::kKeyFrame : webrtc::kDeltaFrame);
+ image->_frameType =
+ (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta);
image->_completeFrame = true;
encoder_task_runner_->PostTask(
@@ -623,7 +624,7 @@ int32_t RTCVideoEncoder::InitEncode(const webrtc::VideoCodec* codec_settings,
int32_t RTCVideoEncoder::Encode(
const webrtc::VideoFrame& input_image,
const webrtc::CodecSpecificInfo* codec_specific_info,
- const std::vector<webrtc::VideoFrameType>* frame_types) {
+ const std::vector<webrtc::FrameType>* frame_types) {
DVLOG(3) << "Encode()";
if (!impl_.get()) {
DVLOG(3) << "Encode(): returning impl_status_=" << impl_status_;
@@ -631,7 +632,7 @@ int32_t RTCVideoEncoder::Encode(
}
const bool want_key_frame = frame_types && frame_types->size() &&
- frame_types->front() == webrtc::kKeyFrame;
+ frame_types->front() == webrtc::kVideoFrameKey;
base::WaitableEvent encode_waiter(true, false);
int32_t encode_retval = WEBRTC_VIDEO_CODEC_UNINITIALIZED;
gpu_factories_->GetTaskRunner()->PostTask(
« content/renderer/media/rtc_video_decoder.cc ('K') | « content/renderer/media/rtc_video_encoder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698