summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
|\ | | | | | | | | * commit '5874615f26a6ba9cda8ba359e5035b21f6e3818b': Allow for larger codec private data
| * Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| | | | | | | | | | | | | | | | | | This change adds support for multibyte sizes in the ESDS. Previously the Matroska extractor only supported single byte sizes, so codec private data had to be less than 108 bytes, and would crash if it was bigger. b/12584090 Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
| * Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| |\
| | * Fix SIGABRT when playing mp4 fileMarco Nelissen2014-03-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the track duration was shorter than the segment duration, the calculated encoder padding would be negative, resulting in a crash. b/11823061 https://code.google.com/p/android/issues/detail?id=62610 Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
* | | am 49ea1337: Merge changes ↵Lajos Molnar2014-03-0712-266/+893
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into ↵Lajos Molnar2014-03-0712-266/+893
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * changes: 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.
| | * | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-03-062-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Bug: 13174301 Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
| | * | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-03-061-12/+22
| | | | | | | | | | | | | | | | | | | | Bug: 13174301 Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
| | * | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2014-03-063-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the code actually match an existing comment in DrmInitialization, which claimed that mURI was the redirected URL and not the original one. Bug: 13174301 Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
| | * | Initial HLS seamless switch implementation.Robert Shih2014-03-064-48/+541
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
| | * | NuPlayer side support for seamless format switch.Robert Shih2014-03-063-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid reinstantiating decoder if seamless format switch is supported. Bug: 11854054 Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
| | * | LiveSession refactorRobert Shih2014-03-064-140/+92
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
| | * | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-03-062-37/+75
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ifd3f3369275889e716b360087b5b60d01635b578
| | * | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-03-062-35/+80
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
* | | | 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.
| * | | Merge "AnotherPacketSource support to get latest buffered MetaData." into ↵Lajos Molnar2014-03-072-2/+25
| |\ \ \ | | |/ / | | | | | | | | klp-dev
| | * | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-03-062-2/+25
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
* | | | 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.
| * | | Merge "Added support to query ACodec whether adaptive playback is enabled." ↵Lajos Molnar2014-03-071-0/+5
| |\ \ \ | | |/ / | | | | | | | | into klp-dev
| | * | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I6b0308aa8550c643706959277e46dad586c37297
* | | | 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
| * | | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into ↵Lajos Molnar2014-03-072-7/+157
| |\ \ \ | | |/ / | | | | | | | | klp-dev
| | * | stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-03-062-7/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying available streams in a variant playlist. Bug: 11854054 Change-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1
* | | | 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.
| * | | Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
| |\ \ \ | | |/ /
| | * | Fixed misplaced bracket for switch-case block.Robert Shih2014-03-061-4/+4
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I66b410e1e19601ad65d8357bda4c0c58e2dc15dc
* | | | 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
| * | | Merge "stagefright: Fix issue with tracking media format in packet source" ↵Lajos Molnar2014-03-072-13/+44
| |\ \ \ | | |/ / | | | | | | | | into klp-dev
| | * | stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-062-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media format in AnotherPacketSource is now tracked across discontinuities. This fixes a bug where format was set on queueAccessUnit and cleared on dequeueAccessUnit, thereby allowing it to remain cleared. Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 12060952
* | | | 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
| * | | Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-devLajos Molnar2014-03-072-29/+105
| |\ \ \ | | |/ /
| | * | stagefright: Fix bugs in playlist fetcher logicLajos Molnar2014-03-062-29/+105
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Improve start time: start playback as soon as the target duration or 10s was buffered. 2. Select playlist monitor time based on target duration to avoid continuously missing the boat. 3. If "we miss the boat" we still must request a safe sequence number (last - 3) Change-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 12060952
| * | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-072-0/+14
| |\ \ | | |/ | |/|
| | * stagefright: do not offload LD-AAC decodingEric Laurent2014-03-062-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, do not offload LD and ELD AAC decoding because there is no way to know if it is supported by the audio DSP implementation. The longer term fix will be to have mapMimeToAudioFormat() use the audio object type in track metadata to refine the AAC format and the audio HAL list supported AAC profiles. Bug: 11697128. Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
| * | Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-devEric Laurent2014-03-061-17/+23
| |\ \ | | |/
| | * stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2014-03-051-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | Fix HE AAC SBR sampling rate reading for explicit signaling. Bug: 11697128. Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
* | | am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '3b7ddf83db2d11c08116a6476c0f11e71bd72ba4': set AAC MPEG version to MPEG-2
| * | set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| |/ | | | | | | | | | | | | wifi display play spec only allows MPEG-2 AAC. Bug: 12747927 Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
| * Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-051-4/+7
| | | | | | | | | | Bug: 11967381 Change-Id: Iedec06280aa745d9df5d661f4916940cede9c191
* | am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
|\ \ | | | | | | | | | | | | * commit '25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf': AudioTrack: fix obtainBuffer timeout calculation
| * \ am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '88876fb4eb8365343f2a9ca0e8f53148ca38b845': AudioTrack: fix obtainBuffer timeout calculation
| | * AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::obtainBuffer() passes a pointer to a timeout variable that has gone out of scope when calling ClientProxy::obtainBuffer(). Same fix for AudioRecord. Bug: 11968591. Change-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9
| | * libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-052-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay release of wakelock in the TimedEventQueue to after an event has been processed. This ensures AP shutdown does not happen while an event is ready but hasn't been processed yet. Bug: 11976087. Change-Id: I9bce83b9ff0f2b4d174a53c95e5b0f135b5ccc70
| | * update offloaded audio track sampling rateEric Laurent2014-03-054-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Bug: 12823955. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | | am 6b260425: am 85b3013e: fix deadlock issues that arise when there are ↵jpadmana2014-03-055-31/+88
|\ \ \ | |/ / | | | | | | | | | | | | | | | simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds * commit '6b2604259c12ee28b49f26ab2adac96eefe30934': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| * | am 85b3013e: fix deadlock issues that arise when there are simultaneous ↵jpadmana2014-03-055-31/+88
| |\ \ | | |/ | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds * commit '85b3013e06e8fe7802fe6259ecac80261e834332': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| | * fix deadlock issues that arise when there are simultaneousjpadmana2014-03-045-31/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds Whenever there are parallel calls to proxy and non sub-effects wrappers, some of the calls are not completed. This is due to deadlock arsing out of Proxy waiting for the subeffect call to return and subeffect waiting for proxy to release lock. The call flow is changed to a cleaner and simple one - Proxy gets the aeli(effect library info) of subeffects during the EffectGetSubEffects() call. Therby, proxy will manage the sub effects by itself rather than going through effects factory. Change-Id: If4b259da5776f151c1e81a78a0239d342046d923 Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044
| | * AudioTrack: fix position callback after restoreEric Laurent2013-11-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring an AudioTrack, the next position callback point should not be modified and set ahead of current buffer head. Otherwise, as frames are dropped, the new position is never reached and an application relying on position callbacks to reload the buffer would be stalled. Bug: 11868603. Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
* | | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
| | | | | | | | | | | | | | | | | | Reference: http://www.atsc.org/cms/standards/A52-2012(12-17).pdf Bug: 12950777 Change-Id: Ic60033170b21e67408a3b3444507f6528946bdd0
* | | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-035-0/+253
| | | | | | | | | | | | Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
generated by cgit v1.1 at 2025-02-03 13:49:49 +0000