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

Unified Diff: media/video/fake_video_encode_accelerator.cc

Issue 760963003: Adds fake hardware video encoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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
Index: media/video/fake_video_encode_accelerator.cc
diff --git a/media/cast/test/fake_video_encode_accelerator.cc b/media/video/fake_video_encode_accelerator.cc
similarity index 56%
rename from media/cast/test/fake_video_encode_accelerator.cc
rename to media/video/fake_video_encode_accelerator.cc
index 23a6fb315e338d5686b821e8f911447b9602c719..90a9a20babe3aa435df73b0ba49d4a38427a2d84 100644
--- a/media/cast/test/fake_video_encode_accelerator.cc
+++ b/media/video/fake_video_encode_accelerator.cc
@@ -2,31 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/cast/test/fake_video_encode_accelerator.h"
+#include "media/video/fake_video_encode_accelerator.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
+#include "base/message_loop/message_loop_proxy.h"
miu 2014/12/20 03:37:57 Looks like you don't need this #include.
hellner1 2015/01/07 16:41:31 Done.
#include "base/single_thread_task_runner.h"
namespace media {
-namespace cast {
-namespace test {
static const unsigned int kMinimumInputCount = 1;
static const size_t kMinimumOutputBufferSize = 123456;
FakeVideoEncodeAccelerator::FakeVideoEncodeAccelerator(
- const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- std::vector<uint32>* stored_bitrates)
+ const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
: task_runner_(task_runner),
- stored_bitrates_(stored_bitrates),
+ will_initialization_succeed_(true),
client_(NULL),
first_(true),
- will_initialization_succeed_(true),
- weak_this_factory_(this) {
- DCHECK(stored_bitrates_);
-}
+ weak_this_factory_(this) {}
FakeVideoEncodeAccelerator::~FakeVideoEncodeAccelerator() {
weak_this_factory_.InvalidateWeakPtrs();
@@ -38,18 +33,19 @@ FakeVideoEncodeAccelerator::GetSupportedProfiles() {
}
bool FakeVideoEncodeAccelerator::Initialize(
- media::VideoFrame::Format input_format,
+ VideoFrame::Format input_format,
const gfx::Size& input_visible_size,
VideoCodecProfile output_profile,
uint32 initial_bitrate,
Client* client) {
- if (!will_initialization_succeed_)
+ if (!will_initialization_succeed_) {
return false;
- client_ = client;
- if (output_profile != media::VP8PROFILE_ANY &&
- output_profile != media::H264PROFILE_MAIN) {
+ }
+ if (output_profile == VIDEO_CODEC_PROFILE_UNKNOWN ||
+ output_profile > VIDEO_CODEC_PROFILE_MAX) {
return false;
}
+ client_ = client;
task_runner_->PostTask(
FROM_HERE,
base::Bind(&FakeVideoEncodeAccelerator::DoRequireBitstreamBuffers,
@@ -60,45 +56,41 @@ bool FakeVideoEncodeAccelerator::Initialize(
return true;
}
-void FakeVideoEncodeAccelerator::Encode(const scoped_refptr<VideoFrame>& frame,
- bool force_keyframe) {
+void FakeVideoEncodeAccelerator::Encode(
+ const scoped_refptr<VideoFrame>& frame,
+ bool force_keyframe) {
DCHECK(client_);
- DCHECK(!available_buffer_ids_.empty());
-
- // Fake that we have encoded the frame; resulting in using the full output
- // buffer.
- int32 id = available_buffer_ids_.front();
- available_buffer_ids_.pop_front();
-
- bool is_key_fame = force_keyframe;
- if (first_) {
- is_key_fame = true;
- first_ = false;
- }
- task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&FakeVideoEncodeAccelerator::DoBitstreamBufferReady,
- weak_this_factory_.GetWeakPtr(),
- id,
- kMinimumOutputBufferSize,
- is_key_fame));
+ queued_frames_.push(force_keyframe);
+ EncodeTask();
}
void FakeVideoEncodeAccelerator::UseOutputBitstreamBuffer(
const BitstreamBuffer& buffer) {
- available_buffer_ids_.push_back(buffer.id());
+ available_buffers_.push_back(buffer);
+ EncodeTask();
}
void FakeVideoEncodeAccelerator::RequestEncodingParametersChange(
uint32 bitrate,
uint32 framerate) {
- stored_bitrates_->push_back(bitrate);
+ stored_bitrates_.push_back(bitrate);
}
void FakeVideoEncodeAccelerator::Destroy() { delete this; }
void FakeVideoEncodeAccelerator::SendDummyFrameForTesting(bool key_frame) {
- DoBitstreamBufferReady(0, 23, key_frame);
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&FakeVideoEncodeAccelerator::DoBitstreamBufferReady,
+ weak_this_factory_.GetWeakPtr(),
+ 0,
+ 23,
+ key_frame));
+}
+
+void FakeVideoEncodeAccelerator::SetWillInitializationSucceed(
+ bool will_initialization_succeed) {
+ will_initialization_succeed_ = will_initialization_succeed;
}
void FakeVideoEncodeAccelerator::DoRequireBitstreamBuffers(
@@ -109,13 +101,31 @@ void FakeVideoEncodeAccelerator::DoRequireBitstreamBuffers(
input_count, input_coded_size, output_buffer_size);
}
+void FakeVideoEncodeAccelerator::EncodeTask() {
+ while (!queued_frames_.empty() && !available_buffers_.empty()) {
+ bool force_key_frame = queued_frames_.front();
+ queued_frames_.pop();
+ int32 bitstream_buffer_id = available_buffers_.front().id();
+ available_buffers_.pop_front();
+ bool key_frame = first_ || force_key_frame;
miu 2014/12/20 03:37:57 Please remove extra space after ||.
hellner1 2015/01/07 16:41:31 Good eye! Thanks.
+ first_ = false;
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&FakeVideoEncodeAccelerator::DoBitstreamBufferReady,
+ weak_this_factory_.GetWeakPtr(),
+ bitstream_buffer_id,
+ kMinimumOutputBufferSize,
+ key_frame));
+ }
+}
+
void FakeVideoEncodeAccelerator::DoBitstreamBufferReady(
int32 bitstream_buffer_id,
size_t payload_size,
- bool key_frame) const {
- client_->BitstreamBufferReady(bitstream_buffer_id, payload_size, key_frame);
+ bool key_frame) {
miu 2014/12/20 03:37:58 Why is this not a const method anymore?
hellner1 2015/01/07 16:41:31 Probably (mistakenly) happened during refactoring.
+ client_->BitstreamBufferReady(bitstream_buffer_id,
+ payload_size,
+ key_frame);
}
-} // namespace test
-} // namespace cast
} // namespace media
« media/video/fake_video_encode_accelerator.h ('K') | « media/video/fake_video_encode_accelerator.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698