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

Unified Diff: media/cast/sender/external_video_encoder.cc

Issue 1515433002: Replace uses of raw uint32's with a type-checked RtpTimeTicks data type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Speculative workaround fix for win8_chromium_ng compile error. Created 5 years 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
« no previous file with comments | « media/cast/sender/audio_sender.cc ('k') | media/cast/sender/fake_software_video_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/external_video_encoder.cc
diff --git a/media/cast/sender/external_video_encoder.cc b/media/cast/sender/external_video_encoder.cc
index 1a3c3e79cdc022d6069e06a4da8d1c8a7e63dd60..3eb7740a3c5ba7621b48054c4c7bd1a171a7ef8e 100644
--- a/media/cast/sender/external_video_encoder.cc
+++ b/media/cast/sender/external_video_encoder.cc
@@ -24,6 +24,7 @@
#include "media/base/video_util.h"
#include "media/cast/cast_config.h"
#include "media/cast/cast_defines.h"
+#include "media/cast/common/rtp_time.h"
#include "media/cast/logging/logging_defines.h"
#include "media/cast/net/cast_transport_config.h"
#include "media/cast/sender/vp8_quantizer_parser.h"
@@ -230,7 +231,7 @@ class ExternalVideoEncoder::VEAClientImpl
encoded_frame->referenced_frame_id = encoded_frame->frame_id;
else
encoded_frame->referenced_frame_id = encoded_frame->frame_id - 1;
- encoded_frame->rtp_timestamp = TimeDeltaToRtpDelta(
+ encoded_frame->rtp_timestamp = RtpTimeTicks::FromTimeDelta(
request.video_frame->timestamp(), kVideoFrequency);
encoded_frame->reference_time = request.reference_time;
if (!stream_header_.empty()) {
@@ -316,8 +317,9 @@ class ExternalVideoEncoder::VEAClientImpl
",act=%c,ref=%d"),
codec_profile_ == media::VP8PROFILE_ANY ? 'V' : 'H',
key_frame ? 'K' : 'D', encoded_frame->frame_id,
- encoded_frame->rtp_timestamp, request.target_bit_rate / 1000,
- in_progress_frame_encodes_.size(), encoder_active_ ? 'Y' : 'N',
+ encoded_frame->rtp_timestamp.lower_32_bits(),
+ request.target_bit_rate / 1000, in_progress_frame_encodes_.size(),
+ encoder_active_ ? 'Y' : 'N',
static_cast<int>(encoded_frame->referenced_frame_id % 1000));
base::debug::SetCrashKeyValue(kZeroEncodeDetails, details);
// Please forward crash reports to http://crbug.com/519022:
« no previous file with comments | « media/cast/sender/audio_sender.cc ('k') | media/cast/sender/fake_software_video_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698