Skip to content

Commit

Permalink
Revert of Extract state management from WebMediaPlayerImpl. (patchset c…
Browse files Browse the repository at this point in the history 
…hromium#32 id:620001 of https://codereview.chromium.org/1641423002/ )

Reason for revert:
This CL has made layout tests failed. See:
https://bugs.chromium.org/p/chromium/issues/detail?id=591930

Original issue's description:
> Extract state management from WebMediaPlayerImpl.
>
> WMPI recieves operations at any time but is backed by Pipeline which can
> only perform one operation at a time. This CL creates a helper class
> (PipelineController) to translate between the two so that WMPI does not need
> to handle the full cross product of states.
>
> Committed: https://crrev.com/aafb73c6460349c508a49e6e6de21e774ec80b5c
> Cr-Commit-Position: refs/heads/master@{#379168}

TBR=dalecurtis@chromium.org,wolenetz@chromium.org,xhwang@chromium.org,sandersd@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1759123003

Cr-Commit-Position: refs/heads/master@{#379243}
  • Loading branch information
yoichio authored and Commit bot committed Mar 4, 2016
1 parent bfc2951 commit 863bebf
Show file tree
Hide file tree
Showing 10 changed files with 352 additions and 890 deletions.
3 changes: 0 additions & 3 deletions media/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ component("media") {
"filters/opus_audio_decoder.h",
"filters/opus_constants.cc",
"filters/opus_constants.h",
"filters/pipeline_controller.cc",
"filters/pipeline_controller.h",
"filters/source_buffer_range.cc",
"filters/source_buffer_range.h",
"filters/source_buffer_stream.cc",
Expand Down Expand Up @@ -556,7 +554,6 @@ test("media_unittests") {
"filters/h264_parser_unittest.cc",
"filters/ivf_parser_unittest.cc",
"filters/jpeg_parser_unittest.cc",
"filters/pipeline_controller_unittest.cc",
"filters/source_buffer_stream_unittest.cc",
"filters/video_cadence_estimator_unittest.cc",
"filters/video_decoder_selector_unittest.cc",
Expand Down
25 changes: 0 additions & 25 deletions media/base/mock_filters.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,6 @@ using ::testing::Return;

namespace media {

MockPipeline::MockPipeline() {}

MockPipeline::~MockPipeline() {}

void MockPipeline::Start(Demuxer* demuxer,
scoped_ptr<Renderer> renderer,
const base::Closure& ended_cb,
const PipelineStatusCB& error_cb,
const PipelineStatusCB& seek_cb,
const PipelineMetadataCB& metadata_cb,
const BufferingStateCB& buffering_state_cb,
const base::Closure& duration_change_cb,
const AddTextTrackCB& add_text_track_cb,
const base::Closure& waiting_for_decryption_key_cb) {
Start(demuxer, &renderer, ended_cb, error_cb, seek_cb, metadata_cb,
buffering_state_cb, duration_change_cb, add_text_track_cb,
waiting_for_decryption_key_cb);
}

void MockPipeline::Resume(scoped_ptr<Renderer> renderer,
base::TimeDelta timestamp,
const PipelineStatusCB& seek_cb) {
Resume(&renderer, timestamp, seek_cb);
}

MockDemuxer::MockDemuxer() {}

MockDemuxer::~MockDemuxer() {}
Expand Down
67 changes: 0 additions & 67 deletions media/base/mock_filters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "media/base/decoder_buffer.h"
#include "media/base/decryptor.h"
#include "media/base/demuxer.h"
#include "media/base/pipeline.h"
#include "media/base/pipeline_status.h"
#include "media/base/renderer.h"
#include "media/base/text_track.h"
Expand All @@ -31,72 +30,6 @@

namespace media {

class MockPipeline : public Pipeline {
public:
MockPipeline();
virtual ~MockPipeline();

// Note: Start() and Resume() declarations are not actually overrides; they
// take scoped_ptr* instead of scoped_ptr so that they can be mock methods.
// Private stubs for Start() and Resume() implement the actual Pipeline
// interface by forwarding to these mock methods.
MOCK_METHOD10(Start,
void(Demuxer*,
scoped_ptr<Renderer>*,
const base::Closure&,
const PipelineStatusCB&,
const PipelineStatusCB&,
const PipelineMetadataCB&,
const BufferingStateCB&,
const base::Closure&,
const AddTextTrackCB&,
const base::Closure&));
MOCK_METHOD1(Stop, void(const base::Closure&));
MOCK_METHOD2(Seek, void(base::TimeDelta, const PipelineStatusCB&));
MOCK_METHOD1(Suspend, void(const PipelineStatusCB&));
MOCK_METHOD3(Resume,
void(scoped_ptr<Renderer>*,
base::TimeDelta,
const PipelineStatusCB&));

// TODO(sandersd): This should automatically return true between Start() and
// Stop(). (Or better, remove it from the interface entirely.)
MOCK_CONST_METHOD0(IsRunning, bool());

// TODO(sandersd): These should be regular getters/setters.
MOCK_CONST_METHOD0(GetPlaybackRate, double());
MOCK_METHOD1(SetPlaybackRate, void(double));
MOCK_CONST_METHOD0(GetVolume, float());
MOCK_METHOD1(SetVolume, void(float));

// TODO(sandersd): These should probably have setters too.
MOCK_CONST_METHOD0(GetMediaTime, base::TimeDelta());
MOCK_CONST_METHOD0(GetBufferedTimeRanges, Ranges<base::TimeDelta>());
MOCK_CONST_METHOD0(GetMediaDuration, base::TimeDelta());
MOCK_METHOD0(DidLoadingProgress, bool());
MOCK_CONST_METHOD0(GetStatistics, PipelineStatistics());

MOCK_METHOD2(SetCdm, void(CdmContext*, const CdmAttachedCB&));

private:
// Forwarding stubs (see comment above).
void Start(Demuxer* demuxer,
scoped_ptr<Renderer> renderer,
const base::Closure& ended_cb,
const PipelineStatusCB& error_cb,
const PipelineStatusCB& seek_cb,
const PipelineMetadataCB& metadata_cb,
const BufferingStateCB& buffering_state_cb,
const base::Closure& duration_change_cb,
const AddTextTrackCB& add_text_track_cb,
const base::Closure& waiting_for_decryption_key_cb) override;
void Resume(scoped_ptr<Renderer> renderer,
base::TimeDelta timestamp,
const PipelineStatusCB& seek_cb) override;

DISALLOW_COPY_AND_ASSIGN(MockPipeline);
};

class MockDemuxer : public Demuxer {
public:
MockDemuxer();
Expand Down
2 changes: 1 addition & 1 deletion media/blink/webmediaplayer_cast_android.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ void WebMediaPlayerCast::OnSeekComplete(const base::TimeDelta& current_time) {
DVLOG(1) << __FUNCTION__;
remote_time_at_ = base::TimeTicks::Now();
remote_time_ = current_time;
webmediaplayer_->OnPipelineSeeked(true);
webmediaplayer_->OnPipelineSeeked(true, PIPELINE_OK);
}

void WebMediaPlayerCast::OnMediaError(int error_type) {
Expand Down
Loading

0 comments on commit 863bebf

Please sign in to comment.