Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queu... | Lajos Molnar | 2014-05-02 | 1 | -7/+10 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer" | Lajos Molnar | 2014-05-02 | 1 | -7/+10 | |
| |\ \ \ | ||||||
| | * \ \ | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer" | Lajos Molnar | 2014-05-02 | 1 | -7/+10 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge "AwesomePlayer: use PTS for queueBuffer" | Lajos Molnar | 2014-05-02 | 1 | -7/+10 | |
| | | |\ \ \ | ||||||
| | | | * | | | AwesomePlayer: use PTS for queueBuffer | Lajos Molnar | 2014-05-01 | 1 | -7/+10 | |
* | | | | | | | am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer" | Lajos Molnar | 2014-05-02 | 2 | -4/+25 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer" | Lajos Molnar | 2014-05-02 | 2 | -4/+25 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am b52675e9: Merge "Smooth out AwesomePlayer" | Lajos Molnar | 2014-05-02 | 2 | -4/+25 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "Smooth out AwesomePlayer" | Lajos Molnar | 2014-05-02 | 2 | -4/+25 | |
| | | |\ \ \ \ | | | | |/ / / | ||||||
| | | | * | | | Smooth out AwesomePlayer | Lajos Molnar | 2014-05-01 | 2 | -4/+25 | |
* | | | | | | | am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduli... | Lajos Molnar | 2014-05-02 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video e... | Lajos Molnar | 2014-05-02 | 1 | -3/+7 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS" | Lajos Molnar | 2014-05-02 | 1 | -3/+7 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "AwesomePlayer: improve scheduling of video event to hit PTS" | Lajos Molnar | 2014-05-02 | 1 | -3/+7 | |
| | | |\ \ \ \ | | | | |/ / / | ||||||
| | | | * | | | AwesomePlayer: improve scheduling of video event to hit PTS | Lajos Molnar | 2014-05-01 | 1 | -3/+7 | |
* | | | | | | | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator... | Lajos Molnar | 2014-05-02 | 2 | -0/+178 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind... | Lajos Molnar | 2014-05-02 | 2 | -0/+178 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit... | Lajos Molnar | 2014-05-02 | 2 | -0/+178 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator" | Lajos Molnar | 2014-05-02 | 2 | -0/+178 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | 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 | |
| | | |\ \ \ \ \ \ \ |