Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD | Bill Yi | 2014-04-29 | 24 | -507/+1894 |
|\ | |||||
| * | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
| |\ | |||||
| | * | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
| | |\ | |||||
| | | * | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS. | Robert Shih | 2014-03-21 | 1 | -0/+12 |
| * | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32... | Rachad | 2014-03-21 | 1 | -3/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Increased recorded MP4 max file size to 4GB | Rachad | 2014-03-21 | 1 | -3/+5 |
| | |/ | |||||
| * | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | |\ | |||||
| | | * | am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | | * | am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | |\ | |||||
| | | | | | * | am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | |\ | |||||
| | | | | | | * | Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| * | | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | |\ \ \ | | | | | | |/ / | |||||
| | | | | | * | | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | |\ \ | | | | | | | |/ | |||||
| | | | | | | * | am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | |\ | |||||
| | | | | | | | * | am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | Verify certificates | Marco Nelissen | 2014-03-19 | 1 | -2/+102 |
| | | | | | * | | | | Bug fix for the MediaPlayer::prepare() api. | Dylan Powers | 2012-11-29 | 3 | -5/+7 |
| * | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only." | Glenn Kasten | 2014-03-19 | 7 | -13/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less | Lajos Molnar | 2014-03-19 | 2 | -7/+10 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | stagefright: allow for minUndequeuedBufs to be one less | Lajos Molnar | 2014-03-19 | 2 | -7/+10 |
| * | | | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 2 | -30/+55 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 2 | -30/+55 |
| * | | | | | | | | | | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files. | Robert Shih | 2014-03-19 | 5 | -188/+285 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | httplive: block-by-block fetch, decrypt, and parse ts files. | Robert Shih | 2014-03-19 | 5 | -188/+285 |
| * | | | | | | | | | | am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit" | Colin Cross | 2014-03-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories" | Glenn Kasten | 2014-03-18 | 5 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 75dcf510: Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -1/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -1/+101 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Verify certificates | Marco Nelissen | 2014-03-13 | 2 | -1/+101 |
| * | | | | | | | | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 6 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect" | Andreas Huber | 2014-03-14 | 1 | -11/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev | Lajos Molnar | 2014-03-14 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge changes Ic46e3069,Idc92716b into klp-dev | Lajos Molnar | 2014-03-12 | 2 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | LiveSession: fix incorrect stream key (subtitle"s") | Robert Shih | 2014-03-11 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | M3UParser: trim spaces when parsing comma separated codecs. | Robert Shih | 2014-03-11 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | am 67a10c52: Merge "httplive: clear access units before returning from seekTo... | Lajos Molnar | 2014-03-14 | 4 | -15/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Merge "httplive: clear access units before returning from seekTo." into klp-dev | Lajos Molnar | 2014-03-12 | 4 | -15/+42 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | httplive: clear access units before returning from seekTo. | Robert Shih | 2014-03-11 | 4 | -15/+42 |
| | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back... | Chong Zhang | 2014-03-14 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | fix codec buffer leak in error handling when timestamp goes backward | Chong Zhang | 2014-03-11 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i... | Chong Zhang | 2014-03-13 | 4 | -6/+167 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-dev | Chong Zhang | 2014-03-11 | 4 | -6/+167 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | Cap pts gap between adjacent frames to specified value | Chong Zhang | 2014-03-11 | 4 | -6/+167 |
| | | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended | Chong Zhang | 2014-03-13 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / |