summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "NuPlayer: use generation to detect stale requests from old decoders." ↵Wei Jia2014-08-192-4/+31
|\ | | | | | | into lmp-dev
| * NuPlayer: use generation to detect stale requests from old decoders.Wei Jia2014-08-192-4/+31
| | | | | | | | | | | | | | | | Bug: 14955925 Bug: 16303659 Bug: 16467066 Bug: 13133027 Change-Id: I3e66b25b2302c0eb795361629b03bf2e96ed34e4
* | Merge "stagefright: Fix thumbnail generation for some clips." into lmp-devRonghua Wu2014-08-181-7/+1
|\ \
| * | stagefright: Fix thumbnail generation for some clips.Ronghua Wu2014-08-191-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix thumbnail generation for clips that include an immediate resolution change: * Enable dynamic resolution change, when port settings may change while we have filled buffers. * Handle the case when port settings change happens right after stop is called. Bug: 16210021 Change-Id: I8b2c48365d74ce7551f000a1f4b0711647a9796f
* | | Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-devRonghua Wu2014-08-181-0/+1
|\ \ \
| * | | NuPlayer: disable deep audio buffer in offload mode.Ronghua Wu2014-08-181-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 17035257 Change-Id: I56ca28d4c4774c1c0103d19126cf0b8f859964b7
* | | | Merge "NuPlayerRenderer: only query audio sink for position for the first ↵Ronghua Wu2014-08-181-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | entry." into lmp-dev
| * | | | NuPlayerRenderer: only query audio sink for position for the first entry.Ronghua Wu2014-08-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17035257 Change-Id: I472ec4610e1174c59986f42d72fe55f90e93731e
* | | | | Merge "NuPlayer: add support for proper stop" into lmp-devLajos Molnar2014-08-192-3/+64
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | NuPlayer: add support for proper stopLajos Molnar2014-08-082-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer.stop() should move to the Stopped state which is semantically identical to the Initialized state. Bug: 13138230 Change-Id: I5d7b4a22533f545c24a18e2cd9f7cb2685d42c84 Signed-off-by: Lajos Molnar <lajos@google.com>
* | | | | Merge "stagefright: Do not add silence data for compress offload" into lmp-devRonghua Wu2014-08-181-1/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | stagefright: Do not add silence data for compress offloadaarti jadhav-gaikwad2014-08-181-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 16683770 Bug: 17035257 Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea
* | | | Merge "stagefright: add codec capability info for google audio codecs" into ↵Lajos Molnar2014-08-162-15/+74
|\ \ \ \ | | | | | | | | | | | | | | | lmp-dev
| * | | | stagefright: add codec capability info for google audio codecsLajos Molnar2014-08-142-15/+74
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11990470 Change-Id: I6a7d6758727cc205c636dfb19eb7fe99d67fb084
* | | | | stagefright: Fix race condition between MediaCodec and SoftwareRendererRonghua Wu2014-08-155-77/+135
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set the buffer's format info when it's returned from OMX component. * Move frame format meta from SoftwareRenderer's ctor to the render call. I.e. each frame sent to the renderer carries the format info. * Reset renderer with the new format instead of re-creating SoftwareRenderer when incoming frame's format is changed. Bug: 13842676 Change-Id: Ibab46f109200bcbdeab13a4cc1bcd0870f2a99fb
* | | | Merge "use dedicated looper for GenericSource" into lmp-devChong Zhang2014-08-158-45/+45
|\ \ \ \
| * | | | use dedicated looper for GenericSourceChong Zhang2014-08-148-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - handle setVideoSurface in deferred action, and return to client immediately - handle GenericSource's prepareAsync on its own looper, instead of sharing looper with NuPlayer - let HTTPLiveSource share looper with LiveSession, instead of NuPlayer - remove reflector in RTSPSource Bug: 16892748 Change-Id: I1aed557320052012065f5a90adbcb03c238da988
* | | | | Merge "stagefright: allow specifying flac copmression level by 'complexity'" ↵Lajos Molnar2014-08-151-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | stagefright: allow specifying flac copmression level by 'complexity'Lajos Molnar2014-08-141-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 11990470 Change-Id: I428961cc654b768773814078f753e2e67243f186
* | | | | Merge "stagefright/media: add support for codec features with text value" ↵Lajos Molnar2014-08-152-1/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | stagefright/media: add support for codec features with text valueLajos Molnar2014-08-142-1/+20
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 11990470 Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46
* | | | | Merge "nuplayer: create AudioSink early to verify offload is possible" into ↵Andy Hung2014-08-152-133/+156
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | lmp-dev
| * | | | nuplayer: create AudioSink early to verify offload is possibleAndy Hung2014-08-152-133/+156
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Offload audio playback is not guaranteed even if AudioSystem says it is allowed. Create AudioSink early to verify offload is really possible. Move AudioSink open / close into functions. Bug: 16732303 Bug: 16978805 Change-Id: Ie1c73a96656863c1281bed3280a84b86d3cbadf5
* | | | Merge "make NuPlayer's http connection mechanism behave more like that of ↵Chong Zhang2014-08-141-11/+15
|\ \ \ \ | |/ / / |/| | | | | | | AwesomePlayer's" into lmp-dev
| * | | make NuPlayer's http connection mechanism behaveChong Zhang2014-08-141-11/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more like that of AwesomePlayer's - remove cache specific headers before connect - read mime type before creating cached source on top of the http source Bug: 16892521 Change-Id: Ie13a62dd8dd959be6095a42e2b41e3bc817efeb5
* | | cache up to 200K bytes (instead of 10 buffers) in DecoderPassThroughChong Zhang2014-08-132-4/+15
|/ / | | | | | | | | Bug: 16892521 Change-Id: I0e2da4134a37e632f9f2c29d1d27d8fded7a7863
* | stagefright: allow scenarios when dequeueBufferFromNativeWindow failsLajos Molnar2014-08-121-2/+1
| | | | | | | | | | | | | | We can run out of native buffers when the bufferqueue is abandoned. Bug: 16839124 Change-Id: If605f692b87082f1630e1da0fd44da0cb76133f5
* | Merge "MediaCodecList: handle errors gracefully" into lmp-devLajos Molnar2014-08-122-5/+29
|\ \
| * | MediaCodecList: handle errors gracefullyLajos Molnar2014-08-122-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing OMX codecs, and codecs that do not load. Fix NULL dereference when initializing codec with no type. Bug: 16907578 Bug: 16905025 Change-Id: I5d103db36ebb029d1aab03222bf6e9324beb1566
* | | MediaCodecList: don't return referencesLajos Molnar2014-08-121-2/+2
|/ / | | | | | | Bug: 16905025 Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487
* | Merge "propogate heartbeat error code to app" into lmp-devChong Zhang2014-08-111-1/+5
|\ \
| * | propogate heartbeat error code to appChong Zhang2014-08-111-1/+5
| | | | | | | | | | | | | | | Bug: 16885604 Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018
* | | Merge "Extend downsampling ratios greater than 2:1" into lmp-devAndy Hung2014-08-111-4/+4
|\ \ \
| * | | Extend downsampling ratios greater than 2:1Andy Hung2014-08-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improve robustness to choice of sampling rate or buffer size such that increasing either by 10x does not cause overflow. Bug: 12979141 Bug: 15933066 Change-Id: If7989bd745d1bee3bdf811b8b7c978543ccafb65
* | | | Merge changes Idc9808f7,If7bc8e5b into lmp-devDan Albert2014-08-098-0/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix the build after -Bsymbolic fix. Fix PIC relocations for non-Bsymbolic builds
| * | | | Fix the build after -Bsymbolic fix.Dan Albert2014-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16853291 Change-Id: Idc9808f76e8be7afb70513c4036b57c91690728e (cherry picked from commit 8173554d5b5e25215e9c591a0dbb92b8c0ff082e)
| * | | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ARM assembly contains a couple of hand-coded PC relative references to data defined in other object files. Make sure the externs are tagged as hidden so the linker knows that it can resolve the reference locally at build time. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com> Bug: 16853291 Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47 (cherry picked from commit 97e3e847179c17eb9059fb322413b6facd3e5a03)
* | | | | Merge "Added Tunneled video playback support to ACodec" into lmp-devRachad2014-08-097-57/+207
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added Tunneled video playback support to ACodecRachad2014-08-087-57/+207
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:16132368 Change-Id: I88d2d66b8548fc203f4a2c4797196af15e56ff38
* | | | | Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-devLajos Molnar2014-08-091-0/+11
|\ \ \ \ \
| * | | | | stagefright: set crop rect in SoftwareRendererLajos Molnar2014-08-081-0/+11
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 9563986 Change-Id: Id66a21ef8cdd8350e3eb95d6359fe9c1b94c4f98
* | | | | Merge "Fix WAVExtractor to output full audio frames only" into lmp-devLajos Molnar2014-08-091-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix WAVExtractor to output full audio frames onlyAndy Hung2014-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes NuPlayer crash from MediaBuffers ending in partial audio frames. Bug: 16881623 Change-Id: Ia80a9910f99245e645860c00ae85118cc85bef57
* | | | | NuPlayer: getSelectedTrackRobert Shih2014-08-084-0/+51
| |/ / / |/| | | | | | | | | | | Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
* | | | Merge "some clean up of video size change notification" into lmp-devChong Zhang2014-08-087-97/+109
|\ \ \ \ | | |_|/ | |/| |
| * | | some clean up of video size change notificationChong Zhang2014-08-087-97/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to consider rotation when notifying video size change after initial prepare, in addition to after an output format change. Bug: 16870964 Change-Id: Icd1c9e901ac932e720ce95b8a983c0edcf251c35
| * | | delay data source creation for GenericSource prepare timeChong Zhang2014-08-083-21/+80
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 16708180 Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
| * | | Revert "NuPlayer: don't feed decoder input data during flushing."Wei Jia2014-08-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch results in MediaBuffer leakage. This reverts commit 69a85b792c31033a99c8858e3b1a3c2ea68b6278. Bug: 14955925 Bug: 16303659 Bug: 16467066 Bug: 16849601 Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
* | | | Merge "AAC decoder: add support for controlling presentation parameters" ↵Jean-Michel Trivi2014-08-082-5/+111
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | AAC decoder: add support for controlling presentation parametersJean-Michel Trivi2014-08-082-5/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control the dowmixing of the AAC decoder Control the DRC processing of the AAC decoder Bug 16740915 Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297