summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 7957cf09: am d9cfeb44: Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-11-011-2/+10
|\
| * Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-10-311-2/+10
* | am b0163c6d: AudioTrack::flush() will no longer flush later data automerge: 2...Glenn Kasten2014-10-311-5/+22
|\ \ | |/
| * AudioTrack::flush() will no longer flush later dataGlenn Kasten2014-10-301-5/+22
* | am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown time...Eric Laurent2014-10-312-2/+2
|\ \ | |/
| * Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-devEric Laurent2014-10-292-2/+2
| |\
| | * NuPlayer: reduce offload pause teardown timeout.Eric Laurent2014-10-292-2/+2
* | | am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and resume()." into ...Wei Jia2014-10-313-105/+103
|\ \ \ | |/ /
| * | Merge "NuPlayer: merge start() and resume()." into lmp-mr1-devWei Jia2014-10-293-105/+103
| |\ \
| | * | NuPlayer: merge start() and resume().Wei Jia2014-10-283-105/+103
| | |/
* | | am 0d277600: am eac3f36c: Merge "fix deep buffer logic in NuPlayer." into lmp...Eric Laurent2014-10-302-7/+8
|\ \ \ | |/ /
| * | Merge "fix deep buffer logic in NuPlayer." into lmp-mr1-devEric Laurent2014-10-282-7/+8
| |\ \
| | * | fix deep buffer logic in NuPlayer.Eric Laurent2014-10-282-7/+8
| | |/
* | | am 447326d2: am aac745f2: Merge "libmedia: ensure mCaptureThread exit within ...Glenn Kasten2014-10-301-7/+12
|\ \ \ | |/ /
| * | Merge "libmedia: ensure mCaptureThread exit within Visualizer destructor" int...Glenn Kasten2014-10-281-7/+12
| |\ \ | | |/ | |/|
| | * libmedia: ensure mCaptureThread exit within Visualizer destructorHaynes Mathew George2014-10-281-7/+12
* | | am 841daebc: am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP in...Mike Lockwood2014-10-291-0/+9
|\ \ \
| * \ \ am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\ \ \
| | * \ \ Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| | |\ \ \
| | | * | | MTP Device: Parse USB3 descriptor for MTP initor;Bo Huang2014-09-261-0/+9
| * | | | | am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
| |\ \ \ \ \
| * \ \ \ \ \ am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring trac...Andy Hung2014-10-171-1/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am c40da54b: Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." ...Lajos Molnar2014-10-146-225/+194
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-1410-362/+454
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 512e9792: stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-144-21/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*()...Wei Jia2014-10-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-132-1/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st...Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo...Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ...Lajos Molnar2014-10-101-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video ...Wei Jia2014-10-102-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lm...Eric Laurent2014-10-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder shutdown...Andy Hung2014-10-073-52/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ...Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardwa...Chong Zhang2014-10-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaC...Chong Zhang2014-10-041-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to ...Ronghua Wu2014-10-033-5/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder...Ronghua Wu2014-10-032-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aaa527fb: Merge "send available codec buffer count with codec notification...Chong Zhang2014-10-032-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc93499e: Merge "mediarecorder: set level if setting default profile" into...Lajos Molnar2014-10-022-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6eff943c: Merge "NuPlayerDecoder: postpone input message processing when i...Wei Jia2014-10-022-8/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \