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

Unified Diff: content/common/gpu/media/video_encode_accelerator_unittest.cc

Issue 185403020: Make VEA client of command buffer; move sync. IPC to VDA/VEA::Initialize() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 56683e7a Rebase. Created 6 years, 9 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/common/gpu/media/video_encode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc
index 7593d9d985da0f01a8e5936a82c56b0e1d203263..cb5ceac9f2e100e45f8cd5f7e4268dadc77a638d 100644
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc
@@ -248,7 +248,6 @@ class VEAClient : public VideoEncodeAccelerator::Client {
void DestroyEncoder();
// VideoDecodeAccelerator::Client implementation.
- void NotifyInitializeDone() OVERRIDE;
void RequireBitstreamBuffers(unsigned int input_count,
const gfx::Size& input_coded_size,
size_t output_buffer_size) OVERRIDE;
@@ -392,15 +391,26 @@ void VEAClient::CreateEncoder() {
CHECK(!has_encoder());
encoder_.reset(new ExynosVideoEncodeAccelerator());
-
+ if (!encoder_) {
+ DLOG(ERROR) << "CreateEncoder() failed";
+ SetState(CS_ERROR);
+ return;
+ }
SetState(CS_ENCODER_SET);
+
DVLOG(1) << "Profile: " << test_stream_.requested_profile
<< ", requested bitrate: " << test_stream_.requested_bitrate;
- encoder_->Initialize(kInputFormat,
- test_stream_.size,
- test_stream_.requested_profile,
- test_stream_.requested_bitrate,
- this);
+ if (!encoder_->Initialize(kInputFormat,
+ test_stream_.size,
+ test_stream_.requested_profile,
+ test_stream_.requested_bitrate,
+ this)) {
+ DLOG(ERROR) << "VideoEncodeAccelerator::Initialize() failed";
+ SetState(CS_ERROR);
+ return;
+ }
+ SetInitialConfiguration();
+ SetState(CS_INITIALIZED);
}
void VEAClient::DestroyEncoder() {
@@ -410,12 +420,6 @@ void VEAClient::DestroyEncoder() {
encoder_.release()->Destroy();
}
-void VEAClient::NotifyInitializeDone() {
- DCHECK(thread_checker_.CalledOnValidThread());
- SetInitialConfiguration();
- SetState(CS_INITIALIZED);
-}
-
void VEAClient::RequireBitstreamBuffers(unsigned int input_count,
const gfx::Size& input_coded_size,
size_t output_size) {

Powered by Google App Engine
This is Rietveld 408576698