MSE: Remove unused |success| StreamParser::InitCB argument

The only current source of a false |success| argument to StreamParser::InitCB is MPEGAudioStreamParserBase::ParseFrame(), which should not even run InitCB in that case. This CL removes this redundant InitCB parameter, preparing for some further refactoring of InitCB and NewConfigCB for compliant initialization segment received algorithm implementation. BUG=249428 TEST=No media_unittest or MSE layout test regressions locally on Linux Review URL: https://codereview.chromium.org/935763002 Cr-Commit-Position: refs/heads/master@{#316744}
Denger-Network · Feb 18, 2015 · 186b656 · 186b656
1 parent e0add0f
commit 186b656
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 35 deletions.
diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h
@@ -67,10 +67,8 @@ class MEDIA_EXPORT StreamParser {
   };
 
   // Indicates completion of parser initialization.
-  //   success - True if initialization was successful.
-  //   params - Stream parameters, in case of successful initialization.
-  typedef base::Callback<void(bool success,
-                              const InitParameters& params)> InitCB;
+  //   params - Stream parameters.
+  typedef base::Callback<void(const InitParameters& params)> InitCB;
 
   // Indicates when new stream configurations have been parsed.
   // First parameter - The new audio configuration. If the config is not valid

diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
@@ -195,8 +195,7 @@ class SourceState {
                     const StreamParser::BufferQueue& video_buffers,
                     const StreamParser::TextBufferQueueMap& text_map);
 
-  void OnSourceInitDone(bool success,
-                        const StreamParser::InitParameters& params);
+  void OnSourceInitDone(const StreamParser::InitParameters& params);
 
   CreateDemuxerStreamCB create_demuxer_stream_cb_;
   NewTextTrackCB new_text_track_cb_;
@@ -788,10 +787,9 @@ bool SourceState::OnNewBuffers(
   return true;
 }
 
