summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-012-2/+14
|\ \ \ \
| * | | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-012-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17470065 Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
* | | | | Merge "GenericSource: support disconnect before NuCachedSource2 is created" ↵Robert Shih2014-10-013-9/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-013-9/+43
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 17672488 Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
* | | | | Merge "NuCachedSource2: fix disconnect process" into lmp-devRobert Shih2014-10-011-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | NuCachedSource2: fix disconnect processRobert Shih2014-09-301-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - clear mAsyncResult - return early from reads if mDisconnecting is set Bug: 17696761 Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2
* | | | Merge "Check if info for uri is available" into lmp-devMarco Nelissen2014-09-301-0/+4
|\ \ \ \
| * | | | Check if info for uri is availableMarco Nelissen2014-09-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before retrieving it. Bug: 17683986 Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
* | | | | mediaplayer: make frame-accurate avsync configurableLajos Molnar2014-09-291-0/+20
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | disable by default Bug: 17686015 Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
* | | | Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-263-2/+36
|\ \ \ \ | |/ / / |/| | |
| * | | audio: fix stream type for accessibility usageEric Laurent2014-09-253-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that accessibility prompts are heard when a ringtone is active by forcing stream type to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE. Bug: 17558149. Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
* | | | Merge "NuPlayer: use format obtained from source to tell if video exists." ↵Wei Jia2014-09-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17374216 Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
* | | | | Fix SoftAAC2 flushMarco Nelissen2014-09-251-4/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there were less than a full frame worth of samples in the ring buffer, then flush would loop forever trying to empty the ring buffer. Bug: 17646525 Change-Id: I68ec87352a91ce3a96d05e9b3f60a6e7975f9156
* | | | Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
|\ \ \ \
| * | | | NuPlayer: Fix decoder error handlingAndy Hung2014-09-243-15/+40
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon error, release MediaCodec after flushing data. Report errors when they occur with ALOGE. Fix onInputBufferFilled mInputBufferIsDequeued check. Bug: 17423087 Bug: 17622642 Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
* | | | Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-devLajos Molnar2014-09-251-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix Widevine classic playback errors with NuPlayerJeff Tinker2014-09-241-1/+8
| | | | | | | | | | | | | | | | | | | | bug: 17589961 Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
* | | | stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-241-6/+6
| | | | | | | | | | | | | | | | | | | | Bug: 17648616 Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
* | | | Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-devLajos Molnar2014-09-252-4/+17
|\ \ \ \
| * | | | mediaplayer: handle bad input in VideoFrameSchedulerLajos Molnar2014-09-242-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17626098 Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
* | | | | Merge "stagefright: use frame height if slice height is 0" into lmp-devLajos Molnar2014-09-251-7/+14
|\ \ \ \ \
| * | | | | stagefright: use frame height if slice height is 0Lajos Molnar2014-09-241-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for some vendors that set slice height to 0. Android uses slice height is the vertical stride for YUV planar and semiplanar formats. Bug: 13433554 Change-Id: I4da038e7a768dcd8360c33fa1a9ce95a172f16bb
* | | | | | Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port ↵Ronghua Wu2014-09-251-0/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | definition changed." into lmp-dev
| * | | | | SoftVideoDecoderOMXComponent: re-config the buffer size when port definition ↵Ronghua Wu2014-09-241-0/+34
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | changed. Bug: 17326758 Change-Id: I7c6b85284ae0cbfa54f999851f56db84345b65bf
* | | | | Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into ↵Ronghua Wu2014-09-255-18/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.Ronghua Wu2014-09-245-18/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17326758 Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
* | | | | Merge "LiveSession: do not drop seek request" into lmp-devRobert Shih2014-09-251-10/+17
|\ \ \ \ \
| * | | | | LiveSession: do not drop seek requestRobert Shih2014-09-181-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17538727 Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
* | | | | | Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into ↵Wei Jia2014-09-241-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | NuPlayerDecoder: release MediaBuffers when decoder is deleted.Wei Jia2014-09-241-0/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
* | | | | | Merge "stagefright: return encrypted input buffer for secure codecs" into ↵Lajos Molnar2014-09-241-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | lmp-dev
| * | | | | stagefright: return encrypted input buffer for secure codecsLajos Molnar2014-09-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17630446 Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
* | | | | | Merge "NuCachedSource2: more fixes for source read hang" into lmp-devChong Zhang2014-09-241-2/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | NuCachedSource2: more fixes for source read hangChong Zhang2014-09-241-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not try to read from HTTP source if already disconnecting - Let NuCachedSource2::readAt() return immediately when disconnecting Bug: 17613805 Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
* | | | | | Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into ↵Ronghua Wu2014-09-244-84/+141
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | lmp-dev
| * | | | | stagefright: add adaptive playback support to SoftHEVC decoder.Ronghua Wu2014-09-234-84/+141
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 17326758 Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
* | | | | Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-devWei Jia2014-09-243-19/+29
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | NuPlayer will notify SeekComplete only when requested so.Wei Jia2014-09-233-19/+29
| | |/ / | |/| | | | | | | | | | | | | | Bug: 17596535 Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
* | | | NuPlayer: change assert to conditional check.Wei Jia2014-09-231-6/+20
| | | | | | | | | | | | | | | | | | | | Bug: 17491050 Change-Id: I657866c5342c227d57617eb89955897171eb5976
* | | | Merge "NuPlayer: add pause timeout event for offload audio." into lmp-devRonghua Wu2014-09-232-1/+46
|\ \ \ \
| * | | | NuPlayer: add pause timeout event for offload audio.Ronghua Wu2014-09-222-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17375249 Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
* | | | | Merge "NuPlayer: use generation to filter out stale message from renderer." ↵Wei Jia2014-09-232-7/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | NuPlayer: use generation to filter out stale message from renderer.Wei Jia2014-09-222-7/+20
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up generation number for decoders. Bug: 17507846 Change-Id: Ibd2cfe11f89f404882d66c384b5198dc641f5e71
* | | | | Merge "MyHandler: set ip address to an invalid one when getsockname() ↵Wei Jia2014-09-231-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | returns error." into lmp-dev
| * | | | | MyHandler: set ip address to an invalid one when getsockname() returns error.Wei Jia2014-09-221-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17556472 Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
* | | | | Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-devChong Zhang2014-09-221-1/+12
|\ \ \ \ \
| * | | | | fix crash when makeHTTPConnection fails with null pointerChong Zhang2014-09-221-1/+12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 17608108 Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
* | | | | Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" ↵Andy Hung2014-09-221-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | into lmp-dev
| * | | | MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name pointer argument in MediaCodec::init() was being implicitly deallocated. Bug: 17499622 Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2