Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | stagefright: add ClockEstimator API and WindowedLinearFitEstimator | Lajos Molnar | 2014-05-01 | 2 | -0/+178 | |
* | | | | | | resolved conflicts for merge of 47c888a9 to master | Glenn Kasten | 2014-05-02 | 7 | -39/+39 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bit... | Glenn Kasten | 2014-05-02 | 7 | -35/+35 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am 86438382: Merge "When passing a size_t via binder, use 64-bits uncondition... | Glenn Kasten | 2014-05-02 | 7 | -35/+35 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "When passing a size_t via binder, use 64-bits unconditionally" | Glenn Kasten | 2014-05-02 | 7 | -35/+35 | |
| | | |\ \ \ | | | | |/ / | | | |/| | | ||||||
| | | | * | | When passing a size_t via binder, use 64-bits unconditionally | Glenn Kasten | 2014-02-13 | 7 | -35/+35 | |
* | | | | | | Merge "Use AUDIO_INTERLEAVE_* constants" | Glenn Kasten | 2014-05-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use AUDIO_INTERLEAVE_* constants | Glenn Kasten | 2014-04-30 | 1 | -1/+1 | |
* | | | | | | | am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include" | Glenn Kasten | 2014-05-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | am 3d9164da: am 236f8ddd: Merge "Add missing include" | Glenn Kasten | 2014-05-01 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | am 236f8ddd: Merge "Add missing include" | Glenn Kasten | 2014-05-01 | 1 | -0/+1 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | | * | | | | Merge "Add missing include" | Glenn Kasten | 2014-05-01 | 1 | -0/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Add missing include | Igor Chernyshev | 2014-04-02 | 1 | -0/+1 | |
* | | | | | | | | am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop s... | Lajos Molnar | 2014-05-01 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace" | Lajos Molnar | 2014-05-01 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 0c388650: Merge "ACodec: add frame render/drop systrace" | Lajos Molnar | 2014-05-01 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Merge "ACodec: add frame render/drop systrace" | Lajos Molnar | 2014-05-01 | 1 | -0/+7 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | ACodec: add frame render/drop systrace | Lajos Molnar | 2014-04-30 | 1 | -0/+7 | |
* | | | | | | | | | am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam" | Glenn Kasten | 2014-05-01 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam" | Glenn Kasten | 2014-05-01 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 6eafba6b: Merge "Temporary workaround for log spam" | Glenn Kasten | 2014-05-01 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Temporary workaround for log spam | Glenn Kasten | 2014-05-01 | 1 | -0/+5 | |
| | | |/ / / / | ||||||
* | | | | | | | resolved conflicts for merge of 0d79b935 to master | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am b27ce2fb: am 416685d0: Merge "Fix format warnings" | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am 416685d0: Merge "Fix format warnings" | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Fix format warnings | Glenn Kasten | 2014-04-28 | 1 | -3/+3 | |
| | * | | | | | 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 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32... | 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 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | am b635b0e6: 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 67a10c52: Merge "httplive: clear access units before returning from seekTo... | Lajos Molnar | 2014-03-14 | 4 | -15/+42 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back... | Chong Zhang | 2014-03-14 | 1 | -7/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i... | Chong Zhang | 2014-03-13 | 4 | -6/+167 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended | Chong Zhang | 2014-03-13 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 19afb386: Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-13 | 5 | -6/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch" | Narayan Kamath | 2014-03-11 | 2 | -4/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a9b82160: Merge "LP64 fixes for media/libeffects" | Narayan Kamath | 2014-03-11 | 14 | -61/+62 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0cf16339: Merge "Fix preventing from heap overwrite in capture command" | Glenn Kasten | 2014-03-11 | 1 | -34/+35 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 096d72a3: Merge "AArch64: Correction for LP64" | Narayan Kamath | 2014-03-11 | 1 | -5/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |