Initial implementation of stream switching in AdaptiveDemuxer.

media/filters/video_renderer_base.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/platform_thread.h"
 #include "media/base/buffers.h"
 #include "media/base/callback.h"
 #include "media/base/filter_host.h"
@@ skipping 297 matching lines @@
       // we get video frame with time-stamp greater than the duration.
       // In this case we should proceed anyway and try to obtain the
       // end-of-stream packet.
       scoped_refptr<VideoFrame> timeout_frame;
       bool new_frame_available = false;
       if (!pending_paint_) {
         // In this case, current frame could be recycled.
         timeout_frame = current_frame_;
         current_frame_ = frames_queue_ready_.front();
         frames_queue_ready_.pop_front();
+
+        if (current_frame_->width() != width_ ||
+            current_frame_->height() != height_) {

[Ami GONE FROM CHROMIUM, 2011/05/19 20:27:37]

I don't imagine we have any test coverage for the case of frame size changing
mid-stream.  Easy to add?

[acolwell GONE FROM CHROMIUM, 2011/05/20 01:26:37]

Removing the frame size changes for now. It was a quick hack and I didn't fully
explore the ramifications of changing the frame size mid-stream.

+          width_ = current_frame_->width();
+          height_ = current_frame_->height();
+          host()->SetVideoSize(width_, height_);
+        }
+
         new_frame_available = true;
       } else if (pending_paint_ && frames_queue_ready_.size() >= 2 &&
                  !frames_queue_ready_[1]->IsEndOfStream()) {
         // Painter could be really slow, therefore we had to skip frames if
         // 1. We had not reached end of stream.
         // 2. The next frame of current frame is also out-dated.
         base::TimeDelta next_remaining_time =
             frames_queue_ready_[1]->GetTimestamp() - host()->GetTime();
         if (next_remaining_time.InMicroseconds() <= 0) {
           // Since the current frame is still hold by painter/compositor, and
@@ skipping 289 matching lines @@
       return;
   }
 
   host()->SetError(status);
 
   if (callback.get())
     callback->Run();
 }
 
 }  // namespace media