Allow simultaneous audio and video config change

media/base/android/media_source_player.cc

Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index da4b55f47ed3d40cc5b2ee1494a34df58886217d..478fbe5e11877fed68e5ed16eb2ac8082fc5603d 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -655,7 +655,16 @@ void MediaSourcePlayer::DecodeMoreAudio() {
 
   // Failed to start the next decode.
   // Wait for demuxer ready message.
+  DCHECK(!reconfig_audio_decoder_);
   reconfig_audio_decoder_ = true;
+
+  // Config change may have just been detected on the other stream. If so,
+  // don't send a duplicate demuxer config request.
+  if (IsEventPending(CONFIG_CHANGE_EVENT_PENDING)) {
+    DCHECK(reconfig_video_decoder_);

[xhwang, 2013/11/04 21:55:48]

hmm, isn't this always true given line 659? Or are we trying to remind ourselves
on that? Anyway, let's land this CL first!

[wolenetz, 2013/11/04 22:00:55]

This DCHECK is to ensure that the CONFIG_CHANGE_EVENT_PENDING was set already,
but for the *other* stream (the video stream). We already have line 658
protecting against attempted double-setting of this pending event for the same
stream. DecodeMoreVideo() has similar (with 'audio' and 'video' swapped).

[xhwang1, 2013/11/05 02:30:21]

Oh, I didn't realize it's "video", not "audio". Sorry for the confusion.

+    return;
+  }
+
   SetPendingEvent(CONFIG_CHANGE_EVENT_PENDING);
   ProcessPendingEvents();
 }
@@ -675,12 +684,21 @@ void MediaSourcePlayer::DecodeMoreVideo() {
 
   // Failed to start the next decode.
   // Wait for demuxer ready message.
-  reconfig_video_decoder_ = true;
 
   // After this detection of video config change, next video data received
   // will begin with I-frame.
   next_video_data_is_iframe_ = true;
 
+  DCHECK(!reconfig_video_decoder_);
+  reconfig_video_decoder_ = true;
+
+  // Config change may have just been detected on the other stream. If so,
+  // don't send a duplicate demuxer config request.
+  if (IsEventPending(CONFIG_CHANGE_EVENT_PENDING)) {
+    DCHECK(reconfig_audio_decoder_);
+    return;
+  }
+
   SetPendingEvent(CONFIG_CHANGE_EVENT_PENDING);
   ProcessPendingEvents();
 }