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

Unified Diff: chromecast/media/cma/backend/media_component_device_default.cc

Issue 1257013003: Load CMA backend from shared library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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: chromecast/media/cma/backend/media_component_device_default.cc
diff --git a/chromecast/media/cma/backend/media_component_device_default.cc b/chromecast/media/cma/backend/media_component_device_default.cc
index 3ed5f01f3956e2e5390804c48e7812f944a1e1e9..4c367dd69de61481ffab1a627c81a8ea31423a13 100644
--- a/chromecast/media/cma/backend/media_component_device_default.cc
+++ b/chromecast/media/cma/backend/media_component_device_default.cc
@@ -8,7 +8,10 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/thread_task_runner_handle.h"
-#include "chromecast/media/cma/base/decoder_buffer_base.h"
+#include "chromecast/public/media/cast_decoder_buffer.h"
+#include "chromecast/public/media/decrypt_context.h"
+#include "chromecast/public/media/media_pipeline_device_params.h"
+#include "chromecast/public/task_runner.h"
#include "media/base/buffers.h"
namespace chromecast {
@@ -19,6 +22,48 @@ namespace {
// Maximum number of frames that can be buffered.
const size_t kMaxFrameCount = 20;
+// Wraps base::Closure in the chromecast/public TaskRunner interface.
+class ClosureTask : public TaskRunner::Task {
+ public:
+ ClosureTask(const base::Closure& cb) : cb_(cb) {}
+ void Run() override { cb_.Run(); }
+
+ private:
+ base::Closure cb_;
+};
+
+// Returns whether or not transitioning from |state1| to |state2| is valid.
+inline static bool IsValidStateTransition(MediaComponentDevice::State state1,
+ MediaComponentDevice::State state2) {
+ if (state2 == state1)
+ return true;
+
+ // All states can transition to |kStateError|.
+ if (state2 == MediaComponentDevice::kStateError)
+ return true;
+
+ // All the other valid FSM transitions.
+ switch (state1) {
+ case MediaComponentDevice::kStateUninitialized:
+ return state2 == MediaComponentDevice::kStateIdle;
+ case MediaComponentDevice::kStateIdle:
+ return state2 == MediaComponentDevice::kStateRunning ||
+ state2 == MediaComponentDevice::kStatePaused ||
+ state2 == MediaComponentDevice::kStateUninitialized;
+ case MediaComponentDevice::kStatePaused:
+ return state2 == MediaComponentDevice::kStateIdle ||
+ state2 == MediaComponentDevice::kStateRunning;
+ case MediaComponentDevice::kStateRunning:
+ return state2 == MediaComponentDevice::kStateIdle ||
+ state2 == MediaComponentDevice::kStatePaused;
+ case MediaComponentDevice::kStateError:
+ return state2 == MediaComponentDevice::kStateUninitialized;
+
+ default:
+ return false;
+ }
+}
+
} // namespace
MediaComponentDeviceDefault::DefaultDecoderBuffer::DefaultDecoderBuffer()
@@ -29,8 +74,10 @@ MediaComponentDeviceDefault::DefaultDecoderBuffer::~DefaultDecoderBuffer() {
}
MediaComponentDeviceDefault::MediaComponentDeviceDefault(
+ const MediaPipelineDeviceParams& params,
MediaClockDevice* media_clock_device)
- : media_clock_device_(media_clock_device),
+ : task_runner_(params.task_runner),
+ media_clock_device_(media_clock_device),
state_(kStateUninitialized),
rendering_time_(::media::kNoTimestamp()),
decoded_frame_count_(0),
@@ -38,26 +85,25 @@ MediaComponentDeviceDefault::MediaComponentDeviceDefault(
scheduled_rendering_task_(false),
weak_factory_(this) {
weak_this_ = weak_factory_.GetWeakPtr();
- DetachFromThread();
+ thread_checker_.DetachFromThread();
}
MediaComponentDeviceDefault::~MediaComponentDeviceDefault() {
}
-void MediaComponentDeviceDefault::SetClient(const Client& client) {
- DCHECK(CalledOnValidThread());
- client_ = client;
+void MediaComponentDeviceDefault::SetClient(Client* client) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ client_.reset(client);
}
MediaComponentDevice::State MediaComponentDeviceDefault::GetState() const {
- DCHECK(CalledOnValidThread());
+ DCHECK(thread_checker_.CalledOnValidThread());
return state_;
}
bool MediaComponentDeviceDefault::SetState(State new_state) {
- DCHECK(CalledOnValidThread());
- if (!MediaComponentDevice::IsValidStateTransition(state_, new_state))
- return false;
+ DCHECK(thread_checker_.CalledOnValidThread());
+ DCHECK(IsValidStateTransition(state_, new_state));
state_ = new_state;
if (state_ == kStateIdle) {
@@ -67,17 +113,18 @@ bool MediaComponentDeviceDefault::SetState(State new_state) {
decoded_frame_count_ = 0;
decoded_byte_count_ = 0;
frames_.clear();
- pending_buffer_ = scoped_refptr<DecoderBufferBase>();
- frame_pushed_cb_.Reset();
+ pending_buffer_ = scoped_ptr<CastDecoderBuffer>();
+ frame_pushed_cb_.reset();
return true;
}
if (state_ == kStateRunning) {
if (!scheduled_rendering_task_) {
scheduled_rendering_task_ = true;
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&MediaComponentDeviceDefault::RenderTask, weak_this_));
+ task_runner_->PostTask(
+ new ClosureTask(
+ base::Bind(&MediaComponentDeviceDefault::RenderTask, weak_this_)),
+ 0);
}
return true;
}
@@ -85,48 +132,49 @@ bool MediaComponentDeviceDefault::SetState(State new_state) {
return true;
}
-bool MediaComponentDeviceDefault::SetStartPts(base::TimeDelta time) {
- DCHECK(CalledOnValidThread());
+bool MediaComponentDeviceDefault::SetStartPts(int64_t time_microseconds) {
+ DCHECK(thread_checker_.CalledOnValidThread());
DCHECK_EQ(state_, kStateIdle);
- rendering_time_ = time;
+ rendering_time_ = base::TimeDelta::FromMicroseconds(time_microseconds);
return true;
}
MediaComponentDevice::FrameStatus MediaComponentDeviceDefault::PushFrame(
- const scoped_refptr<DecryptContext>& decrypt_context,
- const scoped_refptr<DecoderBufferBase>& buffer,
- const FrameStatusCB& completion_cb) {
- DCHECK(CalledOnValidThread());
+ DecryptContext* decrypt_context_in,
+ CastDecoderBuffer* buffer_in,
+ FrameStatusCB* completion_cb_in) {
+ DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(state_ == kStatePaused || state_ == kStateRunning);
DCHECK(!is_eos_);
DCHECK(!pending_buffer_.get());
- DCHECK(buffer.get());
+ DCHECK(buffer_in);
+
+ scoped_ptr<DecryptContext> decrypt_context(decrypt_context_in);
+ scoped_ptr<FrameStatusCB> completion_cb(completion_cb_in);
+ scoped_ptr<CastDecoderBuffer> buffer(buffer_in);
if (buffer->end_of_stream()) {
is_eos_ = true;
return kFrameSuccess;
}
if (frames_.size() > kMaxFrameCount) {
- pending_buffer_ = buffer;
- frame_pushed_cb_ = completion_cb;
+ pending_buffer_ = buffer.Pass();
+ frame_pushed_cb_ = completion_cb.Pass();
return kFramePending;
}
DefaultDecoderBuffer fake_buffer;
fake_buffer.size = buffer->data_size();
- fake_buffer.pts = buffer->timestamp();
+ fake_buffer.pts = base::TimeDelta::FromMicroseconds(buffer->timestamp());
frames_.push_back(fake_buffer);
return kFrameSuccess;
}
-base::TimeDelta MediaComponentDeviceDefault::GetRenderingTime() const {
- return rendering_time_;
-}
-
-base::TimeDelta MediaComponentDeviceDefault::GetRenderingDelay() const {
+MediaComponentDeviceDefault::RenderingDelay
+MediaComponentDeviceDefault::GetRenderingDelay() const {
NOTIMPLEMENTED();
- return ::media::kNoTimestamp();
+ return RenderingDelay();
}
void MediaComponentDeviceDefault::RenderTask() {
@@ -135,13 +183,14 @@ void MediaComponentDeviceDefault::RenderTask() {
if (state_ != kStateRunning)
return;
- base::TimeDelta media_time = media_clock_device_->GetTime();
+ base::TimeDelta media_time = base::TimeDelta::FromMicroseconds(
+ media_clock_device_->GetTimeMicroseconds());
if (media_time == ::media::kNoTimestamp()) {
scheduled_rendering_task_ = true;
- base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&MediaComponentDeviceDefault::RenderTask, weak_this_),
- base::TimeDelta::FromMilliseconds(50));
+ task_runner_->PostTask(
+ new ClosureTask(
+ base::Bind(&MediaComponentDeviceDefault::RenderTask, weak_this_)),
+ 50);
return;
}
@@ -153,24 +202,27 @@ void MediaComponentDeviceDefault::RenderTask() {
if (pending_buffer_.get()) {
DefaultDecoderBuffer fake_buffer;
fake_buffer.size = pending_buffer_->data_size();
- fake_buffer.pts = pending_buffer_->timestamp();
+ fake_buffer.pts =
+ base::TimeDelta::FromMicroseconds(pending_buffer_->timestamp());
frames_.push_back(fake_buffer);
- pending_buffer_ = scoped_refptr<DecoderBufferBase>();
- base::ResetAndReturn(&frame_pushed_cb_).Run(kFrameSuccess);
+ pending_buffer_ = scoped_ptr<CastDecoderBuffer>();
+ frame_pushed_cb_->Run(kFrameSuccess);
+ frame_pushed_cb_.reset();
}
}
if (frames_.empty() && is_eos_) {
- if (!client_.eos_cb.is_null())
- client_.eos_cb.Run();
+ if (client_) {
+ client_->OnEndOfStream();
+ }
return;
}
scheduled_rendering_task_ = true;
- base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&MediaComponentDeviceDefault::RenderTask, weak_this_),
- base::TimeDelta::FromMilliseconds(50));
+ task_runner_->PostTask(
+ new ClosureTask(
+ base::Bind(&MediaComponentDeviceDefault::RenderTask, weak_this_)),
+ 50);
}
bool MediaComponentDeviceDefault::GetStatistics(Statistics* stats) const {

Powered by Google App Engine
This is Rietveld 408576698