Changeset 63

Timestamp:

08/11/10 16:51:36 (18 months ago)

Author:

shiretu

Message:

-- added more APIs to the android apple streaming

Location:

trunk

Files:

• builders/androidapplestreaming/src/com/rtmpd/CommandsInterface.java (modified) (2 diffs)
• sources/androidapplestreaming/include/api.h (modified) (1 diff)
• sources/androidapplestreaming/src/api.cpp (modified) (2 diffs)
• sources/androidapplestreaming/src/jniwrapper.cpp (modified) (2 diffs)
• sources/applications/applestreamingclient/include/protocols/variant/messagestructure.h (modified) (3 diffs)

trunk/builders/androidapplestreaming/src/com/rtmpd/CommandsInterface.java

@@ -16 +16 @@
         public native HashMap<Object, Object> ContextCloseAll();
 
-        public native HashMap<Object, Object> CommandPlay(int contextId,
-                        String m3u8Uri, String httpSessionId, String keyPassword);
+        public native HashMap<Object, Object> CommandPlay(int contextId, String m3u8Uri, String httpSessionId, String keyPassword);
 
         public native HashMap<Object, Object> CommandPause(int contextId);
@@ -23 +22 @@
         public native HashMap<Object, Object> CommandResume(int contextId);
 
+        public native HashMap<Object, Object> CommandSelectBandwidth(int contextId, int bandwidth);
+
+        public native HashMap<Object, Object> CommandSeek(int contextId, double value);
+
+        public native HashMap<Object, Object> CommandSelectAVChannels(int contextId, int audio, int video);
+
         public native HashMap<Object, Object> InfoListStreams(int contextId);
 
         public native HashMap<Object, Object> InfoListAllStreams();
+
+        public native HashMap<Object, Object> InfoBandwidth(int contextId);
+
+        public native HashMap<Object, Object> InfoAllBandwidth();
+
+        public native HashMap<Object, Object> InfoPlayback(int contextId);
+
+        public native HashMap<Object, Object> InfoAllPlayback();
 }
+

trunk/sources/androidapplestreaming/include/api.h

@@ -35 +35 @@
 Variant CommandPause(uint32_t contextId);
 Variant CommandResume(uint32_t contextId);
+Variant CommandSelectBandwidth(uint32_t contextId, uint32_t bandwidth);
+Variant CommandSeek(uint32_t contextId, double value);
+Variant CommandSelectAVChannels(uint32_t contextId, uint32_t audioChannel,
+                uint32_t videoChannel);
 
 Variant InfoListStreams(uint32_t contextId);
 Variant InfoListAllStreams();
+Variant InfoBandwidth(uint32_t contextId);
+Variant InfoAllBandwidth();
+Variant InfoPlayback(uint32_t contextId);
+Variant InfoAllPlayback();
 
 #endif  /* _API_H */

trunk/sources/androidapplestreaming/src/api.cpp

@@ -218 +218 @@
 }
 
