summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code p...Wei Jia2014-12-082-17/+15
|\
| * Merge "avc_util: try to find the first start code prefix 0x000001 even though...Wei Jia2014-12-052-17/+15
| |\
| | * avc_util: try to find the first start code prefix 0x000001 even though there ...Wei Jia2014-12-042-17/+15
* | | am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-081-1/+1
|\ \ \ | |/ /
| * | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| |/
* | am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in valida...Wei Jia2014-12-051-4/+19
|\ \ | |/
| * ESQueue: add frame length checking in validation of ADTS header.Wei Jia2014-12-031-4/+19
* | am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ...Lajos Molnar2014-12-041-0/+1
|\ \
| * \ Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedS...Lajos Molnar2014-12-041-0/+1
| |\ \
| | * | libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
* | | | am b783a705: am ab05b4cc: StreamingSource: check mTSParser before dereferenci...Wei Jia2014-12-031-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
* | | | am bde85d05: am 5458756a: Merge "Track volume should be maintained even if tr...Glenn Kasten2014-12-021-1/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
| |\ \ \
| | * | | Track volume should be maintained even if track is restoredseunghak.han2014-12-011-1/+5
* | | | | am 779d4164: am f1828910: nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-022-6/+14
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | nuplayer: clear pending audio access unit on flush.Ronghua Wu2014-12-012-6/+14
* | | | | am 3253bef3: am d8731629: Merge "notify seek complete upon first video output...Chong Zhang2014-12-028-28/+107
|\ \ \ \ \ | |/ / / /
| * | | | Merge "notify seek complete upon first video output frame" into lmp-mr1-devChong Zhang2014-12-028-28/+107
| |\ \ \ \
| | * | | | notify seek complete upon first video output frameChong Zhang2014-12-018-28/+107
* | | | | | am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from Vor...Glenn Kasten2014-12-011-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Added support for YEAR metadata key from VorbisCommentsAndreas Lillvik2014-11-111-0/+1
| | | |_|/ | | |/| |
* | | | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2742-237/+95
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
| |\ \ \ \
| | * | | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2543-241/+95
* | | | | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...Eric Laurent2014-11-274-39/+75
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "AudioRecord: use audio attributes instead of audio source." into lmp-m...Eric Laurent2014-11-264-39/+75
| |\ \ \ \ \
| | * | | | | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-254-39/+75
* | | | | | | am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED...Chong Zhang2014-11-261-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-m...Chong Zhang2014-11-261-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | MediaCodec: resume codec if state is FLUSHED in async modeChong Zhang2014-11-261-0/+2
| | | |_|_|/ | | |/| | |
* | | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-264-223/+128
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-264-223/+128
| |\ \ \ \ \
| | * | | | | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-223/+128
* | | | | | | am 1e18795a: am d325005e: Merge "Fix AudioTrack loop mode to play audio from ...Andy Hung2014-11-262-4/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix AudioTrack loop mode to play audio from buffer start" into lmp-mr1...Andy Hung2014-11-252-4/+9
| |\ \ \ \ \ \
| | * | | | | | Fix AudioTrack loop mode to play audio from buffer startAndy Hung2014-11-242-4/+9
| | | |/ / / / | | |/| | | |
* | | | | | | am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when sett...Lajos Molnar2014-11-261-12/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "stagefright: add graceful handling when setting port definition" into ...Lajos Molnar2014-11-251-12/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | stagefright: add graceful handling when setting port definitionLajos Molnar2014-11-251-12/+12
| | |/ / / /
* | | | | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-261-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | audio: new routing strategies and stream typesEric Laurent2014-11-211-1/+1
| |/ / / /
* | | | | am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent...Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
| |\ \ \ \
| | * | | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
* | | | | | am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
* | | | | | am e30dc38b: am 7877cb80: Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
| |\ \ \ \ \