Changeset 106 for trunk/sources/applications/applestreamingclient/src/clientcontext.cpp

Timestamp:

08/26/10 19:37:23 (21 months ago)

Author:

shiretu

Message:

-- android stuff

File:

• trunk/sources/applications/applestreamingclient/src/clientcontext.cpp (modified) (2 diffs)

trunk/sources/applications/applestreamingclient/src/clientcontext.cpp

@@ -358 +358 @@
 
         //5. Continue feeding until we have stream capabilities
-        while (GETAVAILABLEBYTESCOUNT(_avData) > 8192) {
-                if ((pStream->GetCapabilities()->videoCodecId == CODEC_VIDEO_AVC)
-                                && (pStream->GetCapabilities()->audioCodecId == CODEC_AUDIO_AAC)) {
-                        _pEventSink->SignalStreamRegistered(_streamName);
-                        break;
-                }
-                if (!pTS->SignalInputData(_avData)) {
-                        FATAL("Unable to feed TS protocol");
-                        return false;
+        if ((pStream->GetCapabilities()->videoCodecId != CODEC_VIDEO_AVC)
+                        || (pStream->GetCapabilities()->audioCodecId != CODEC_AUDIO_AAC)) {
+                while (GETAVAILABLEBYTESCOUNT(_avData) > 8192) {
+                        if ((pStream->GetCapabilities()->videoCodecId == CODEC_VIDEO_AVC)
+                                        && (pStream->GetCapabilities()->audioCodecId == CODEC_AUDIO_AAC)) {
+                                _pEventSink->SignalStreamRegistered(_streamName);
+                                break;
+                        }
+                        if (!pTS->SignalInputData(_avData)) {
+                                FATAL("Unable to feed TS protocol");
+                                return false;
+                        }
+                }
+                if ((pStream->GetCapabilities()->videoCodecId != CODEC_VIDEO_AVC)
+                                || (pStream->GetCapabilities()->audioCodecId != CODEC_AUDIO_AAC)) {
+                        FINEST("SPS/PPS not yet available");
+                        return true;
                 }
         }
@@ -632 +640 @@
         customParameters["itemUri"] = itemUri;
         customParameters["bw"] = bw;
-        replace(keyUri, "http://www.mlb.com", "https://qa.mlb.com");
         return FetchURI(keyUri, "key", customParameters);
 }