summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is st...Wei Jia2015-08-281-1/+3
|\
| * Merge "NuPlayer: do not create audio decoder if the player is still in shutdo...Wei Jia2015-08-281-1/+3
| |\
| | * NuPlayer: do not create audio decoder if the player is still in shutdown proc...Wei Jia2015-08-271-1/+3
* | | am 03dee050: am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5:...Nick Kralevich2015-08-271-0/+2
|\ \ \ | |/ /
| * | am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777:...Nick Kralevich2015-08-271-0/+2
| |\ \
| | * \ am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am 0981df6e:...Nick Kralevich2015-08-271-0/+2
| | |\ \
| | | * \ am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer...Nick Kralevich2015-08-271-0/+2
| | | |\ \
| | | | * \ am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make su...Nick Kralevich2015-08-271-0/+2
| | | | |\ \
| | | | | * \ am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures...Nick Kralevich2015-08-271-0/+2
| | | | | |\ \
| | | | | | * \ am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initiali...Nick Kralevich2015-08-271-0/+2
| | | | | | |\ \
| | | | | | | * \ am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | | |\ \
| | | | | | | | * | IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
* | | | | | | | | | am d0b5910f: libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | libmedia: clear reply data for IEffect commandAndy Hung2015-08-261-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "AudioSink: Fix for gapless offload playback" into mnc-dr-devEric Laurent2015-08-261-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AudioSink: Fix for gapless offload playbackPreetam Singh Ranawat2015-08-261-2/+2
* | | | | | | | | | am 3a124eb0: am f67f894f: (-s ours) am ff9a97f6: am 92aa0532: am 5e47eb95: am...Abhishek Arya2015-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am f67f894f: (-s ours) am ff9a97f6: am 92aa0532: am 5e47eb95: am 35a7b54e: am...Abhishek Arya2015-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am ff9a97f6: am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am...Abhishek Arya2015-08-250-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Me...Abhishek Arya2015-08-250-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT M...Abhishek Arya2015-08-250-0/+0
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix so...Abhishek Arya2015-08-250-0/+0
| | | | | |\ \ \ \ \ | | | | | | | |/ / / | | | | | | |/| | |
| | | | | | * | | | am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video ...Abhishek Arya2015-08-250-0/+0
| | | | | | |\ \ \ \ | | | | | | | | |/ / | | | | | | | |/| |
| | | | | | | * | | am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size cal...Abhishek Arya2015-08-251-1/+1
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | | * | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| | | | | | | | |\ \
| | | | | | | | | * | DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
* | | | | | | | | | | am e9a3a244: am 529c5cbf: (-s ours) am 1fd9995c: am 196a8a9f: am c4757a87: am...Wei Jia2015-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 529c5cbf: (-s ours) am 1fd9995c: am 196a8a9f: am c4757a87: am b504ca53: am...Wei Jia2015-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 1fd9995c: am 196a8a9f: am c4757a87: am b504ca53: am 3a7ff4c7: (-s ours) am...Wei Jia2015-08-250-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 196a8a9f: am c4757a87: am b504ca53: am 3a7ff4c7: (-s ours) am a5f50e98: DO...Wei Jia2015-08-250-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am c4757a87: am b504ca53: am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - ...Wei Jia2015-08-250-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am b504ca53: am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - SoftwareRende...Wei Jia2015-08-250-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity c...Wei Jia2015-08-250-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before...Wei Jia2015-08-251-0/+7
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-0/+7
| | | | | | | | |/ /
* | | | | | | | | | am a4aed71a: am f1dc8e29: (-s ours) am 524f9946: am 76b3fb29: am 4fd0696a: am...Abhishek Arya2015-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am f1dc8e29: (-s ours) am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Me...Abhishek Arya2015-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix...Abhishek Arya2015-08-251-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software vid...Abhishek Arya2015-08-251-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder bu...Abhishek Arya2015-08-251-1/+1
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size cal...Abhishek Arya2015-08-251-1/+1
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| | | | | | |\ \ \ \
| | | | | | | * | | | DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
* | | | | | | | | | | am 4efc67aa: am 74d08b26: (-s ours) am fb385ac6: am 571d9731: Merge commit \'...Wei Jia2015-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | am 74d08b26: (-s ours) am fb385ac6: am 571d9731: Merge commit \'c642d411\' in...Wei Jia2015-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEADWei Jia2015-08-251-1/+9
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 571d9731: Merge commit \'c642d411\' into HEADWei Jia2015-08-251-1/+9
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge commit 'c642d411' into HEADWei Jia2015-08-251-1/+9
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | am dc5e47f0: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before...Wei Jia2015-08-251-1/+8
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-1/+8
| | | | | | |/ / /