Allow simultaneous audio and video config change

media/base/android/media_source_player.h

Index: media/base/android/media_source_player.h
diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
index 3c16689f7ddd43869f244fde0207e24c693ca3fd..3f921de553d72dd80b44107eeaa8734d35454917 100644
--- a/media/base/android/media_source_player.h
+++ b/media/base/android/media_source_player.h
@@ -107,9 +107,13 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
   // 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();