summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* ACodec: remove PTS log spamLajos Molnar2014-05-152-4/+2
| | | | | | Bug: 14976517 Bug: 11784827 Change-Id: Ibc1bbd80e7aac30b0f8f1e9ca2be1bb3e5e2ebbb
* Send 64 bit OMX codec handling to 32 bit MediaServerAndy Hung2014-05-143-0/+22
| | | | | | | | | This is a temporary fix for 64 bit OMX handling until 64 bit codecs are more robust. Bug: 13938273 Change-Id: Ifc79e360f9606f6c909b859d322b7dd5d416b26b Signed-off-by: Andy Hung <hunga@google.com>
* Update OMX messages for 64 bitAndy Hung2014-05-148-85/+167
| | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* Merge "Expose sample duration in MPEG4Extractor."Robert Shih2014-05-095-8/+27
|\
| * Expose sample duration in MPEG4Extractor.Robert Shih2014-04-255-8/+27
| | | | | | | | | | Bug: 12782113 Change-Id: I75ee361243c5382d9288349c554deb7bed952782
* | Merge "PlaylistFetcher: start queueing AUs after the 1st IDR nalu"Robert Shih2014-05-092-0/+21
|\ \
| * | PlaylistFetcher: start queueing AUs after the 1st IDR naluRobert Shih2014-04-252-0/+21
| |/ | | | | | | | | Bug: 14159556 Change-Id: I4fc16dda9357e1251d2909571a79215d13d0104b
* | Merge "stagefright: set PTS for SoftwareRenderer"Lajos Molnar2014-05-093-5/+13
|\ \
| * | stagefright: set PTS for SoftwareRendererLajos Molnar2014-05-073-5/+13
| | | | | | | | | | | | Change-Id: I08661a9eae09f919149aa5a58aa514d848de50a1
* | | MediaCodec: add renderAndReleaseOutputBuffer() method with timestampLajos Molnar2014-05-082-1/+49
| | | | | | | | | | | | | | | Bug: 11784827 Change-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4
* | | Allow BOM and space in WebVTT filesLajos Molnar2014-05-082-1/+28
|/ / | | | | | | | | Bug: 10900755 Change-Id: I47a7a33f749ea2470ce7d9d36d33c7484637d61c
* | 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>
* | 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
| | | * | 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
| | | * | 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
| | | * | 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
| | | * | stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-012-0/+178
| | | | | | | | | | | | | | | | | | | | Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
* | | | | 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
| | * | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-2919-484/+1781
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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
| | | * \ \ \ \ \ am 24e1bd71: Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-197-13/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a': libstagefright is no longer 32 bit only.
| | | * \ \ \ \ \ \ am 1faa4170: stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1faa41704e0b976e546321effcb09a85767d51ba': stagefright: allow for minUndequeuedBufs to be one less
| | | * \ \ \ \ \ \ \ am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b635b0e66b257ab442e230bca96afd5105cf6829': mediaplayer: keep more buffers with the BufferQueue
| | | * \ \ \ \ \ \ \ \ am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8': httplive: block-by-block fetch, decrypt, and parse ts files.
| | | * \ \ \ \ \ \ \ \ \ am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"Colin Cross2014-03-181-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2ecad7f079f4f852d334e67fd7a72ff1696a78e': libstagefright_foundation: fix printf format for 64-bit
| | | * \ \ \ \ \ \ \ \ \ \ am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-185-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c': More precise 32-bit only for libstagefright/ subdirectories
| | | * \ \ \ \ \ \ \ \ \ \ \ am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75dcf5101c90e31bbac95694d835b0e8f57ba720': Verify certificates
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-144-0/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only