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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 315483002: MSE: Remove Chromium-side support for LegacyFrameProcessor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 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 | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 3341fcc86bc53bd80d9500c1dca93a32cc807a42..8a3bcacca8591d0e51371b4bae5cbf2f97149f29 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -18,7 +18,6 @@
#include "media/base/stream_parser_buffer.h"
#include "media/base/video_decoder_config.h"
#include "media/filters/frame_processor.h"
-#include "media/filters/legacy_frame_processor.h"
#include "media/filters/stream_parser_factory.h"
using base::TimeDelta;
@@ -1140,11 +1139,9 @@ void ChunkDemuxer::CancelPendingSeek(TimeDelta seek_time) {
base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK);
}
-ChunkDemuxer::Status ChunkDemuxer::AddId(
- const std::string& id,
- const std::string& type,
- std::vector<std::string>& codecs,
- const bool use_legacy_frame_processor) {
+ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
+ const std::string& type,
+ std::vector<std::string>& codecs) {
base::AutoLock auto_lock(lock_);
if ((state_ != WAITING_FOR_INIT && state_ != INITIALIZING) || IsValidId(id))
@@ -1169,16 +1166,9 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(
if (has_video)
source_id_video_ = id;
- scoped_ptr<FrameProcessorBase> frame_processor;
- if (use_legacy_frame_processor) {
- frame_processor.reset(new LegacyFrameProcessor(
- base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary,
- base::Unretained(this))));
- } else {
- frame_processor.reset(new FrameProcessor(
- base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary,
- base::Unretained(this))));
- }
+ scoped_ptr<FrameProcessorBase> frame_processor(
acolwell GONE FROM CHROMIUM 2014/06/13 18:26:42 s/Base//?
wolenetz 2014/06/16 20:01:38 Done. I'm leaving the merger of FrameProcessorBase
+ new FrameProcessor(base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary,
+ base::Unretained(this))));
scoped_ptr<SourceState> source_state(
new SourceState(stream_parser.Pass(),
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698