summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
| | | * \ \ \ \ \ \ 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-146-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6': Implemented support for RTSP 301 Redirect
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70cc5bdc0fca3f67f3602f04152c29323cad99df': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 67a10c52: Merge "httplive: clear access units before returning from ↵Lajos Molnar2014-03-144-15/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekTo." into klp-dev * commit '67a10c522898d8223f5a2d389a846b7e2327148a': httplive: clear access units before returning from seekTo.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cf49a51f: fix codec buffer leak in error handling when timestamp goes ↵Chong Zhang2014-03-141-7/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backward * commit 'cf49a51ff59c3cd228d178d23252ac0d39d5a893': fix codec buffer leak in error handling when timestamp goes backward
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-134-6/+167
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1c608ab33acab82d4a87f1abedcc99a623d1b53a': save mGraphicBuffer pointer even when we're suspended
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-135-6/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376': Remove streaming URI from default logs
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-112-4/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ad7af29bb667d939f27417011567847c4b62f94': Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-1114-61/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9b82160a6682438d43709ba5e7a29022ad1af58': LP64 fixes for media/libeffects
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-03-111-34/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cf1633922f970caee19e2cc2f5c042ca30b4aa6': Fix preventing from heap overwrite in capture command
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 096d72a3: Merge "AArch64: Correction for LP64"Narayan Kamath2014-03-111-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '096d72a32824a0a8c86a716ba44d589183b2b0b3': AArch64: Correction for LP64
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-03-111-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8fc4d57d41f532b90187b9404a8ac705770d75b4': Avoid a building error
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-3/+22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-081-17/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8': Simplify AudioTrack stream end and fix race
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-081-30/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5874615f26a6ba9cda8ba359e5035b21f6e3818b': Allow for larger codec private data
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-03-071-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80b72e6f4202ce26facbe51b8739814bca198a2c': libeffects: don't set module path
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 49ea1337: Merge changes ↵Lajos Molnar2014-03-079-254/+864
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev * commit '49ea13379fb15ddb73183ebafa3a377342ef932f': LiveSession: Use the actual, possibly redirected url as base in the M3U M3UParser: Skip query strings when looking for the last slash in a URL ChromiumHTTPDataSource: Keep track of the redirected URL Initial HLS seamless switch implementation. NuPlayer side support for seamless format switch. LiveSession refactor PlaylistFetcher: Add support for block-by-block decryption. LiveSession: Add support for block-by-block fetchFile.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e0c3058a: Merge "AnotherPacketSource support to get latest buffered ↵Lajos Molnar2014-03-072-2/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MetaData." into klp-dev * commit 'e0c3058a1d0953f4c85bfc964926cf5babb7dbac': AnotherPacketSource support to get latest buffered MetaData.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2613347d: Merge "Added support to query ACodec whether adaptive playback ↵Lajos Molnar2014-03-071-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled." into klp-dev * commit '2613347d74c3f35bc6fda5df1c29c1119c22d432': Added support to query ACodec whether adaptive playback is enabled.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as ↵Lajos Molnar2014-03-072-7/+157
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fallback" into klp-dev * commit '909498b72d740e3151561fd4435ad0a329ec9c6e': stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2338782d18d9bcc8197c63dbf205332a2a737440': Fixed misplaced bracket for switch-case block.
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ad21a81a: Merge "stagefright: Fix issue with tracking media format in ↵Lajos Molnar2014-03-072-13/+44
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet source" into klp-dev * commit 'ad21a81af3e7d6b58002c9dce9c3278b6323e4a9': stagefright: Fix issue with tracking media format in packet source
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into ↵Lajos Molnar2014-03-072-29/+105
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'b74b209862cbcbab6053cf4a43bbc16940aaafd2': stagefright: Fix bugs in playlist fetcher logic
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-071-6/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af191eb4feac513d17dc0362e0cea5bc9e0ffe9d': Replace size_t in shared memory by uint32_t
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte ↵Lajos Molnar2014-03-071-6/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requires it" * commit '7eacea1156a3896ee7813cd9a06c535e63c95f6a': avcenc: Only do startcode escaping if the next byte requires it