-void SourceState::OnSourceInitDone(bool success,
-                                   const StreamParser::InitParameters& params) {
+void SourceState::OnSourceInitDone(const StreamParser::InitParameters& params) {
   auto_update_timestamp_offset_ = params.auto_update_timestamp_offset;
-  base::ResetAndReturn(&init_cb_).Run(success, params);
+  base::ResetAndReturn(&init_cb_).Run(params);
 }
 
 ChunkDemuxerStream::ChunkDemuxerStream(Type type,
@@ -1644,13 +1642,11 @@ bool ChunkDemuxer::IsSeekWaitingForData_Locked() const {
 }
 
 void ChunkDemuxer::OnSourceInitDone(
-    bool success,
     const StreamParser::InitParameters& params) {
-  DVLOG(1) << "OnSourceInitDone(" << success << ", "
-           << params.duration.InSecondsF() << ")";
+  DVLOG(1) << "OnSourceInitDone(" << params.duration.InSecondsF() << ")";
   lock_.AssertAcquired();
   DCHECK_EQ(state_, INITIALIZING);
-  if (!success || (!audio_ && !video_)) {
+  if (!audio_ && !video_) {
     ReportError_Locked(DEMUXER_ERROR_COULD_NOT_OPEN);
     return;
   }

diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
@@ -309,8 +309,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   bool CanEndOfStream_Locked() const;
 
   // SourceState callbacks.
-  void OnSourceInitDone(bool success,
-                        const StreamParser::InitParameters& params);
+  void OnSourceInitDone(const StreamParser::InitParameters& params);
 
   // Creates a DemuxerStream for the specified |type|.
   // Returns a new ChunkDemuxerStream instance if a stream of this type

diff --git a/media/formats/common/stream_parser_test_base.cc b/media/formats/common/stream_parser_test_base.cc
@@ -73,11 +73,9 @@ bool StreamParserTestBase::AppendDataInPieces(const uint8* data,
 }
 
 void StreamParserTestBase::OnInitDone(
-    bool success,
     const StreamParser::InitParameters& params) {
   EXPECT_TRUE(params.auto_update_timestamp_offset);
-  DVLOG(1) << __FUNCTION__ << "(" << success << ", "
-           << params.duration.InMilliseconds() << ", "
+  DVLOG(1) << __FUNCTION__ << "(" << params.duration.InMilliseconds() << ", "
            << params.auto_update_timestamp_offset << ")";
 }
 

diff --git a/media/formats/common/stream_parser_test_base.h b/media/formats/common/stream_parser_test_base.h
@@ -50,7 +50,7 @@ class StreamParserTestBase {
 
  private:
   bool AppendDataInPieces(const uint8* data, size_t length, size_t piece_size);
-  void OnInitDone(bool success, const StreamParser::InitParameters& params);
+  void OnInitDone(const StreamParser::InitParameters& params);
   bool OnNewConfig(const AudioDecoderConfig& audio_config,
                    const VideoDecoderConfig& video_config,
                    const StreamParser::TextTrackConfigMap& text_config);

diff --git a/media/formats/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc
@@ -512,8 +512,7 @@ bool Mp2tStreamParser::FinishInitializationIfNeeded() {
 
   // For Mpeg2 TS, the duration is not known.
   DVLOG(1) << "Mpeg2TS stream parser initialization done";
-  base::ResetAndReturn(&init_cb_)
-      .Run(true, InitParameters(kInfiniteDuration()));
+  base::ResetAndReturn(&init_cb_).Run(InitParameters(kInfiniteDuration()));
   is_initialized_ = true;
 
   return true;

diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
@@ -101,10 +101,8 @@ class Mp2tStreamParserTest : public testing::Test {
     return true;
   }
 
-  void OnInit(bool init_ok,
-              const StreamParser::InitParameters& params) {
-    DVLOG(1) << "OnInit: ok=" << init_ok
-             << ", dur=" << params.duration.InMilliseconds()
+  void OnInit(const StreamParser::InitParameters& params) {
+    DVLOG(1) << "OnInit: dur=" << params.duration.InMilliseconds()
              << ", autoTimestampOffset=" << params.auto_update_timestamp_offset;
   }
 

diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
@@ -315,7 +315,7 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) {
   }
 
   if (!init_cb_.is_null())
-    base::ResetAndReturn(&init_cb_).Run(true, params);
+    base::ResetAndReturn(&init_cb_).Run(params);
 
   if (!moov_->pssh.empty())
     OnEncryptedMediaInitData(moov_->pssh);

diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -60,9 +60,8 @@ class MP4StreamParserTest : public testing::Test {
     return true;
   }
 
-  void InitF(bool init_ok, const StreamParser::InitParameters& params) {
-    DVLOG(1) << "InitF: ok=" << init_ok
-             << ", dur=" << params.duration.InMilliseconds()
+  void InitF(const StreamParser::InitParameters& params) {
+    DVLOG(1) << "InitF: dur=" << params.duration.InMilliseconds()
              << ", autoTimestampOffset=" << params.auto_update_timestamp_offset;
   }
 

diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -221,16 +221,14 @@ int MPEGAudioStreamParserBase::ParseFrame(const uint8* data,
     timestamp_helper_->SetBaseTimestamp(base_timestamp);
 
     VideoDecoderConfig video_config;
-    bool success = config_cb_.Run(config_, video_config, TextTrackConfigMap());
+    if (!config_cb_.Run(config_, video_config, TextTrackConfigMap()))
+      return -1;
 
     if (!init_cb_.is_null()) {
       InitParameters params(kInfiniteDuration());
       params.auto_update_timestamp_offset = true;
-      base::ResetAndReturn(&init_cb_).Run(success, params);
+      base::ResetAndReturn(&init_cb_).Run(params);
     }
-
-    if (!success)
-      return -1;
   }
 
   if (metadata_frame)

diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
@@ -244,7 +244,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
       log_cb_));
 
   if (!init_cb_.is_null())
-    base::ResetAndReturn(&init_cb_).Run(true, params);
+    base::ResetAndReturn(&init_cb_).Run(params);
 
   return bytes_parsed;
 }