Allow simultaneous audio and video config change

media/base/android/media_source_player.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 89 matching lines @@
   // Handle pending events when all the decoder jobs finished.
   void ProcessPendingEvents();
 
   // Helper method to configure the decoder jobs.
   void ConfigureVideoDecoderJob();
   void ConfigureAudioDecoderJob();
 
   // Flush the decoders and clean up all the data needs to be decoded.
   void ClearDecodingData();
 
-  // Called to decoder more data.
-  void DecodeMoreAudio();
-  void DecodeMoreVideo();
+  // Called to decode more data.
+  // If |*_change_already_pending| is true and |kConfigChanged| is detected
+  // during the call, then redundant setting of |CONFIG_CHANGE_EVENT_PENDING|
+  // and call of ProcessPendingEvents() is skipped. This allows simultaneous
+  // audio and video config change, such as may occur during OnPrefetchDone().
+  void DecodeMoreAudio(bool video_change_already_pending);
+  void DecodeMoreVideo(bool audio_change_already_pending);
 
   // Functions check whether audio/video is present.
   bool HasVideo();
   bool HasAudio();
 
   // Determine seekability based on duration.
   bool Seekable();
 
   // Called when the |decoder_starvation_callback_| times out.
   void OnDecoderStarved();
@@ skipping 134 matching lines @@
   // try to start playback again.
   bool is_waiting_for_key_;
 
   friend class MediaSourcePlayerTest;
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_