Changeset 113


Ignore:
Timestamp:
09/01/10 07:55:52 (17 months ago)
Author:
shiretu
Message:

-- android stuff

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/builders/androidapplestreaming/jni/Android.mk

    r88 r113  
    1717PROJDIR := $(PWD)/../.. 
    1818 
     19REVISION= $(shell svnversion $(PROJDIR)) 
    1920PLATFORM_DEFINES := -DLITTLE_ENDIAN_BYTE_ALIGNED -DNET_EPOLL -DANDROID -DHAS_SAFE_LOGGER 
    2021 
    … …  
    2425MODULES_DEFINES += -DHAS_PROTOCOL_TS 
    2526MODULES_DEFINES += -DHAS_PROTOCOL_VAR 
    26 MODULES_DEFINES += -DHAS_PROTOCOL_RTMP 
     27#MODULES_DEFINES += -DHAS_PROTOCOL_RTMP 
    2728#MODULES_DEFINES += -DHAS_PROTOCOL_LIVEFLV 
    2829#MODULES_DEFINES += -DHAS_MEDIA_MP4 
    … …  
    3031#MODULES_DEFINES += -DHAS_MEDIA_FLV 
    3132 
     33 
     34#RTSP related defines 
     35CreateRTCPPacket=CreateRTCPPacket_mystyle 
     36#CreateRTCPPacket=CreateRTCPPacket_live555style 
     37#CreateRTCPPacket=CreateRTCPPacket_none 
     38FeedDataAudioMPEG4Generic=FeedDataAudioMPEG4Generic_one_by_one 
     39#FeedDataAudioMPEG4Generic=FeedDataAudioMPEG4Generic_aggregate 
     40HAS_MS_TIMER=0 
     41 
     42MODULES_DEFINES+=-DCreateRTCPPacket=$(CreateRTCPPacket) 
     43MODULES_DEFINES+=-DFeedDataAudioMPEG4Generic=$(FeedDataAudioMPEG4Generic) 
     44ifeq ($(HAS_MS_TIMER), 1) 
     45        MODULES_DEFINES+=-DHAS_MS_TIMER 
     46endif 
     47 
    3248GLOBAL_DEFINES := $(PLATFORM_DEFINES) $(MODULES_DEFINES) 
     49GLOBAL_DEFINES := $(GLOBAL_DEFINES) -DBUILD_SIGNATURE="\"$(REVISION),$(GLOBAL_DEFINES)\"" 
    3350 
    3451INCLUDE_DIRECTORIES := $(PROJDIR)/sources/common/include $(PROJDIR)/sources/thelib/include $(PROJDIR)/sources/applications/applestreamingclient/include \ 

  • trunk/sources/androidapplestreaming/src/api.cpp

    r109 r113  
    6161        Logger::AddLogLocation(pLogLocation); 
    6262#endif /* ANDROID */ 
     63 
     64        //1.1 Create the settings string 
     65        INFO("Build signature:\n%s", BUILD_SIGNATURE); 
    6366 
    6467        //2. Create the default protocol factory 
    … …  
    9295        } 
    9396 
     97#ifdef BUILD_SIGNATURE 
    9498        //6. Register it to the app manager 
    9599        if (!ClientApplicationManager::RegisterApplication(pApp)) { 
    96100                ASSERT("Unable to register application"); 
    97101        } 
     102#endif /* BUILD_SIGNATURE */ 
    98103 
    99104        //7. Create the RTSP acceptor 

  • trunk/sources/androidapplestreaming/src/main.cpp

    r109 r113  
    8787//#define MY_KEY "" 
    8888 
    89 //#define MY_URL "http://mlbvod-akc.mlb.com/mlbam/2010/04/08/MLB_GAME_VIDEO_LANPIT_HOME_20100408/master_wired.m3u8" 
    90 //#define MY_SESSION_ID "playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=3HJ3abDj%2BPBkmIn8cprQTgkYIa8%3D" 
    91 //#define MY_KEY "ugkuOk9Qy4HNS5uRxQcQXHfLuAI=" 
    92  
    93 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8" 
    94 //#define MY_SESSION_ID "playback=HTTP_CLOUD_WIRED&contentId=7320085&appAccountName=mlb&eventId=14-263849-2010-04-08&ipid=11627706&sessionKey=vlPZfM8Rj1TaGDmMrtDSQh1MIWc%3D" 
    95 //#define MY_KEY "Q8TZUMmOkyVgVSMotTCRMQ==" 
    96  
    97 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8" 
    98 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=10111969&appAccountName=mlb&eventId=14-265611-2010-08-18&ipid=23272205&sessionKey=JfPr0nOJ%2BfVzHc%2BfNV9umf9p6Yw%3D&country=us&postalCode=10292&platform=ANDROID" 
    99 //#define MY_KEY "7pG+lxgC/bRQ44iXCb0ydoVDCJA=" 
    100  
    101 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8" 
    102 //#define MY_KEY "7pG+lxgC/bRQ44iXCb0ydoVDCJA=" 
    103 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=10111969&appAccountName=mlb&eventId=14-265611-2010-08-18&ipid=23272205&sessionKey=JfPr0nOJ%2BfVzHc%2BfNV9umf9p6Yw%3D&country=us&postalCode=10292&platform=ANDROID" 
    104  
    105 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8" 
    106 //#define MY_KEY "fzi/ekWlN/nJY7M7zyODvnWvwCk=" 
    107 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=10111969&appAccountName=mlb&eventId=14-265611-2010-08-18&ipid=23272205&sessionKey=lCzgmwnNPsLrnlcqm8bZ8Fk6GEM%3D&country=us&postalCode=10292&platform=ANDROID" 
    108  
    109  
    110 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/23/MLB_GAME_VIDEO_TBAANA_HOME_20100823/master_mobile.m3u8" 
    111 //#define MY_KEY "adCJvZ98pHD+RtwZXu5DAnud3zk=" 
    112 //#define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=100000000001&appAccountName=mlb&eventId=14-265677-2010-08-23&ipid=23272205&sessionKey=1Mdu%2B0CADyV4ewOJTgKsPSqMPQE%3D&deviceId=ANDROID_354957033071773&country=us&postalCode=10011&platform=ANDROID" 
    113  
    114 //#define MY_URL "http://mlbsegqa.mlb.com/mlbam/2010/08/17/MLB_GAME_VIDEO_DETNYA_HOME_20100817/master_mobile.m3u8" 
    115 //#define MY_KEY "pFD3++v0LKfm38F2mCgIu0sXzn4=" 
    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  
    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  
    13889//#define MY_URL "http://localhost/~shiretu/ts10/200/prog_index.m3u8" 
    13990//#define MY_KEY "" 
    14091//#define MY_SESSION_ID "" 
    14192 
    142 #define MY_URL "http://mlblive-akc.mlb.com/mlbam/2010/08/26/MLB_GAME_VIDEO_ARISDN_HOME_20100826/master_mobile.m3u8" 
    143 #define MY_KEY "Ey5xHlceWWeYwHOlMRuYMm/DZqE=" 
    144 #define MY_SESSION_ID "playback=HTTP_CLOUD_MOBILE&contentId=11131241&appAccountName=mlb&eventId=14-265710-2010-08-26&ipid=11627706&sessionKey=8EcVAKWRJQVyLjuxvLCJXgz6aSI%3D&deviceId=ANDROID_null&country=us&postalCode=10011&platform=ANDROID" 
    145  
    146 //#define CONDENSED_CONN_STRING "base64:aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fHlNQmVFcEl6OEJEaUFYV0k0dUdIUm1UaHdIRT18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9cUNveGRIaUlOY3FDbHlEcEZoU2dma3dJSWc0JTNE" 
    147 //#define CONDENSED_CONN_STRING "aHR0cDovL21sYnZvZC1ha2MubWxiLmNvbS9tbGJhbS8yMDEwLzA0LzA4L01MQl9HQU1FX1ZJREVPX0xBTlBJVF9IT01FXzIwMTAwNDA4L21hc3Rlcl93aXJlZC5tM3U4fGJsOEQyRUFTRUY4V1VyeloreTNvME5pUXlBaz18cGxheWJhY2s9SFRUUF9DTE9VRF9XSVJFRCZjb250ZW50SWQ9NzMyMDA4NSZhcHBBY2NvdW50TmFtZT1tbGImZXZlbnRJZD0xNC0yNjM4NDktMjAxMC0wNC0wOCZpcGlkPTExNjI3NzA2JnNlc3Npb25LZXk9R0JuY1BzeFJCVjAySUM5bjgwUlAxU2RyOWV3JTNE" 
    14893 
    14994void testCommands() { 
    … …  
    15297 
    15398        uint32_t contextId = (uint32_t) ASC_RES_PARAM(result, "contextId"); 
    154         result = CommandSetBitrates(contextId, " [800000]"); 
     99        result = CommandSetBitrates(contextId, "[800000]"); 
    155100        FINEST("result:\n%s", STR(result.ToString())); 
    156101 
    157         result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY); 
     102        //result = CommandPlay(contextId, MY_URL, MY_SESSION_ID, MY_KEY); 
     103        //FINEST("result:\n%s", STR(result.ToString())); 
     104 
     105        result = CommandPlay(contextId, 
     106                "aHR0cDovL21sYmxpdmUtYWtjLm1sYi5jb20vbWxiYW0vMjAxMC8wOC8yOC9NTEJfR0FNRV9WSURFT19LQ0FDTEVfSE9NRV8yMDEwMDgyOC9tYXN0ZXJfbW9iaWxlLm0zdTh8R3ZjbFJoV2lOMHlyZWcvL3NUeXJBNDJ4VXkwPXxwbGF5YmFjaz1IVFRQX0NMT1VEX01PQklMRSZjb250ZW50SWQ9MTEyNzU3MDkmYXBwQWNjb3VudE5hbWU9bWxiJmV2ZW50SWQ9MTQtMjY1NzQwLTIwMTAtMDgtMjgmaXBpZD0xMTYyNzcwNiZzZXNzaW9uS2V5PUFlMHNDUUFNUjJ2ZzQ2dUduT28xJTJGbVVYbjdFJTNEJmRldmljZUlkPUFORFJPSURfQTEwMDAwMTM3NTY2MDUmY291bnRyeT1ybyZwb3N0YWxDb2RlPTAwMDAwJnBsYXRmb3JtPUFORFJPSUQ=" 
     107                ); 
    158108        FINEST("result:\n%s", STR(result.ToString())); 
    159109 

  • trunk/sources/thelib/include/protocols/rtp/connectivity/outboundconnectivity.h

    r107 r113  
    9696                        uint32_t ssrc, uint32_t rate, uint32_t packetsCount, 
    9797                        uint32_t bytesCount, bool isAudio); 
     98        bool CreateRTCPPacket_none(uint8_t *pDest, uint8_t *pSrc, 
     99                        uint32_t ssrc, uint32_t rate, uint32_t packetsCount, 
     100                        uint32_t bytesCount, bool isAudio); 
    98101}; 
    99102 

  • trunk/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp

    r56 r113  
    255255                case RM_USRCTRL_TYPE_UNKNOWN1: 
    256256                case RM_USRCTRL_TYPE_UNKNOWN2: 
     257                case RM_USRCTRL_TYPE_PING_RESPONSE: 
    257258                { 
    258259                        WARN("User control message type: %s", STR(M_USRCTRL_TYPE_STRING(request))); 

  • trunk/sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp

    r53 r113  
    636636                result += "a=control:trackID=" 
    637637                                + (string) pFrom->GetCustomParameters()["audioTrackId"] + "\r\n"; 
    638                 result += "a=fmtp:96 profile-level-id=15;mode=AAC-hbr;sizelength=13;indexlength=3;indexdeltalength=3;config="; 
    639                 result += format("%02x%02x\r\n", 
     638                result += format("a=fmtp:96 streamtype=5; profile-level-id=15; mode=AAC-hbr; config=%02x%02x; SizeLength=13; IndexLength=3; IndexDeltaLength=3; Profile=1;\r\n", 
    640639                                pCapabilities->audioCodecInfo.aac.pAAC[2], 
    641640                                pCapabilities->audioCodecInfo.aac.pAAC[3]); 

  • trunk/sources/thelib/src/protocols/rtp/connectivity/outboundconnectivity.cpp

    r109 r113  
    7878while (0) 
    7979 
    80 #define CreateRTCPPacket CreateRTCPPacket_mystyle 
    81 //#define CreateRTCPPacket CreateRTCPPacket_live555style 
    82  
    8380OutboundConnectivity::OutboundConnectivity() 
    8481: BaseConnectivity() { 
    … …  
    393390                uint32_t ssrc, uint32_t rate, uint32_t packetsCount, uint32_t bytesCount, 
    394391                bool isAudio) { 
    395  
     392         
    396393        /* 
    397394         0                   1                   2                   3 
    … …  
    539536        return true; 
    540537} 
    541  
     538bool OutboundConnectivity::CreateRTCPPacket_none(uint8_t *pDest, uint8_t *pSrc, 
     539                        uint32_t ssrc, uint32_t rate, uint32_t packetsCount, 
     540                        uint32_t bytesCount, bool isAudio){ 
     541        return false; 
     542} 
    542543#endif /* HAS_PROTOCOL_RTP */ 

  • trunk/sources/thelib/src/protocols/rtp/streaming/outnetrtpudph264stream.cpp

    r109 r113  
    147147                uint32_t processedLength, uint32_t totalLength, 
    148148                double absoluteTimestamp, bool isAudio) { 
    149         //#define FeedDataAudioMPEG4Generic FeedDataAudioMPEG4Generic_one_by_one 
    150 #define FeedDataAudioMPEG4Generic FeedDataAudioMPEG4Generic_aggregate 
    151149        return FeedDataAudioMPEG4Generic(pData, dataLength, processedLength, totalLength, 
    152150                        absoluteTimestamp); 
Note: See TracChangeset for help on using the changeset viewer.