summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove legacy omx_message variables"Andy Hung2014-05-073-50/+12
|\
| * Remove legacy omx_message variablesAndy Hung2014-05-063-50/+12
| | | | | | | | | | | | | | | | | | | | Remove platform_private and data_ptr from omx_message. These were used for legacy deferred buffer creation. See OMXCodec quirks: kDefersOutputBufferAllocation and kRequiresAllocateBufferOnOutputPorts. Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf Signed-off-by: Andy Hung <hunga@google.com>
* | MediaFormat owns its stringsMarco Nelissen2014-05-061-2/+15
|/ | | | | | | Have MediaFormat own the strings it returns from toString and getString, reducing the chance of memory leaks. Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
* Don't build libmediandk for PDKMarco Nelissen2014-05-051-1/+5
| | | | Change-Id: I9b2e5f5c8cc0fad59d4a4268c8767f540d536d10
* WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-055-0/+709
| | | | Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
* Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-021-1/+2
|\
| * Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The AUDIO_FORMAT_PCM_8_BIT format was being converted to AUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks. That conversion was incorrect; it should only be done for mixed tracks. Also remove checks for specific PCM formats in the generic part of server side of createTrack. Those format checks should only be done by the thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc. Change-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978
* | 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
generated by cgit v1.1 at 2024-06-10 13:14:40 +0000