+Variant CommandSelectBandwidth(uint32_t contextId, uint32_t bandwidth) {
+        Variant request;
+        ASC_REQ_BUILD_COMMAND_SELECT_BANDWIDTH(request, contextId, bandwidth);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
+Variant CommandSeek(uint32_t contextId, double value) {
+        Variant request;
+        ASC_REQ_BUILD_COMMAND_SEEK(request, contextId, value);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
+Variant CommandSelectAVChannels(uint32_t contextId, uint32_t audioChannel,
+                uint32_t videoChannel) {
+        Variant request;
+        ASC_REQ_BUILD_COMMAND_SELECT_AV_CHANNELS(request, contextId, audioChannel, videoChannel);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
 Variant InfoListStreams(uint32_t contextId) {
         Variant request;
@@ -233 +258 @@
         return response;
 }
+
+Variant InfoBandwidth(uint32_t contextId) {
+        /*
+         * Variant CLIGetAvailableBandwidths();
+         * Variant CLIGetMeasuredBandwidth();
+         * Variant CLIGetSelectedBandwidth();
+         */
+        Variant request;
+        ASC_REQ_BUILD_INFO_BANDWIDTH(request, contextId);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
+Variant InfoAllBandwidth() {
+        Variant request;
+        ASC_REQ_BUILD_INFO_ALL_BANDWIDTH(request);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
+Variant InfoPlayback(uint32_t contextId) {
+        Variant request;
+        ASC_REQ_BUILD_INFO_PLAYBACK(request, contextId);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}
+
+Variant InfoAllPlayback() {
+        /*
+         * Variant CLIGetSeekRange();
+         * Variant CLIGetVideoChannels();
+         * Variant CLIGetAudioChannels();
+         */
+        Variant request;
+        ASC_REQ_BUILD_INFO_ALL_PLAYBACK(request);
+        Variant response;
+        SEND_VARIANT_REQUEST(request, response);
+        return response;
+}

trunk/sources/androidapplestreaming/src/jniwrapper.cpp

@@ -79 +79 @@
 }
 
+extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandSelectBandwidth(
+                JNIEnv* pEnv, jobject thiz, jint contextId, jint bandwidth) {
+        Variant result = CommandSelectBandwidth((uint32_t) contextId,
+                        (uint32_t) bandwidth);
+        return VariantToJObject(result, pEnv);
+}
+
+extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandSeek(
+                JNIEnv* pEnv, jobject thiz, jint contextId, jdouble value) {
+        Variant result = CommandSeek((uint32_t) contextId, (double) value);
+        return VariantToJObject(result, pEnv);
+}
+
+extern "C" jobject Java_com_rtmpd_CommandsInterface_CommandSelectAVChannels(
+                JNIEnv* pEnv, jobject thiz, jint contextId, jint audio, jint video) {
+        Variant result = CommandSelectAVChannels((uint32_t) contextId,
+                        (uint32_t) audio, (uint32_t) video);
+        return VariantToJObject(result, pEnv);
+}
+
 extern "C" jobject Java_com_rtmpd_CommandsInterface_InfoListStreams(
                 JNIEnv* pEnv, jobject thiz, jint contextId) {
@@ -88 +108 @@
                 JNIEnv* pEnv, jobject thiz) {
         Variant result = InfoListAllStreams();
+        return VariantToJObject(result, pEnv);
+}
+
+extern "C" jobject Java_com_rtmpd_CommandsInterface_InfoBandwidth(
+                JNIEnv* pEnv, jobject thiz, jint contextId) {
+        Variant result = InfoBandwidth((uint32_t) contextId);
+        return VariantToJObject(result, pEnv);
+}
+
+extern "C" jobject Java_com_rtmpd_CommandsInterface_InfoAllBandwidth(
+                JNIEnv* pEnv, jobject thiz) {
+        Variant result = InfoAllBandwidth();
+        return VariantToJObject(result, pEnv);
+}
+
+extern "C" jobject Java_com_rtmpd_CommandsInterface_InfoPlayback(
+                JNIEnv* pEnv, jobject thiz, jint contextId) {
+        Variant result = InfoPlayback((uint32_t) contextId);
+        return VariantToJObject(result, pEnv);
+}
+
+extern "C" jobject Java_com_rtmpd_CommandsInterface_InfoAllPlayback(
+                JNIEnv* pEnv, jobject thiz) {
+        Variant result = InfoAllPlayback();
         return VariantToJObject(result, pEnv);
 }

trunk/sources/applications/applestreamingclient/include/protocols/variant/messagestructure.h

@@ -23 +23 @@
 #define INCLUDE_DEBUG_LOCATIONS
 
-#define ASC_REQ_TYPE_CONTEXT_CREATE                     "contextCreate"
-#define ASC_REQ_TYPE_CONTEXT_LIST                       "contextList"
-#define ASC_REQ_TYPE_CONTEXT_CLOSE                      "contextClose"
-#define ASC_REQ_TYPE_CONTEXT_CLOSE_ALL          "contextCloseAll"
-#define ASC_REQ_TYPE_COMMAND_PLAY                       "commandPlay"
-#define ASC_REQ_TYPE_COMMAND_PAUSE                      "commandPause"
-#define ASC_REQ_TYPE_COMMAND_RESUME                     "commandResume"
-#define ASC_REQ_TYPE_INFO_LIST_STREAMS          "listStreams"
-#define ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS      "listAllStreams"
-
-#define ASC_REQ_COMMAND_PLAY_URI_KEY                    "uri"
-#define ASC_REQ_COMMAND_PLAY_SESSION_ID_KEY             "sessionId"
-#define ASC_REQ_COMMAND_PLAY_PASSWORD_KEY       "keyPassword"
+#define ASC_REQ_TYPE_CONTEXT_CREATE                             "contextCreate"
+#define ASC_REQ_TYPE_CONTEXT_LIST                               "contextList"
+#define ASC_REQ_TYPE_CONTEXT_CLOSE                              "contextClose"
+#define ASC_REQ_TYPE_CONTEXT_CLOSE_ALL                  "contextCloseAll"
+
+#define ASC_REQ_TYPE_COMMAND_PLAY                               "commandPlay"
+#define ASC_REQ_TYPE_COMMAND_PAUSE                              "commandPause"
+#define ASC_REQ_TYPE_COMMAND_RESUME                             "commandResume"
+#define ASC_REQ_TYPE_COMMAND_SELECT_BANDWIDTH   "commandSelectBandwidth"
+#define ASC_REQ_TYPE_COMMAND_SEEK                               "commandSeek"
+#define ASC_REQ_TYPE_COMMAND_SELECT_AV_CHANNELS "commandSelectAVChannels"
+
+#define ASC_REQ_TYPE_INFO_LIST_STREAMS                  "infoListStreams"
+#define ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS              "infoListAllStreams"
+#define ASC_REQ_TYPE_INFO_BANDWIDTH                             "infoBandwidth"
+#define ASC_REQ_TYPE_INFO_ALL_BANDWIDTH                 "infoAllBandwidth"
+#define ASC_REQ_TYPE_INFO_PLAYBACK                              "infoPlayback"
+#define ASC_REQ_TYPE_INFO_ALL_PLAYBACK                  "infoAllPlayback"
+
+#define ASC_REQ_COMMAND_PLAY_URI_KEY                            "uri"
+#define ASC_REQ_COMMAND_PLAY_SESSION_ID_KEY                     "sessionId"
+#define ASC_REQ_COMMAND_PLAY_PASSWORD_KEY                       "keyPassword"
+#define ASC_REQ_COMMAND_SELECT_BANDWIDTH_BANDWIDTH      "bandwidth"
+#define ASC_REQ_COMMAND_SEEK_POINT                                      "point"
+#define ASC_REQ_COMMAND_SELECT_AV_CHANNELS_AUDIO        "audio"
+#define ASC_REQ_COMMAND_SELECT_AV_CHANNELS_VIDEO        "video"
 
 #define ASC_RES_CONTEXT_CREATE_CONTEXT_ID_KEY   "contextId"
@@ -119 +132 @@
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_RESUME,contextId,Variant())
 
+#define ASC_REQ_BUILD_COMMAND_SELECT_BANDWIDTH(v,contextId,value) \
+do { \
+        Variant params; \
+        params[ASC_REQ_COMMAND_SELECT_BANDWIDTH_BANDWIDTH]=(uint32_t)value; \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SELECT_BANDWIDTH,contextId,params); \
+} while(0)
+
+#define ASC_REQ_BUILD_COMMAND_SEEK(v,contextId,value) \
+do { \
+        Variant params; \
+        params[ASC_REQ_COMMAND_SEEK_POINT]=(double)value; \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SEEK,contextId,params); \
+} while(0)
+
+#define ASC_REQ_BUILD_COMMAND_SELECT_AV_CHANNELS(v,contextId,audio,video) \
+do { \
+        Variant params; \
+        params[ASC_REQ_COMMAND_SELECT_AV_CHANNELS_AUDIO]=(uint32_t)audio; \
+        params[ASC_REQ_COMMAND_SELECT_AV_CHANNELS_VIDEO]=(uint32_t)video; \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_COMMAND_SELECT_AV_CHANNELS,contextId,params); \
+} while(0)
+
 #define ASC_REQ_BUILD_INFO_LIST_STREAMS(v,contextId) \
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_LIST_STREAMS,contextId,Variant())
@@ -125 +160 @@
         ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_LIST_ALL_STREAMS,0,Variant())
 
+#define ASC_REQ_BUILD_INFO_BANDWIDTH(v,contextId) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_BANDWIDTH,contextId,Variant())
+
+#define ASC_REQ_BUILD_INFO_ALL_BANDWIDTH(v) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_ALL_BANDWIDTH,0,Variant())
+
+#define ASC_REQ_BUILD_INFO_PLAYBACK(v,contextId) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_PLAYBACK,contextId,Variant())
+
+#define ASC_REQ_BUILD_INFO_ALL_PLAYBACK(v) \
+        ASC_REQ_BUILD(v,ASC_REQ_TYPE_INFO_ALL_PLAYBACK,0,Variant())
 
 #define ASC_RES_BUILD(r,status,params) \