--- a/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
@@ -100,17 +100,17 @@ public:
     if (size > 0) {
       webrtc::CriticalSectionScoped lock(mCritSect.get());
       VerifyAndAllocate(size);
 
       int64_t presentationTimeUs;
       ok = NS_SUCCEEDED(info->PresentationTimeUs(&presentationTimeUs));
       MOZ_RELEASE_ASSERT(ok);
 
-      mEncodedImage._timeStamp = presentationTimeUs;
+      mEncodedImage._timeStamp = presentationTimeUs / PR_USEC_PER_MSEC;
       mEncodedImage.capture_time_ms_ = mEncodedImage._timeStamp;
 
       int32_t flags;
       ok = NS_SUCCEEDED(info->Flags(&flags));
       MOZ_ASSERT(ok);
 
       if (flags == MediaCodec::BUFFER_FLAG_SYNC_FRAME) {
         mEncodedImage._frameType = webrtc::kVideoFrameKey;
@@ -1071,19 +1071,19 @@ int32_t WebrtcMediaCodecVP8VideoRemoteEn
 
   BufferInfo::LocalRef bufferInfo;
   nsresult rv = BufferInfo::New(&bufferInfo);
   if (NS_FAILED(rv)) {
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
   if((*frame_types)[0] == webrtc::kVideoFrameKey) {
-    bufferInfo->Set(0, size, inputImage.timestamp(), MediaCodec::BUFFER_FLAG_SYNC_FRAME);
+    bufferInfo->Set(0, size, inputImage.render_time_ms() * PR_USEC_PER_MSEC, MediaCodec::BUFFER_FLAG_SYNC_FRAME);
   } else {
-    bufferInfo->Set(0, size, inputImage.timestamp(), 0);
+    bufferInfo->Set(0, size, inputImage.render_time_ms() * PR_USEC_PER_MSEC, 0);
   }
 
   mJavaEncoder->Input(bytes, bufferInfo, nullptr);
 
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int32_t WebrtcMediaCodecVP8VideoRemoteEncoder::RegisterEncodeCompleteCallback(webrtc::EncodedImageCallback* callback) {