Add config change handling to SourceBufferStream & ChunkDemuxer

media/webm/webm_stream_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/webm/webm_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
@@ skipping 217 matching lines @@
     return false;
 
   byte_queue_.Push(buf, size);
 
   int result = 0;
   int bytes_parsed = 0;
   const uint8* cur = NULL;
   int cur_size = 0;
 
   byte_queue_.Peek(&cur, &cur_size);
-  do {
+  while (cur_size > 0) {
+    State oldState = state_;
     switch (state_) {
       case kParsingHeaders:
         result = ParseInfoAndTracks(cur, cur_size);
         break;
 
       case kParsingClusters:
         result = ParseCluster(cur, cur_size);
         break;
 
       case kWaitingForInit:
       case kError:
         return false;
     }
 
     if (result < 0) {
       ChangeState(kError);
       return false;
     }
 
+    if (state_ == oldState && result == 0)
+      break;
+
+    DCHECK_GE(result, 0);
     cur += result;
     cur_size -= result;
     bytes_parsed += result;
-  } while (result > 0 && cur_size > 0);
+  }
 
   byte_queue_.Pop(bytes_parsed);
   return true;
 }
 
 void WebMStreamParser::ChangeState(State new_state) {
   DVLOG(1) << "ChangeState() : " << state_ << " -> " << new_state;
   state_ = new_state;
 }
 
@@ skipping 148 matching lines @@
   if (!audio_buffers.empty() && !audio_cb_.Run(audio_buffers))
     return -1;
 
   if (!video_buffers.empty() && !video_cb_.Run(video_buffers))
     return -1;
 
   return bytes_parsed;
 }
 
 }  // namespace media