summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for ↵Lajos Molnar2014-05-021-7/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | queueBuffer" * commit '63249d6ea560b2f29d3ee255951f527b01ecbac5': AwesomePlayer: use PTS for queueBuffer
| * | | am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'bc4bf532b7581ecb1c8734a63742183c3ecb02c5': AwesomePlayer: use PTS for queueBuffer
| | * \ \ am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b231408849158baea8dddc0edf7e97fcfc2e3240': AwesomePlayer: use PTS for queueBuffer
| | | * \ \ Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | | |\ \ \
| | | | * | | AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
* | | | | | | am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '113f2122662856f2482836f1b4c585a050888afa': Smooth out AwesomePlayer
| * | | | | | am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5': Smooth out AwesomePlayer
| | * | | | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb': Smooth out AwesomePlayer
| | | * | | | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Smooth out AwesomePlayerLajos Molnar2014-05-012-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use clock estimator to smooth out audio time stamps. Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
* | | | | | | am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve ↵Lajos Molnar2014-05-021-3/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scheduling of video event to hit PTS" * commit '9e0922ba7dda72fc94d2af2872cfc630ad599c91': AwesomePlayer: improve scheduling of video event to hit PTS
| * | | | | | am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video ↵Lajos Molnar2014-05-021-3/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event to hit PTS" * commit '6e76fda36a87e154397de816fa091b721a4c11bd': AwesomePlayer: improve scheduling of video event to hit PTS
| | * | | | | am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f9782266802b02fc06a9c532f40128496aefb3e0': AwesomePlayer: improve scheduling of video event to hit PTS
| | | * | | | Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | AwesomePlayer: improve scheduling of video event to hit PTSLajos Molnar2014-05-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
* | | | | | | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ↵Lajos Molnar2014-05-022-0/+178
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | ClockEstimator API and WindowedLinearFitEstimator" * commit 'edf6131d1eca1fdff3b151805d241a1cc81b52ca': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| * | | | | am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and ↵Lajos Molnar2014-05-022-0/+178
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WindowedLinearFitEstimator" * commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| | * | | | am a69d6f52: Merge "stagefright: add ClockEstimator API and ↵Lajos Molnar2014-05-022-0/+178
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WindowedLinearFitEstimator" * commit 'a69d6f529239950a8bdf5e4253ea13bb029375cb': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| | | * | | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"Lajos Molnar2014-05-022-0/+178
| | | |\ \ \ | | | | |/ /
| | | | * | stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-012-0/+178
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
* | | | | | resolved conflicts for merge of 47c888a9 to masterGlenn Kasten2014-05-027-39/+39
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6
| * | | | | am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use ↵Glenn Kasten2014-05-027-35/+35
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64-bits unconditionally" * commit 'e580aa4a756d1825c440a4b4309022b1babb6de1': When passing a size_t via binder, use 64-bits unconditionally
| | * | | | am 86438382: Merge "When passing a size_t via binder, use 64-bits ↵Glenn Kasten2014-05-027-35/+35
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unconditionally" * commit '86438382a381eb39ed8da53fbd16cf6730fded6c': When passing a size_t via binder, use 64-bits unconditionally
| | | * | | Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64-bits is almost always over-kill. But it's easier and cleaner to change the binder code to be accurate, than to rename all the the API parameter types to be 32-bit. Bug: 12381724 Change-Id: Ib8f198d814a2027760ef24e9e3feacee21a973b1
* | | | | | Merge "Use AUDIO_INTERLEAVE_* constants"Glenn Kasten2014-05-011-1/+1
|\ \ \ \ \ \
| * | | | | | Use AUDIO_INTERLEAVE_* constantsGlenn Kasten2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6609fa75c9a57fc4ca3887d626a2f4fb8b6593a1
* | | | | | | am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'f38e190887e73bc08735af95b073ebfaabd65f95': Add missing include
| * | | | | | am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '3d9164da1b3d58701e41c78e06839d61ed1b4ff9': Add missing include
| | * | | | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '236f8ddd23af92f98f2deae86bf6e6b5c9278857': Add missing include
| | | * | | | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | | |\ \ \ \
| | | | * | | | Add missing includeIgor Chernyshev2014-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
* | | | | | | | am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop ↵Lajos Molnar2014-05-011-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | systrace" * commit 'ee46bd378b7a68789be9c85d8a59fa02d4aed030': ACodec: add frame render/drop systrace
| * | | | | | | am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b0b701f57c5efebe868d0eedce8cfc399007e8a': ACodec: add frame render/drop systrace
| | * | | | | | am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c388650722ac53571be21ee04ce342c1c9510c2': ACodec: add frame render/drop systrace
| | | * | | | | Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| | | |\ \ \ \ \
| | | | * | | | | ACodec: add frame render/drop systraceLajos Molnar2014-04-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
* | | | | | | | | am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | * commit 'b4eacebfc5c5fd86b20661eab0797ce70c66e323': Temporary workaround for log spam
| * | | | | | | am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afedc4d99acd52f99221d71b3a372a0a5497a84': Temporary workaround for log spam
| | * | | | | | am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6eafba6bba3a4949cf3807ea39d5c1e969bebc52': Temporary workaround for log spam
| | | * | | | | Temporary workaround for log spamGlenn Kasten2014-05-011-0/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13790505 Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
* | | | | | | resolved conflicts for merge of 0d79b935 to masterGlenn Kasten2014-04-301-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: If6de8c1b1d7707918e2a60ea8583749e0127edb8
| * | | | | | am b27ce2fb: am 416685d0: Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b27ce2fba0049897558f1f3df9039f443ee4bc88': Fix format warnings
| | * | | | | am 416685d0: Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '416685d0cbab40bfc48b0e787206b5d5c2e2ec25': Fix format warnings
| | | * | | | Fix format warningsGlenn Kasten2014-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88
| | * | | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-2924-507/+1894
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when ↵Lajos Molnar2014-03-211-0/+12
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing ADTS." into klp-dev * commit '333ceb4f66ccf790081026f645474e07d832fbdb': DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
| | | * \ \ \ \ am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely ↵Rachad2014-03-211-3/+5
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2^32-1 bytes -- FAT32 max file size) * commit 'f622e2c78407b50806a53a06a89b2b6546420f55': Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
| | | * \ \ \ \ \ am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am ↵Marco Nelissen2014-03-201-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42ba5806: am 72499628: am 25bab830: Fix build * commit 'a577eefbaca24d1b9ac947daca54be1992888748': Fix build
| | | * \ \ \ \ \ \ am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am ↵Marco Nelissen2014-03-201-1/+2
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates * commit '2853e48c855fc95f2bd7bf9438a878f2a79d75a7': Verify certificates
generated by cgit v1.1 at 2024-05-12 15:50:09 +0000