Check that the ABQ mime type matches the expectations

The code in audioPlayer_getAndroidObjectTypeForSourceSink assumes
that an android buffer queue source combined with an output mix
sink is an mpegts source, while it it assumes that it is an adts
source if it is combined with a simple buffer queue sink. This
assumption never was verified before, making the set up actually
seem to succeed even though the data is interpreted as the wrong
format.

Change-Id: I7e031ec8139fa2d770737935eb9acd3506d3fa3f

1 files changed, 8 insertions, 0 deletions

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index d72cf4b..04895b9 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1037,6 +1037,10 @@ SLresult android_audioPlayer_checkSourceSink(CAudioPlayer *pAudioPlayer)
                             (char*)df_mime->mimeType, XA_ANDROID_MIME_MP2TS);
                     return SL_RESULT_CONTENT_UNSUPPORTED;
                 }
+                if (pAudioPlayer->mAndroidObjType != AUDIOPLAYER_FROM_TS_ANDROIDBUFFERQUEUE) {
+                    SL_LOGE("Invalid sink for container SL_CONTAINERTYPE_MPEG_TS");
+                    return SL_RESULT_PARAMETER_INVALID;
+                }
                 break;
             case SL_CONTAINERTYPE_RAW:
             case SL_CONTAINERTYPE_AAC:
@@ -1048,6 +1052,10 @@ SLresult android_audioPlayer_checkSourceSink(CAudioPlayer *pAudioPlayer)
                             SL_ANDROID_MIME_AACADTS);
                     return SL_RESULT_CONTENT_UNSUPPORTED;
                 }
+                if (pAudioPlayer->mAndroidObjType != AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE) {
+                    SL_LOGE("Invalid sink for container SL_CONTAINERTYPE_AAC");
+                    return SL_RESULT_PARAMETER_INVALID;
+                }
                 break;
             default:
                 SL_LOGE("Cannot create player with SL_DATALOCATOR_ANDROIDBUFFERQUEUE data source "