summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 8f34c1cc: am 7fb86565: Remove call to enable/disable remote submix from te...Jeff Brown2013-08-191-26/+0
|\
| * am 7fb86565: Remove call to enable/disable remote submix from test program.Jeff Brown2013-08-191-26/+0
| |\
| | * Remove call to enable/disable remote submix from test program.Jeff Brown2013-08-161-26/+0
* | | am 5eab65aa: am ff58698e: am f36ae7ca: Merge "Added support for 3GPP meta dat...Marco Nelissen2013-08-192-3/+131
|\ \ \ | |/ /
| * | am ff58698e: am f36ae7ca: Merge "Added support for 3GPP meta data atoms"Marco Nelissen2013-08-192-3/+131
| |\ \ | | |/ | |/|
| | * am f36ae7ca: Merge "Added support for 3GPP meta data atoms"Marco Nelissen2013-08-192-3/+131
| | |\
| | | * Merge "Added support for 3GPP meta data atoms"Marco Nelissen2013-08-192-3/+131
| | | |\
| | | | * Added support for 3GPP meta data atomsOscar Rydhé2013-08-132-3/+131
| | | * | Fix SoundPool.play() looping regression in 4.3 DO NOT MERGEGlenn Kasten2013-08-091-1/+3
| | |/ /
* | | | am 54233057: am 1cb4e166: Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to m...Lajos Molnar2013-08-167-0/+75
|\ \ \ \ | |/ / /
| * | | Merge "Add MEDIA_STARTED/PAUSED/STOPPED events to media players" into klp-devLajos Molnar2013-08-167-0/+75
| |\ \ \
| | * | | Add MEDIA_STARTED/PAUSED/STOPPED events to media playersLajos Molnar2013-08-157-0/+75
* | | | | am ce57e797: am 75c16dde: Merge "You can now opt-in to having the video decod...Andreas Huber2013-08-151-1/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "You can now opt-in to having the video decoder push blank buffers to t...Andreas Huber2013-08-151-1/+9
| |\ \ \ \
| | * | | | You can now opt-in to having the video decoder push blank buffers to theAndreas Huber2013-08-141-1/+9
* | | | | | am 4dc2abeb: am c13a958f: Merge "fix build. optional tests broke" into klp-devMathias Agopian2013-08-141-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "fix build. optional tests broke" into klp-devMathias Agopian2013-08-151-0/+2
| |\ \ \ \ \
| | * | | | | fix build. optional tests brokeMathias Agopian2013-08-141-0/+2
| | |/ / / /
* | | | | | am 984b3f4d: am 7f76a81b: Merge "Check adaptive playback support via CodecCap...Lajos Molnar2013-08-142-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Check adaptive playback support via CodecCapabilities" into klp-devLajos Molnar2013-08-142-2/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Check adaptive playback support via CodecCapabilitiesLajos Molnar2013-08-132-2/+12
| | |/ / /
* | | | | am 65a6b3b6: am cd06d357: Merge "Optionally repeat the previously submitted f...Andreas Huber2013-08-134-9/+244
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Optionally repeat the previously submitted frame to the encoder" into ...Andreas Huber2013-08-134-9/+244
| |\ \ \ \
| | * | | | Optionally repeat the previously submitted frame to the encoderAndreas Huber2013-08-134-9/+244
* | | | | | am 82278b2c: am fe9611bd: Merge "Fix potential leak of audio input handle." i...Jeff Brown2013-08-121-61/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix potential leak of audio input handle." into klp-devJeff Brown2013-08-121-61/+42
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix potential leak of audio input handle.Jeff Brown2013-08-091-61/+42
| | |/ / /
* | | | | am 4d9bc1a7: am b8689b31: Support for "request-sync" parameter in ACodecAndreas Huber2013-08-121-3/+18
|\ \ \ \ \ | |/ / / /
| * | | | Support for "request-sync" parameter in ACodecAndreas Huber2013-08-121-3/+18
| |/ / /
* | | | am 1b832c3d: Merge "Fix regression for AudioRecord streaming callback mode" i...Glenn Kasten2013-08-091-6/+11
|\ \ \ \ | |/ / /
| * | | Merge "Fix regression for AudioRecord streaming callback mode" into klp-devGlenn Kasten2013-08-081-6/+11
| |\ \ \
| | * | | Fix regression for AudioRecord streaming callback modeGlenn Kasten2013-08-081-6/+11
* | | | | am 9bdc9c4e: am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h...Andreas Huber2013-08-091-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | am bcd86896: am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge "Handle undefined NAL type for h264 streaming"Andreas Huber2013-08-081-0/+7
| | |\ \
| | | * | Handle undefined NAL type for h264 streamingPatrik2 Carlsson2013-07-271-0/+7
| | | |/
* | | | Merge "Consistent style for comparisons of raw pointers to NULL"Glenn Kasten2013-08-081-16/+34
|\ \ \ \ | |/ / / |/| | |
| * | | Consistent style for comparisons of raw pointers to NULLGlenn Kasten2013-08-061-16/+34
* | | | Merge "IOMX: add updateGraphicBufferInMeta method for metadata mode"Lajos Molnar2013-08-067-6/+90
|\ \ \ \
| * | | | IOMX: add updateGraphicBufferInMeta method for metadata modeLajos Molnar2013-08-067-6/+90
* | | | | separte producer and consumer interfacesMathias Agopian2013-08-061-2/+2
* | | | | Merge "AudioRecord notification frames"Glenn Kasten2013-08-061-4/+27
|\ \ \ \ \
| * | | | | AudioRecord notification framesGlenn Kasten2013-08-021-4/+27
* | | | | | Merge "AudioRecord::openRecord_l use flags"Glenn Kasten2013-08-061-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioRecord::openRecord_l use flagsGlenn Kasten2013-08-021-2/+14
* | | | | | Merge "Reject unprepared MediaPlayers"Marco Nelissen2013-08-061-0/+7
|\ \ \ \ \ \
| * | | | | | Reject unprepared MediaPlayersMarco Nelissen2013-08-051-0/+7
* | | | | | | Merge "AudioRecord::openRecord_l now take flags"Glenn Kasten2013-08-061-2/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | AudioRecord::openRecord_l now take flagsGlenn Kasten2013-08-021-2/+3
* | | | | | Merge "IAudioFlinger::openRecord track_flags_t flags is in/out"Glenn Kasten2013-08-052-4/+11
|\ \ \ \ \ \ | |/ / / / /