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

Unified Diff: ppapi/examples/video_encode/video_encode.cc

Issue 1226203010: ppapi: VideoEncoder: augment precision of the IVF container (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « native_client_sdk/src/examples/api/video_encode/video_encode.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/examples/video_encode/video_encode.cc
diff --git a/ppapi/examples/video_encode/video_encode.cc b/ppapi/examples/video_encode/video_encode.cc
index 229c30ddd42f147ab2b6d450ea392bab9fc4912b..12e52802f6da46a26a3ea99c6bf67926d709c6ca 100644
--- a/ppapi/examples/video_encode/video_encode.cc
+++ b/ppapi/examples/video_encode/video_encode.cc
@@ -7,6 +7,7 @@
#include <string.h>
#include <algorithm>
+#include <deque>
#include <iostream>
#include <map>
#include <sstream>
@@ -86,7 +87,7 @@ uint32_t IVFWriter::WriteFileHeader(uint8_t* mem,
PutLE32(mem + 8, fourcc('V', 'P', '8', '0')); // fourcc
PutLE16(mem + 12, static_cast<uint16_t>(width)); // width
PutLE16(mem + 14, static_cast<uint16_t>(height)); // height
- PutLE32(mem + 16, 30); // rate
+ PutLE32(mem + 16, 1000); // rate
PutLE32(mem + 20, 1); // scale
PutLE32(mem + 24, 0xffffffff); // length
PutLE32(mem + 28, 0); // unused
@@ -179,6 +180,8 @@ class VideoEncoderInstance : public pp::Instance {
pp::Size encoder_size_;
uint32_t encoded_frames_;
+ std::deque<uint64_t> frames_timestamps_;
+
pp::VideoFrame current_track_frame_;
IVFWriter ivf_writer_;
@@ -311,6 +314,7 @@ void VideoEncoderInstance::OnEncoderProbed(
void VideoEncoderInstance::StartEncoder() {
video_encoder_ = pp::VideoEncoder(this);
+ frames_timestamps_.clear();
int32_t error = video_encoder_.Initialize(
frame_format_, frame_size_, video_profile_, 2000000,
@@ -428,6 +432,8 @@ int32_t VideoEncoderInstance::CopyVideoFrame(pp::VideoFrame dest,
}
void VideoEncoderInstance::EncodeFrame(const pp::VideoFrame& frame) {
+ frames_timestamps_.push_back(
+ static_cast<uint64_t>(frame.GetTimestamp() * 1000));
video_encoder_.Encode(
frame, PP_FALSE,
callback_factory_.NewCallback(&VideoEncoderInstance::OnEncodeDone));
@@ -555,10 +561,11 @@ void VideoEncoderInstance::PostDataMessage(const void* buffer, uint32_t size) {
size + ivf_writer_.GetFrameHeaderSize());
data_ptr = static_cast<uint8_t*>(array_buffer.Map());
}
- data_offset = frame_offset +
- ivf_writer_.WriteFrameHeader(data_ptr + frame_offset,
- encoded_frames_,
- size);
+ uint64_t timestamp = frames_timestamps_.front();
+ frames_timestamps_.pop_front();
+ data_offset =
+ frame_offset +
+ ivf_writer_.WriteFrameHeader(data_ptr + frame_offset, timestamp, size);
} else {
array_buffer = pp::VarArrayBuffer(size);
data_ptr = static_cast<uint8_t*>(array_buffer.Map());
« no previous file with comments | « native_client_sdk/src/examples/api/video_encode/video_encode.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698