Changeset 106
- Timestamp:
- 08/26/10 18:37:23 (18 months ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
builders/netbeans/osx/applestreamingclient/nbproject/Makefile-Debug.mk (modified) (2 diffs)
-
builders/netbeans/osx/applestreamingclient/nbproject/Makefile-Release.mk (modified) (3 diffs)
-
builders/netbeans/osx/applestreamingclient/nbproject/configurations.xml (modified) (3 diffs)
-
sources/androidapplestreaming/src/main.cpp (modified) (2 diffs)
-
sources/applications/applestreamingclient/src/clientcontext.cpp (modified) (2 diffs)
-
sources/thelib/include/protocols/rtp/connectivity/outboundconnectivity.h (modified) (2 diffs)
-
sources/thelib/include/protocols/rtp/streaming/outnetrtpudph264stream.h (modified) (1 diff)
-
sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp (modified) (11 diffs)
-
sources/thelib/src/protocols/rtp/streaming/outnetrtpudph264stream.cpp (modified) (3 diffs)
-
sources/thelib/src/protocols/ts/innettsstream.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/builders/netbeans/osx/applestreamingclient/nbproject/Makefile-Debug.mk
r89 r106 51 51 ${OBJECTDIR}/_ext/693221815/protocolfactory.o \ 52 52 ${OBJECTDIR}/_ext/693221815/genericprotocol.o \ 53 ${OBJECTDIR}/_ext/441423101/clientcontext.o \ 53 54 ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o \ 54 ${OBJECTDIR}/_ext/441423101/clientcontext.o \55 55 ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o \ 56 ${OBJECTDIR}/_ext/53446657/finetimer.o \ 56 57 ${OBJECTDIR}/_ext/413657679/childm3u8protocol.o \ 57 58 ${OBJECTDIR}/_ext/1372139511/aesappprotocolhandler.o \ … … 93 94 ${MKDIR} -p ${OBJECTDIR}/_ext/53446657 94 95 ${RM} $@.d 95 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/53446657/scheduletimerprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/timer/scheduletimerprotocol.cpp96 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/53446657/scheduletimerprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/timer/scheduletimerprotocol.cpp 96 97 97 98 ${OBJECTDIR}/_ext/1372122712/rtspappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/rtp/rtspappprotocolhandler.cpp 98 99 ${MKDIR} -p ${OBJECTDIR}/_ext/1372122712 99 100 ${RM} $@.d 100 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372122712/rtspappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/rtp/rtspappprotocolhandler.cpp101 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372122712/rtspappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/rtp/rtspappprotocolhandler.cpp 101 102 102 103 ${OBJECTDIR}/_ext/1728068287/variantappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp 103 104 ${MKDIR} -p ${OBJECTDIR}/_ext/1728068287 104 105 ${RM} $@.d 105 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1728068287/variantappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp106 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1728068287/variantappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/variant/variantappprotocolhandler.cpp 106 107 107 108 ${OBJECTDIR}/_ext/61573733/varianteventsink.o: ../../../../sources/applications/applestreamingclient/src/eventsink/varianteventsink.cpp 108 109 ${MKDIR} -p ${OBJECTDIR}/_ext/61573733 109 110 ${RM} $@.d 110 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/61573733/varianteventsink.o ../../../../sources/applications/applestreamingclient/src/eventsink/varianteventsink.cpp111 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/61573733/varianteventsink.o ../../../../sources/applications/applestreamingclient/src/eventsink/varianteventsink.cpp 111 112 112 113 ${OBJECTDIR}/_ext/413868907/rtmpappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/rtmp/rtmpappprotocolhandler.cpp 113 114 ${MKDIR} -p ${OBJECTDIR}/_ext/413868907 114 115 ${RM} $@.d 115 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413868907/rtmpappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/rtmp/rtmpappprotocolhandler.cpp116 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413868907/rtmpappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/rtmp/rtmpappprotocolhandler.cpp 116 117 117 118 ${OBJECTDIR}/_ext/441423101/playlist.o: ../../../../sources/applications/applestreamingclient/src/playlist.cpp 118 119 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 119 120 ${RM} $@.d 120 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/playlist.o ../../../../sources/applications/applestreamingclient/src/playlist.cpp121 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/playlist.o ../../../../sources/applications/applestreamingclient/src/playlist.cpp 121 122 122 123 ${OBJECTDIR}/_ext/1147538975/httpbufferprotocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbufferprotocol.cpp 123 124 ${MKDIR} -p ${OBJECTDIR}/_ext/1147538975 124 125 ${RM} $@.d 125 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1147538975/httpbufferprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbufferprotocol.cpp126 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1147538975/httpbufferprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbufferprotocol.cpp 126 127 127 128 ${OBJECTDIR}/_ext/413657679/m3u8appprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/m3u8appprotocolhandler.cpp 128 129 ${MKDIR} -p ${OBJECTDIR}/_ext/413657679 129 130 ${RM} $@.d 130 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/m3u8appprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/m3u8appprotocolhandler.cpp131 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/m3u8appprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/m3u8appprotocolhandler.cpp 131 132 132 133 ${OBJECTDIR}/_ext/441423101/speedcomputer.o: ../../../../sources/applications/applestreamingclient/src/speedcomputer.cpp 133 134 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 134 135 ${RM} $@.d 135 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/speedcomputer.o ../../../../sources/applications/applestreamingclient/src/speedcomputer.cpp136 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/speedcomputer.o ../../../../sources/applications/applestreamingclient/src/speedcomputer.cpp 136 137 137 138 ${OBJECTDIR}/_ext/441423101/applestreamingclient.o: ../../../../sources/applications/applestreamingclient/src/applestreamingclient.cpp 138 139 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 139 140 ${RM} $@.d 140 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/applestreamingclient.o ../../../../sources/applications/applestreamingclient/src/applestreamingclient.cpp141 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/applestreamingclient.o ../../../../sources/applications/applestreamingclient/src/applestreamingclient.cpp 141 142 142 143 ${OBJECTDIR}/_ext/1568284858/jnihelpers.o: ../../../../sources/applications/applestreamingclient/src/protocols/../jnihelpers.cpp 143 144 ${MKDIR} -p ${OBJECTDIR}/_ext/1568284858 144 145 ${RM} $@.d 145 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1568284858/jnihelpers.o ../../../../sources/applications/applestreamingclient/src/protocols/../jnihelpers.cpp146 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1568284858/jnihelpers.o ../../../../sources/applications/applestreamingclient/src/protocols/../jnihelpers.cpp 146 147 147 148 ${OBJECTDIR}/_ext/413657679/masterm3u8protocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/masterm3u8protocol.cpp 148 149 ${MKDIR} -p ${OBJECTDIR}/_ext/413657679 149 150 ${RM} $@.d 150 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/masterm3u8protocol.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/masterm3u8protocol.cpp151 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/masterm3u8protocol.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/masterm3u8protocol.cpp 151 152 152 153 ${OBJECTDIR}/_ext/1372129895/keyappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/key/keyappprotocolhandler.cpp 153 154 ${MKDIR} -p ${OBJECTDIR}/_ext/1372129895 154 155 ${RM} $@.d 155 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372129895/keyappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/key/keyappprotocolhandler.cpp156 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372129895/keyappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/key/keyappprotocolhandler.cpp 156 157 157 158 ${OBJECTDIR}/_ext/61573733/baseeventsink.o: ../../../../sources/applications/applestreamingclient/src/eventsink/baseeventsink.cpp 158 159 ${MKDIR} -p ${OBJECTDIR}/_ext/61573733 159 160 ${RM} $@.d 160 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/61573733/baseeventsink.o ../../../../sources/applications/applestreamingclient/src/eventsink/baseeventsink.cpp161 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/61573733/baseeventsink.o ../../../../sources/applications/applestreamingclient/src/eventsink/baseeventsink.cpp 161 162 162 163 ${OBJECTDIR}/_ext/1372129895/inboundkeyprotocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/key/inboundkeyprotocol.cpp 163 164 ${MKDIR} -p ${OBJECTDIR}/_ext/1372129895 164 165 ${RM} $@.d 165 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372129895/inboundkeyprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/key/inboundkeyprotocol.cpp166 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372129895/inboundkeyprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/key/inboundkeyprotocol.cpp 166 167 167 168 ${OBJECTDIR}/_ext/693221815/protocolfactory.o: ../../../../sources/applications/applestreamingclient/src/protocols/protocolfactory.cpp 168 169 ${MKDIR} -p ${OBJECTDIR}/_ext/693221815 169 170 ${RM} $@.d 170 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/693221815/protocolfactory.o ../../../../sources/applications/applestreamingclient/src/protocols/protocolfactory.cpp171 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/693221815/protocolfactory.o ../../../../sources/applications/applestreamingclient/src/protocols/protocolfactory.cpp 171 172 172 173 ${OBJECTDIR}/_ext/693221815/genericprotocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/genericprotocol.cpp 173 174 ${MKDIR} -p ${OBJECTDIR}/_ext/693221815 174 175 ${RM} $@.d 175 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/693221815/genericprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/genericprotocol.cpp 176 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/693221815/genericprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/genericprotocol.cpp 177 178 ${OBJECTDIR}/_ext/441423101/clientcontext.o: ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp 179 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 180 ${RM} $@.d 181 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/clientcontext.o ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp 176 182 177 183 ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/ts/tsappprotocolhandler.cpp 178 184 ${MKDIR} -p ${OBJECTDIR}/_ext/1568282619 179 185 ${RM} $@.d 180 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/ts/tsappprotocolhandler.cpp 181 182 ${OBJECTDIR}/_ext/441423101/clientcontext.o: ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp 183 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 184 ${RM} $@.d 185 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/clientcontext.o ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp 186 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/ts/tsappprotocolhandler.cpp 186 187 187 188 ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbuffappprotocolhandler.cpp 188 189 ${MKDIR} -p ${OBJECTDIR}/_ext/1147538975 189 190 ${RM} $@.d 190 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbuffappprotocolhandler.cpp 191 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbuffappprotocolhandler.cpp 192 193 ${OBJECTDIR}/_ext/53446657/finetimer.o: ../../../../sources/applications/applestreamingclient/src/protocols/timer/finetimer.cpp 194 ${MKDIR} -p ${OBJECTDIR}/_ext/53446657 195 ${RM} $@.d 196 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/53446657/finetimer.o ../../../../sources/applications/applestreamingclient/src/protocols/timer/finetimer.cpp 191 197 192 198 ${OBJECTDIR}/_ext/413657679/childm3u8protocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/childm3u8protocol.cpp 193 199 ${MKDIR} -p ${OBJECTDIR}/_ext/413657679 194 200 ${RM} $@.d 195 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/childm3u8protocol.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/childm3u8protocol.cpp201 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/childm3u8protocol.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/childm3u8protocol.cpp 196 202 197 203 ${OBJECTDIR}/_ext/1372139511/aesappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/aes/aesappprotocolhandler.cpp 198 204 ${MKDIR} -p ${OBJECTDIR}/_ext/1372139511 199 205 ${RM} $@.d 200 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372139511/aesappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/aes/aesappprotocolhandler.cpp206 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372139511/aesappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/aes/aesappprotocolhandler.cpp 201 207 202 208 ${OBJECTDIR}/_ext/61573733/rtmpeventsink.o: ../../../../sources/applications/applestreamingclient/src/eventsink/rtmpeventsink.cpp 203 209 ${MKDIR} -p ${OBJECTDIR}/_ext/61573733 204 210 ${RM} $@.d 205 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/61573733/rtmpeventsink.o ../../../../sources/applications/applestreamingclient/src/eventsink/rtmpeventsink.cpp211 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/61573733/rtmpeventsink.o ../../../../sources/applications/applestreamingclient/src/eventsink/rtmpeventsink.cpp 206 212 207 213 ${OBJECTDIR}/_ext/413657679/basem3u8protocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/basem3u8protocol.cpp 208 214 ${MKDIR} -p ${OBJECTDIR}/_ext/413657679 209 215 ${RM} $@.d 210 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/basem3u8protocol.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/basem3u8protocol.cpp216 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/413657679/basem3u8protocol.o ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/basem3u8protocol.cpp 211 217 212 218 ${OBJECTDIR}/_ext/441423101/applestreamingclientapplication.o: ../../../../sources/applications/applestreamingclient/src/applestreamingclientapplication.cpp 213 219 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 214 220 ${RM} $@.d 215 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/applestreamingclientapplication.o ../../../../sources/applications/applestreamingclient/src/applestreamingclientapplication.cpp221 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/applestreamingclientapplication.o ../../../../sources/applications/applestreamingclient/src/applestreamingclientapplication.cpp 216 222 217 223 ${OBJECTDIR}/_ext/1372139511/inboundaesprotocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp 218 224 ${MKDIR} -p ${OBJECTDIR}/_ext/1372139511 219 225 ${RM} $@.d 220 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID - I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372139511/inboundaesprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp226 $(COMPILE.cc) -g -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -DHAS_MS_TIMER -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -I../../../../../android/workbench/android-ndk-r4-crystax/build/platforms/android-4/arch-arm/usr/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1372139511/inboundaesprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp 221 227 222 228 # Subprojects -
trunk/builders/netbeans/osx/applestreamingclient/nbproject/Makefile-Release.mk
r87 r106 51 51 ${OBJECTDIR}/_ext/693221815/protocolfactory.o \ 52 52 ${OBJECTDIR}/_ext/693221815/genericprotocol.o \ 53 ${OBJECTDIR}/_ext/441423101/clientcontext.o \ 53 54 ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o \ 54 ${OBJECTDIR}/_ext/441423101/clientcontext.o \55 55 ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o \ 56 ${OBJECTDIR}/_ext/53446657/finetimer.o \ 56 57 ${OBJECTDIR}/_ext/413657679/childm3u8protocol.o \ 57 58 ${OBJECTDIR}/_ext/1372139511/aesappprotocolhandler.o \ … … 175 176 $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/693221815/genericprotocol.o ../../../../sources/applications/applestreamingclient/src/protocols/genericprotocol.cpp 176 177 178 ${OBJECTDIR}/_ext/441423101/clientcontext.o: ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp 179 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101 180 ${RM} $@.d 181 $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/clientcontext.o ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp 182 177 183 ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/ts/tsappprotocolhandler.cpp 178 184 ${MKDIR} -p ${OBJECTDIR}/_ext/1568282619 … … 180 186 $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1568282619/tsappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/ts/tsappprotocolhandler.cpp 181 187 182 ${OBJECTDIR}/_ext/441423101/clientcontext.o: ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp183 ${MKDIR} -p ${OBJECTDIR}/_ext/441423101184 ${RM} $@.d185 $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/441423101/clientcontext.o ../../../../sources/applications/applestreamingclient/src/clientcontext.cpp186 187 188 ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o: ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbuffappprotocolhandler.cpp 188 189 ${MKDIR} -p ${OBJECTDIR}/_ext/1147538975 189 190 ${RM} $@.d 190 191 $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/1147538975/httpbuffappprotocolhandler.o ../../../../sources/applications/applestreamingclient/src/protocols/httpbuff/httpbuffappprotocolhandler.cpp 192 193 ${OBJECTDIR}/_ext/53446657/finetimer.o: ../../../../sources/applications/applestreamingclient/src/protocols/timer/finetimer.cpp 194 ${MKDIR} -p ${OBJECTDIR}/_ext/53446657 195 ${RM} $@.d 196 $(COMPILE.cc) -O2 -DOSX -DNET_KQUEUE -DLITTLE_ENDIAN_BYTE_ALIGNED -DHAS_PROTOCOL_RTMP -DHAS_PROTOCOL_HTTP -DHAS_PROTOCOL_TS -DHAS_PROTOCOL_VAR -DANDROID -I/opt/local/include -I../../../../sources/common/include -I../../../../sources/thelib/include -I../../../../sources/applications/applestreamingclient/include -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/53446657/finetimer.o ../../../../sources/applications/applestreamingclient/src/protocols/timer/finetimer.cpp 191 197 192 198 ${OBJECTDIR}/_ext/413657679/childm3u8protocol.o: ../../../../sources/applications/applestreamingclient/src/protocols/m3u8/childm3u8protocol.cpp -
trunk/builders/netbeans/osx/applestreamingclient/nbproject/configurations.xml
r89 r106 39 39 </logicalFolder> 40 40 <logicalFolder name="timer" displayName="timer" projectFiles="true"> 41 <itemPath>../../../../sources/applications/applestreamingclient/include/protocols/timer/finetimer.h</itemPath> 41 42 <itemPath>../../../../sources/applications/applestreamingclient/include/protocols/timer/scheduletimerprotocol.h</itemPath> 42 43 </logicalFolder> … … 95 96 </logicalFolder> 96 97 <logicalFolder name="timer" displayName="timer" projectFiles="true"> 98 <itemPath>../../../../sources/applications/applestreamingclient/src/protocols/timer/finetimer.cpp</itemPath> 97 99 <itemPath>../../../../sources/applications/applestreamingclient/src/protocols/timer/scheduletimerprotocol.cpp</itemPath> 98 100 </logicalFolder> … … 153 155 <Elem>HAS_PROTOCOL_VAR</Elem> 154 156 <Elem>ANDROID</Elem> 157 <Elem>HAS_MS_TIMER</Elem> 155 158 </preprocessorList> 156 159 </ccTool> -
trunk/sources/androidapplestreaming/src/main.cpp
r103 r106 116 116 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=10111969&appAccountName=mlb&eventId=14-265611-2010-08-18&ipid=23272205&sessionKey=6bdsqzUU7oBI4gixJxFFON2QHwA%3D&deviceId=ANDROID_354957033071773&country=us&postalCode=10011&platform=ANDROID" 117 117 118 #define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/24/MLB_GAME_VIDEO_TBAANA_HOME_20100824/master_mobile.m3u8" 119 #define MY_KEY "pFD3++v0LKfm38F2mCgIu0sXzn4=" 120 #define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=100000000087&appAccountName=mlb&eventId=14-265692-2010-08-24&ipid=23272205&sessionKey=6bdsqzUU7oBI4gixJxFFON2QHwA%3D&deviceId=ANDROID_354957033071773&country=us&postalCode=10011&platform=ANDROID" 118 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/24/MLB_GAME_VIDEO_TBAANA_HOME_20100824/master_mobile.m3u8" 119 //#define MY_KEY "pFD3++v0LKfm38F2mCgIu0sXzn4=" 120 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=100000000087&appAccountName=mlb&eventId=14-265692-2010-08-24&ipid=23272205&sessionKey=6bdsqzUU7oBI4gixJxFFON2QHwA%3D&deviceId=ANDROID_354957033071773&country=us&postalCode=10011&platform=ANDROID" 121 122 //#define MY_URL "http://mlblive-akc.mlb.com/mlbam/2010/08/25/MLB_GAME_VIDEO_KCADET_HOME_20100825/master_mobile.m3u8" 123 //#define MY_KEY "kL8KOUYTmywS7SiCmJmAvJjH51E=" 124 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11089833&appAccountName=mlb&eventId=14-265702-2010-08-25&ipid=11627706&sessionKey=Pff4k8IQCTNjs46Plh6%2BBOvMEBw%3D&deviceId=ANDROID_356698030670609&country=us&postalCode=10011&platform=ANDROID" 125 126 //#define MY_URL "http://mlblive-akc.mlb.com/mlbam/2010/08/25/MLB_GAME_VIDEO_ATLCOL_HOME_20100825/master_mobile.m3u8" 127 //#define MY_KEY "kL8KOUYTmywS7SiCmJmAvJjH51E=" 128 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11311045&appAccountName=mlb&eventId=14-265696-2010-08-25&ipid=11627706&sessionKey=Pff4k8IQCTNjs46Plh6%2BBOvMEBw%3D&deviceId=ANDROID_A0000022419B22&country=us&postalCode=10292&platform=ANDROID" 129 130 //#define MY_URL "http://mlblive-akc.mlb.com/mlbam/2010/08/25/MLB_GAME_VIDEO_CINSFN_HOME_20100825/master_mobile.m3u8" 131 //#define MY_KEY "kL8KOUYTmywS7SiCmJmAvJjH51E=" 132 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11090005&appAccountName=mlb&eventId=14-265699-2010-08-25&ipid=11627706&sessionKey=Pff4k8IQCTNjs46Plh6%2BBOvMEBw%3D&deviceId=ANDROID_A0000022419B22&country=us&postalCode=10011&platform=ANDROID" 133 134 //#define MY_URL "http://mlblive-akc.mlb.com/mlbam/2010/08/25/MLB_GAME_VIDEO_CHNWAS_HOME_20100825/master_mobile.m3u8" 135 //#define MY_KEY "kL8KOUYTmywS7SiCmJmAvJjH51E=" 136 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11090061&appAccountName=mlb&eventId=14-265698-2010-08-25&ipid=11627706&sessionKey=Pff4k8IQCTNjs46Plh6%2BBOvMEBw%3D&deviceId=ANDROID_A0000022419B22&country=us&postalCode=10011&platform=ANDROID" 137 138 #define MY_URL "http://localhost/~shiretu/ts10/200/prog_index.m3u8" 139 #define MY_KEY "" 140 #define MY_SESSION_ID "" 121 141 122 142 //#define CONDENSED_CONN_STRING "base64:aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fHlNQmVFcEl6OEJEaUFYV0k0dUdIUm1UaHdIRT18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9cUNveGRIaUlOY3FDbHlEcEZoU2dma3dJSWc0JTNE" … … 128 148 129 149 uint32_t contextId = (uint32_t) ASC_RES_PARAM(result, "contextId"); 130 result = CommandSetBitrates(contextId, " [ 800000]");150 result = CommandSetBitrates(contextId, " []"); 131 151 FINEST("result:\n%s", STR(result.ToString())); 132 152 -
trunk/sources/applications/applestreamingclient/src/clientcontext.cpp
r104 r106 358 358 359 359 //5. Continue feeding until we have stream capabilities 360 while (GETAVAILABLEBYTESCOUNT(_avData) > 8192) { 361 if ((pStream->GetCapabilities()->videoCodecId == CODEC_VIDEO_AVC) 362 && (pStream->GetCapabilities()->audioCodecId == CODEC_AUDIO_AAC)) { 363 _pEventSink->SignalStreamRegistered(_streamName); 364 break; 365 } 366 if (!pTS->SignalInputData(_avData)) { 367 FATAL("Unable to feed TS protocol"); 368 return false; 360 if ((pStream->GetCapabilities()->videoCodecId != CODEC_VIDEO_AVC) 361 || (pStream->GetCapabilities()->audioCodecId != CODEC_AUDIO_AAC)) { 362 while (GETAVAILABLEBYTESCOUNT(_avData) > 8192) { 363 if ((pStream->GetCapabilities()->videoCodecId == CODEC_VIDEO_AVC) 364 && (pStream->GetCapabilities()->audioCodecId == CODEC_AUDIO_AAC)) { 365 _pEventSink->SignalStreamRegistered(_streamName); 366 break; 367 } 368 if (!pTS->SignalInputData(_avData)) { 369 FATAL("Unable to feed TS protocol"); 370 return false; 371 } 372 } 373 if ((pStream->GetCapabilities()->videoCodecId != CODEC_VIDEO_AVC) 374 || (pStream->GetCapabilities()->audioCodecId != CODEC_AUDIO_AAC)) { 375 FINEST("SPS/PPS not yet available"); 376 return true; 369 377 } 370 378 } … … 632 640 customParameters["itemUri"] = itemUri; 633 641 customParameters["bw"] = bw; 634 replace(keyUri, "http://www.mlb.com", "https://qa.mlb.com");635 642 return FetchURI(keyUri, "key", customParameters); 636 643 } -
trunk/sources/thelib/include/protocols/rtp/connectivity/outboundconnectivity.h
r96 r106 35 35 uint32_t _videoPacketsCount; 36 36 uint32_t _videoBytesCount; 37 uint32_t _videoFirstRtp; 38 map<uint32_t, sockaddr_in> _udpVideoDataClients; 39 map<uint32_t, sockaddr_in> _udpVideoRTCPClients; 37 40 38 41 int32_t _audioDataFd; … … 42 45 uint32_t _audioPacketsCount; 43 46 uint32_t _audioBytesCount; 44 45 map<uint32_t, sockaddr_in> _udpVideoDataClients; 46 map<uint32_t, sockaddr_in> _udpVideoRTCPClients; 47 uint32_t _audioFirstRtp; 47 48 map<uint32_t, sockaddr_in> _udpAudioDataClients; 48 49 map<uint32_t, sockaddr_in> _udpAudioRTCPClients; 50 49 51 map<uint32_t, uint32_t> _tcpClients; 50 52 BaseOutNetRTPUDPStream *_pOutStream; -
trunk/sources/thelib/include/protocols/rtp/streaming/outnetrtpudph264stream.h
r49 r106 60 60 uint32_t processedLength, uint32_t totalLength, 61 61 double absoluteTimestamp); 62 bool FeedDataAudioMPEG4Generic(uint8_t *pData, uint32_t dataLength, 62 bool FeedDataAudioMPEG4Generic_aggregate(uint8_t *pData, uint32_t dataLength, 63 uint32_t processedLength, uint32_t totalLength, 64 double absoluteTimestamp); 65 bool FeedDataAudioMPEG4Generic_one_by_one(uint8_t *pData, uint32_t dataLength, 63 66 uint32_t processedLength, uint32_t totalLength, 64 67 double absoluteTimestamp); -
trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp
r102 r106 86 86 _videoPacketsCount = 0; 87 87 _videoBytesCount = 0; 88 _videoFirstRtp = 0; 88 89 89 90 _audioDataFd = -1; … … 93 94 _audioPacketsCount = 0; 94 95 _audioBytesCount = 0; 96 _audioFirstRtp = 0; 95 97 96 98 _pOutStream = NULL; … … 101 103 102 104 _startupTime = 0; 103 WARN("OC created: %p", this);104 105 } 105 106 … … 308 309 309 310 bool OutboundConnectivity::FeedVideoDataUDP(msghdr &message) { 311 // uint32_t packetRtp = ntohlp((uint8_t *) message.msg_iov[0].iov_base + 4); 312 // if ((((uint8_t *) message.msg_iov[0].iov_base)[1] >> 7) != 0) { 313 // // FINEST("packetRtp: %d (%08x) %02x%02x%02x%02x %.2f %c", 314 // // packetRtp, 315 // // packetRtp, 316 // // ((uint8_t *) message.msg_iov[0].iov_base)[4], 317 // // ((uint8_t *) message.msg_iov[0].iov_base)[5], 318 // // ((uint8_t *) message.msg_iov[0].iov_base)[6], 319 // // ((uint8_t *) message.msg_iov[0].iov_base)[7], 320 // // (double) packetRtp / 90000.0, 321 // // ((((uint8_t *) message.msg_iov[0].iov_base)[1] >> 7) != 0) ? '*' : ' '); 322 // if (____last == packetRtp) { 323 // WARN("Skip packet"); 324 // return true; 325 // } 326 // ____last = packetRtp; 327 // } 310 328 RTP_SEND_MESSAGE(_videoDataFd, _udpVideoDataClients, message); 311 329 _videoPacketsCount++; … … 313 331 //uint16_t seq = ntohsp(((uint8_t *) message.msg_iov[0].iov_base) + 2); 314 332 //FINEST("seq: %d", seq); 315 if (((_videoPacketsCount % 300) == 0) || _videoPacketsCount == 1) {333 if (((_videoPacketsCount % 300) == 0) || _videoPacketsCount <= 2) { 316 334 uint8_t buff[28]; 317 CreateRTCPPacket(buff,335 if (CreateRTCPPacket(buff, 318 336 (uint8_t *) message.msg_iov[0].iov_base, 319 337 _pOutStream->SSRC(), … … 321 339 _videoPacketsCount, 322 340 _videoBytesCount, 323 false); 324 _message.msg_iov[0].iov_base = buff; 325 _message.msg_iov[0].iov_len = 28; 326 327 RTP_SEND_MESSAGE(_videoRTCPFd, _udpVideoRTCPClients, _message); 341 false)) { 342 _message.msg_iov[0].iov_base = buff; 343 _message.msg_iov[0].iov_len = 28; 344 345 RTP_SEND_MESSAGE(_videoRTCPFd, _udpVideoRTCPClients, _message); 346 } 328 347 } 329 348 return true; … … 341 360 //uint16_t seq = ntohsp(((uint8_t *) message.msg_iov[0].iov_base) + 2); 342 361 //FINEST("seq: %d", seq); 343 if (((_audioPacketsCount % 300) == 0) || (_audioPacketsCount == 1)) {362 if (((_audioPacketsCount % 300) == 0) || (_audioPacketsCount <= 2)) { 344 363 uint8_t buff[28]; 345 CreateRTCPPacket(buff,364 if (CreateRTCPPacket(buff, 346 365 (uint8_t *) message.msg_iov[0].iov_base, 347 366 _pOutStream->SSRC(), … … 349 368 _audioPacketsCount, 350 369 _audioBytesCount, 351 true); 352 _message.msg_iov[0].iov_base = buff; 353 _message.msg_iov[0].iov_len = 28; 354 355 RTP_SEND_MESSAGE(_audioRTCPFd, _udpAudioRTCPClients, _message); 370 true)) { 371 _message.msg_iov[0].iov_base = buff; 372 _message.msg_iov[0].iov_len = 28; 373 374 RTP_SEND_MESSAGE(_audioRTCPFd, _udpAudioRTCPClients, _message); 375 } 356 376 } 357 377 return true; … … 404 424 put_htonl(pDest + 4, ssrc); //SSRC 405 425 406 FINEST("-----%s-----", isAudio ? "AUDIO" : "VIDEO");407 408 426 //5. setup the startup time 409 427 if (_startupTime == 0) { 410 428 GETCLOCKS(_startupTime); 411 429 } 412 FINEST("_startupTime: %.2f", _startupTime); 430 431 if (isAudio) { 432 if (_audioFirstRtp == 0) { 433 _audioFirstRtp = ntohlp(pSrc + 4); 434 return false; 435 } 436 } else { 437 if (_videoFirstRtp == 0) { 438 _videoFirstRtp = ntohlp(pSrc + 4); 439 return false; 440 } 441 } 442 443 uint32_t &firstRtp = isAudio ? _audioFirstRtp : _videoFirstRtp; 413 444 414 445 //6. Get the current time 415 446 double currentTime; 416 447 GETCLOCKS(currentTime); 417 FINEST("currentTime: %.2f", currentTime);418 448 419 449 //7. NTP … … 423 453 424 454 //6. RTP 425 //FINEST("rate: %d", rate); 426 double rtpDouble = ((currentTime - _startupTime) / (double) CLOCKS_PER_SEC) * rate; 427 //FINEST("rtpDouble: %.2f", rtpDouble); 428 uint32_t rtp = (uint32_t) rtpDouble; 429 //FINEST("rtp: %d", rtp); 430 //uint32_t packetRtp = ntohlp(pSrc + 4); 431 //FINEST("packetRtp: %d", packetRtp); 432 //FINEST("diff: %.0f", (double) packetRtp - (double) rtp); 455 double rtpDouble = ((currentTime - _startupTime) / (double) CLOCKS_PER_SECOND) * rate; 456 uint32_t rtp = (uint32_t) rtpDouble + firstRtp; 433 457 put_htonl(pDest + 16, rtp); 434 //memcpy(pDest + 16, pSrc + 4, 4);435 458 436 459 //7. sender's packet count … … 440 463 put_htonl(pDest + 24, bytesCount); 441 464 465 FINEST("-----%s-----", isAudio ? "AUDIO" : "VIDEO"); 466 FINEST("_startupTime: %.2f", _startupTime); 467 FINEST("currentTime: %.2f", currentTime); 468 FINEST("currentTime - _startupTime: %.2f (%.4f)", 469 currentTime - _startupTime, 470 (currentTime - _startupTime) / (double) CLOCKS_PER_SECOND); 471 FINEST("rate: %d", rate); 472 FINEST("rtpDouble: %.2f", rtpDouble); 473 FINEST("firstRtp: %d", firstRtp); 474 FINEST("rtp: %d", rtp); 475 uint32_t packetRtp = ntohlp(pSrc + 4); 476 FINEST("packetRtp: %d", packetRtp); 477 FINEST("diff: %d; (%.4f s)", packetRtp - rtp, ((double) packetRtp - rtp) / (double) rate); 478 FINEST("---------------"); 479 442 480 return true; 443 481 } -
trunk/sources/thelib/src/protocols/rtp/streaming/outnetrtpudph264stream.cpp
r103 r106 147 147 uint32_t processedLength, uint32_t totalLength, 148 148 double absoluteTimestamp, bool isAudio) { 149 //#define FeedDataAudioMPEG4Generic FeedDataAudioMPEG4Generic_one_by_one 150 #define FeedDataAudioMPEG4Generic FeedDataAudioMPEG4Generic_aggregate 149 151 return FeedDataAudioMPEG4Generic(pData, dataLength, processedLength, totalLength, 150 152 absoluteTimestamp); … … 277 279 } 278 280 279 bool OutNetRTPUDPH264Stream::FeedDataAudioMPEG4Generic (uint8_t *pData,281 bool OutNetRTPUDPH264Stream::FeedDataAudioMPEG4Generic_aggregate(uint8_t *pData, 280 282 uint32_t dataLength, uint32_t processedLength, uint32_t totalLength, 281 283 double absoluteTimestamp) { … … 343 345 return true; 344 346 } 345 //bool OutNetRTPUDPH264Stream::FeedDataAudioMPEG4Generic_one_by_one(uint8_t *pData, uint32_t dataLength, 346 // uint32_t processedLength, uint32_t totalLength,347 // double absoluteTimestamp) { 348 // return true; 349 ////1. We only support frame-by-frame approach350 //if (dataLength != totalLength) {351 //WARN("Chunked mode not yet supported");352 //return true;353 //}354 ///*355 //0 1 2 3356 //0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1357 //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+358 //|V=2|P|X| CC |M| PT | sequence number |359 //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+360 //| timestamp |361 //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+362 //| synchronization source (SSRC) identifier |363 //+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+364 //| contributing source (CSRC) identifiers |365 //| .... |366 //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+367 // 368 //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- .. -+-+-+-+-+-+-+-+-+-+369 //|AU-headers-length|AU-header|AU-header| |AU-header|padding|370 //| | (1) | (2) | | (n) | bits |371 //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- .. -+-+-+-+-+-+-+-+-+-+372 //*/373 // 374 //// _audioData.msg_iov[0].iov_base[00] V,P,X,CC375 //// _audioData.msg_iov[0].iov_base[01] M,PT376 //// _audioData.msg_iov[0].iov_base[02] sequence number377 //// _audioData.msg_iov[0].iov_base[03] sequence number378 //// _audioData.msg_iov[0].iov_base[04] timestamp379 //// _audioData.msg_iov[0].iov_base[05] timestamp380 //// _audioData.msg_iov[0].iov_base[06] timestamp381 //// _audioData.msg_iov[0].iov_base[07] timestamp382 //// _audioData.msg_iov[0].iov_base[08] SSRC383 //// _audioData.msg_iov[0].iov_base[09] SSRC384 //// _audioData.msg_iov[0].iov_base[10] SSRC385 //// _audioData.msg_iov[0].iov_base[11] SSRC386 //// _audioData.msg_iov[0].iov_base[12] AU-headers-length387 //// _audioData.msg_iov[0].iov_base[13] AU-headers-length388 // 389 ////3. counter390 //put_htons(((uint8_t *) _audioData.msg_iov[0].iov_base) + 2, _audioCounter);391 //_audioCounter++;392 // 393 ////4. Timestamp394 //put_htonl(((uint8_t *) _audioData.msg_iov[0].iov_base) + 4,395 //(uint32_t) (absoluteTimestamp396 //* (double) GetCapabilities()->audioCodecInfo.aac.sampleRate / 1000.000));397 // 398 //put_htons(((uint8_t *) _audioData.msg_iov[0].iov_base) + 12, 16);399 // 400 //uint16_t auHeader = (uint16_t) ((dataLength - 7) << 3);401 //put_htons(((uint8_t *) _audioData.msg_iov[1].iov_base), auHeader);402 //_audioData.msg_iov[1].iov_len = 2;403 // 404 // FINEST("%02x%02x %02x%02x %02x%02x%02x%02x %02x%02x%02x%02x - %02x%02x %02x%02x %08x %.2f",405 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[0],406 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[1],407 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[2],408 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[3],409 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[4],410 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[5],411 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[6],412 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[7],413 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[8],414 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[9],415 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[10],416 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[11],417 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[12],418 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[13],419 // ((uint8_t *) _audioData.msg_iov[1].iov_base)[0],420 // ((uint8_t *) _audioData.msg_iov[1].iov_base)[1],421 // dataLength - 7,422 // absoluteTimestamp);423 // 424 ////6. put the actual buffer425 //_audioData.msg_iov[2].iov_len = dataLength - 7;426 //_audioData.msg_iov[2].iov_base = pData + 7;427 // 428 //return _pConnectivity->FeedAudioData(_audioData);429 //}347 348 bool OutNetRTPUDPH264Stream::FeedDataAudioMPEG4Generic_one_by_one(uint8_t *pData, uint32_t dataLength, 349 uint32_t processedLength, uint32_t totalLength, 350 double absoluteTimestamp) { 351 //1. We only support frame-by-frame approach 352 if (dataLength != totalLength) { 353 WARN("Chunked mode not yet supported"); 354 return true; 355 } 356 /* 357 0 1 2 3 358 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 359 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 360 |V=2|P|X| CC |M| PT | sequence number | 361 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 362 | timestamp | 363 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 364 | synchronization source (SSRC) identifier | 365 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 366 | contributing source (CSRC) identifiers | 367 | .... | 368 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 369 370 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- .. -+-+-+-+-+-+-+-+-+-+ 371 |AU-headers-length|AU-header|AU-header| |AU-header|padding| 372 | | (1) | (2) | | (n) | bits | 373 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- .. -+-+-+-+-+-+-+-+-+-+ 374 */ 375 376 // _audioData.msg_iov[0].iov_base[00] V,P,X,CC 377 // _audioData.msg_iov[0].iov_base[01] M,PT 378 // _audioData.msg_iov[0].iov_base[02] sequence number 379 // _audioData.msg_iov[0].iov_base[03] sequence number 380 // _audioData.msg_iov[0].iov_base[04] timestamp 381 // _audioData.msg_iov[0].iov_base[05] timestamp 382 // _audioData.msg_iov[0].iov_base[06] timestamp 383 // _audioData.msg_iov[0].iov_base[07] timestamp 384 // _audioData.msg_iov[0].iov_base[08] SSRC 385 // _audioData.msg_iov[0].iov_base[09] SSRC 386 // _audioData.msg_iov[0].iov_base[10] SSRC 387 // _audioData.msg_iov[0].iov_base[11] SSRC 388 // _audioData.msg_iov[0].iov_base[12] AU-headers-length 389 // _audioData.msg_iov[0].iov_base[13] AU-headers-length 390 391 //3. counter 392 put_htons(((uint8_t *) _audioData.msg_iov[0].iov_base) + 2, _audioCounter); 393 _audioCounter++; 394 395 //4. Timestamp 396 put_htonl(((uint8_t *) _audioData.msg_iov[0].iov_base) + 4, 397 (uint32_t) (absoluteTimestamp 398 * (double) GetCapabilities()->audioCodecInfo.aac.sampleRate / 1000.000)); 399 400 put_htons(((uint8_t *) _audioData.msg_iov[0].iov_base) + 12, 16); 401 402 uint16_t auHeader = (uint16_t) ((dataLength - 7) << 3); 403 put_htons(((uint8_t *) _audioData.msg_iov[1].iov_base), auHeader); 404 _audioData.msg_iov[1].iov_len = 2; 405 406 // FINEST("%02x%02x %02x%02x %02x%02x%02x%02x %02x%02x%02x%02x - %02x%02x %02x%02x %08x %.2f", 407 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[0], 408 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[1], 409 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[2], 410 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[3], 411 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[4], 412 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[5], 413 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[6], 414 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[7], 415 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[8], 416 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[9], 417 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[10], 418 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[11], 419 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[12], 420 // ((uint8_t *) _audioData.msg_iov[0].iov_base)[13], 421 // ((uint8_t *) _audioData.msg_iov[1].iov_base)[0], 422 // ((uint8_t *) _audioData.msg_iov[1].iov_base)[1], 423 // dataLength - 7, 424 // absoluteTimestamp); 425 426 //6. put the actual buffer 427 _audioData.msg_iov[2].iov_len = dataLength - 7; 428 _audioData.msg_iov[2].iov_base = pData + 7; 429 430 return _pConnectivity->FeedAudioData(_audioData); 431 } 430 432 #endif /* HAS_PROTOCOL_RTP */ 431 433 -
trunk/sources/thelib/src/protocols/ts/innettsstream.cpp
r105 r106 394 394 { 395 395 _streamCapabilities.ClearVideo(); 396 _streamCapabilities.videoCodecId = CODEC_VIDEO_AVC;397 396 _streamCapabilities.videoCodecInfo.avc.SPSLength = (uint16_t) length; 398 397 _streamCapabilities.videoCodecInfo.avc.pSPS = new uint8_t[length]; … … 409 408 _streamCapabilities.videoCodecInfo.avc.pPPS = new uint8_t[length]; 410 409 memcpy(_streamCapabilities.videoCodecInfo.avc.pPPS, pData, length); 410 _streamCapabilities.videoCodecId = CODEC_VIDEO_AVC; 411 411 break; 412 412 }
Note: See TracChangeset
for help on using the changeset viewer.
