Initial implementation of stream switching in AdaptiveDemuxer.

media/video/ffmpeg_video_decode_engine.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 "media/video/ffmpeg_video_decode_engine.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/task.h"
 #include "media/base/buffers.h"
@@ skipping 285 matching lines @@
       ConvertFromTimeBase(doubled_time_base, 2 + av_frame_->repeat_pict);
 
   if (!direct_rendering_) {
     // Available frame is guaranteed, because we issue as much reads as
     // available frame, except the case of |frame_decoded| == 0, which
     // implies decoder order delay, and force us to read more inputs.
     DCHECK(frame_queue_available_.size());
     video_frame = frame_queue_available_.front();
     frame_queue_available_.pop_front();
 
+    if ((video_frame->width() != codec_context_->width) ||
+        (video_frame->height() != codec_context_->height)) {
+

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

extra newline

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

Done.

+      VideoFrame::CreateFrame(VideoFrame::YV12,
+                              codec_context_->width,
+                              codec_context_->height,
+                              kNoTimestamp,
+                              kNoTimestamp,
+                              &video_frame);
+    }
+
     // Copy the frame data since FFmpeg reuses internal buffers for AVFrame
     // output, meaning the data is only valid until the next
     // avcodec_decode_video() call.
     size_t height = codec_context_->height;
     CopyPlane(VideoFrame::kYPlane, video_frame.get(), av_frame_.get(), height);
     CopyPlane(VideoFrame::kUPlane, video_frame.get(), av_frame_.get(), height);
     CopyPlane(VideoFrame::kVPlane, video_frame.get(), av_frame_.get(), height);
   } else {
     // Get the VideoFrame from allocator which associate with av_frame_.
     video_frame = allocator_->DecodeDone(codec_context_, av_frame_.get());
@@ skipping 66 matching lines @@
       break;
   }
   return VideoFrame::INVALID;
 }
 
 }  // namespace media
 
 // Disable refcounting for this object because this object only lives
 // on the video decoder thread and there's no need to refcount it.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::FFmpegVideoDecodeEngine);