Clear any pending surface change prior to checking media crypto in MSP::ConfigureVideoDecoderJob()

media/base/android/media_source_player.cc

 // Copyright (c) 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/media_source_player.h"
 
 #include <limits>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 305 matching lines @@
     audio_timestamp_helper_->SetBaseTimestamp(GetCurrentTime());
   } else {
     audio_timestamp_helper_.reset();
   }
 
   video_codec_ = configs.video_codec;
   width_ = configs.video_size.width();
   height_ = configs.video_size.height();
   is_video_encrypted_ = configs.is_video_encrypted;
 
   manager()->OnMediaMetadataChanged(

[wolenetz, 2013/10/31 20:34:24]

Note, this already occurs prior to |video_decoder_job_| creation attempts in
ConfigureVideoDecoderJob() (which will be unsuccessful until configs arrive), so
the ContentVideoView could stop pending player readiness (to stop animation and
setup controls) even before successful |video_decoder_job_| creation. This is
not a regression though.

       player_id(), duration_, width_, height_, true);
 
   if (IsEventPending(CONFIG_CHANGE_EVENT_PENDING)) {
     if (reconfig_audio_decoder_)
       ConfigureAudioDecoderJob();
 
     if (reconfig_video_decoder_)
       ConfigureVideoDecoderJob();
 
     ClearPendingEvent(CONFIG_CHANGE_EVENT_PENDING);
@@ skipping 383 matching lines @@
 
 void MediaSourcePlayer::ConfigureVideoDecoderJob() {
   if (!HasVideo() || surface_.IsEmpty()) {
     video_decoder_job_.reset();
     if (IsEventPending(SURFACE_CHANGE_EVENT_PENDING))
       ClearPendingEvent(SURFACE_CHANGE_EVENT_PENDING);
     return;
   }
 
   // Create video decoder job only if config changes or we don't have a job.
-  if (video_decoder_job_ && !reconfig_video_decoder_)
+  if (video_decoder_job_ && !reconfig_video_decoder_) {
+    DCHECK(!IsEventPending(SURFACE_CHANGE_EVENT_PENDING));
     return;
+  }
 
   if (reconfig_video_decoder_) {
     // No hack browser seek should be required. I-Frame must be next.
     DCHECK(next_video_data_is_iframe_) << "Received video data between "
         << "detecting video config change and reconfiguring video decoder";
   }
 
+  DCHECK(!video_decoder_job_ || !video_decoder_job_->is_decoding());
+
   // If uncertain that video I-frame data is next and there is no seek already
   // in process, request browser demuxer seek so the new decoder will decode
   // an I-frame first. Otherwise, the new MediaCodec might crash. See b/8950387.
+  // Eventual OnDemuxerSeekDone() will trigger ProcessPendingEvents() and
+  // continue from here.
   // TODO(wolenetz): Instead of doing hack browser seek, replay cached data
   // since last keyframe. See http://crbug.com/304234.
   if (!next_video_data_is_iframe_ && !IsEventPending(SEEK_EVENT_PENDING)) {
     BrowserSeekToCurrentTime();
     return;
   }
 
+  // Release the old VideoDecoderJob first so the surface can get released.
+  // Android does not allow 2 MediaCodec instances use the same surface.
+  video_decoder_job_.reset();
+
+  // Now that we have ensured the job is reset, clear any pending surface change
+  // event. If there was such an event, eventual job re-creation, below, will
+  // use the current |surface_|.
+  if (IsEventPending(SURFACE_CHANGE_EVENT_PENDING))
+    ClearPendingEvent(SURFACE_CHANGE_EVENT_PENDING);
+
   base::android::ScopedJavaLocalRef<jobject> media_crypto = GetMediaCrypto();
   if (is_video_encrypted_ && media_crypto.is_null())
     return;
 
-  DCHECK(!video_decoder_job_ || !video_decoder_job_->is_decoding());
-
   DVLOG(1) << __FUNCTION__ << " : creating new video decoder job";
 
-  // Release the old VideoDecoderJob first so the surface can get released.
-  // Android does not allow 2 MediaCodec instances use the same surface.
-  video_decoder_job_.reset();
   // Create the new VideoDecoderJob.
   bool is_secure = IsProtectedSurfaceRequired();
   video_decoder_job_.reset(
       VideoDecoderJob::Create(video_codec_,
                               is_secure,
                               gfx::Size(width_, height_),
                               surface_.j_surface().obj(),
                               media_crypto.obj(),
                               base::Bind(&DemuxerAndroid::RequestDemuxerData,
                                          base::Unretained(demuxer_.get()),
                                          DemuxerStream::VIDEO)));
   if (video_decoder_job_) {
     video_decoder_job_->BeginPrerolling(preroll_timestamp_);
     reconfig_video_decoder_ = false;
   }
 
-  if (IsEventPending(SURFACE_CHANGE_EVENT_PENDING))
-    ClearPendingEvent(SURFACE_CHANGE_EVENT_PENDING);
-
   // Inform the fullscreen view the player is ready.
   // TODO(qinmin): refactor MediaPlayerBridge so that we have a better way
   // to inform ContentVideoView.
   manager()->OnMediaMetadataChanged(
       player_id(), duration_, width_, height_, true);
 }
 
 void MediaSourcePlayer::OnDecoderStarved() {
   DVLOG(1) << __FUNCTION__;
   SetPendingEvent(PREFETCH_REQUEST_EVENT_PENDING);
@@ skipping 98 matching lines @@
 
 void MediaSourcePlayer::ClearPendingEvent(PendingEventFlags event) {
   DVLOG(1) << __FUNCTION__ << "(" << GetEventName(event) << ")";
   DCHECK_NE(event, NO_EVENT_PENDING);
   DCHECK(IsEventPending(event)) << GetEventName(event);
 
   pending_event_ &= ~event;
 }
 
 }  // namespace media