support adaptive playback in MSE

media/base/android/video_decoder_job.cc

 // Copyright 2013 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/base/android/video_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread.h"
 #include "media/base/android/media_codec_bridge.h"
@@ skipping 74 matching lines @@
   return true;
 }
 
 void VideoDecoderJob::UpdateDemuxerConfigs(const DemuxerConfigs& configs) {
   video_codec_ = configs.video_codec;
   width_ = configs.video_size.width();
   height_ = configs.video_size.height();
   set_is_content_encrypted(configs.is_video_encrypted);
 }
 
+bool VideoDecoderJob::IsCodecReconfigureNeeded(
+    const DemuxerConfigs& configs) const {
+  if (!media_codec_bridge_)
+    return true;
+
+  if (!AreDemuxerConfigsChanged(configs))
+    return false;
+
+  bool only_size_changed = false;
+  if (video_codec_ == configs.video_codec &&
+      is_content_encrypted() == configs.is_video_encrypted) {
+    only_size_changed = true;
+  }
+
+  return !only_size_changed ||
+      !static_cast<VideoCodecBridge*>(media_codec_bridge_.get())->
+          IsAdaptivePlaybackSupported(width_, height_);

[wolenetz, 2014/06/06 23:28:07]

s/width_/configs.video_size.width()/
s/height_/configs.video_size.height()/

[qinmin, 2014/06/07 01:31:55]

Done. A stupid mistake :(

+}
+
 bool VideoDecoderJob::AreDemuxerConfigsChanged(
     const DemuxerConfigs& configs) const {
   return video_codec_ != configs.video_codec ||
       is_content_encrypted() != configs.is_video_encrypted ||
       width_ != configs.video_size.width() ||
       height_ != configs.video_size.height();
 }
 
 bool VideoDecoderJob::CreateMediaCodecBridgeInternal() {
   if (surface_.IsEmpty()) {
@@ skipping 27 matching lines @@
 void VideoDecoderJob::OnMediaCodecBridgeReleased() {
   release_resources_cb_.Run();
 }
 
 bool VideoDecoderJob::IsProtectedSurfaceRequired() {
   return is_content_encrypted() && drm_bridge() &&
       drm_bridge()->IsProtectedSurfaceRequired();
 }
 
 }  // namespace media