summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Camera2: Fix the JPEG format issuesZhijun He2014-04-091-19/+117
* Merge "Audio focus doesn't affect RemoteController"Jean-Michel Trivi2014-04-091-164/+101
|\
| * Audio focus doesn't affect RemoteControllerJean-Michel Trivi2014-04-081-164/+101
* | Merge "ImageReader: Fix raw buffer size calculation issue"Zhijun He2014-04-091-2/+4
|\ \ | |/ |/|
| * ImageReader: Fix raw buffer size calculation issueZhijun He2014-04-081-2/+4
* | Revert "Initial implementation of USB Audio output."Eric Laurent2014-04-072-25/+7
|/
* Merge "Simplify and document AudioTrack gain"Glenn Kasten2014-04-041-50/+67
|\
| * Simplify and document AudioTrack gainGlenn Kasten2014-04-031-50/+67
* | resolved conflicts for merge of 4f342e87 to masterJeff Tinker2014-04-033-42/+37
|/
* Merge "camera2: Fix out-of-date metadata test"Igor Murashkin2014-04-012-2/+4
|\
| * camera2: Fix out-of-date metadata testIgor Murashkin2014-04-012-2/+4
* | am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" ...Jeff Tinker2014-04-0111-26/+490
|\ \
| * \ am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu...Jeff Tinker2014-04-0111-26/+490
| |\ \
| | * | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-0111-26/+490
* | | | Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()"Lajos Molnar2014-04-011-0/+6
|\ \ \ \
| * | | | MediaCodec: avoid silent array overflow in queueSecureInputBuffer()Lajos Molnar2014-03-251-0/+6
* | | | | Merge "Don't ignore return value of setAuxEffectSendLevel()"Glenn Kasten2014-04-011-4/+4
|\ \ \ \ \
| * | | | | Don't ignore return value of setAuxEffectSendLevel()Glenn Kasten2014-04-011-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge "Initial implementation of USB Audio output."Paul McLean2014-04-012-7/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Initial implementation of USB Audio output.Paul McLean2014-03-312-7/+25
* | | | | Merge "Synchronize channel masks in AudioFormat with system/audio.h"Glenn Kasten2014-03-311-1/+8
|\ \ \ \ \
| * | | | | Synchronize channel masks in AudioFormat with system/audio.hGlenn Kasten2014-03-281-1/+8
* | | | | | Merge "Fix typo"Glenn Kasten2014-03-311-4/+4
|\ \ \ \ \ \
| * | | | | | Fix typoGlenn Kasten2014-03-281-4/+4
| |/ / / / /
* | | | | | am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t param...Narayan Kamath2014-03-311-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
| |\ \ \ \
| | * \ \ \ Merge "Cast CallMethod's size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
| | |\ \ \ \
| | | * | | | Cast CallMethod's size_t parameters to jintAshok Bhat2014-03-251-2/+2
* | | | | | | Remove SkOmxPixelRef to fix build.Leon Scroggins2014-03-275-117/+0
* | | | | | | Make setServer() safe to call multiple timesMarco Nelissen2014-03-271-2/+7
* | | | | | | Merge "Continue refactoring MediaFocusControl"Jean-Michel Trivi2014-03-262-186/+186
|\ \ \ \ \ \ \
| * | | | | | | Continue refactoring MediaFocusControlJean-Michel Trivi2014-03-252-186/+186
* | | | | | | | Merge "Continue refactoring of MediaFocusControl"Jean-Michel Trivi2014-03-262-162/+226
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Continue refactoring of MediaFocusControlJean-Michel Trivi2014-03-252-162/+226
* | | | | | | | am 959bce3e: am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"Mark Salyzyn2014-03-261-5/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"Mark Salyzyn2014-03-261-5/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | jni: 64-bit compile issueMark Salyzyn2014-03-261-5/+6
| | |/ / / /
* | | | | | Continue refactoring of MediaFocusControlJean-Michel Trivi2014-03-252-11/+17
* | | | | | Begin refactor of MediaFocusControlJean-Michel Trivi2014-03-252-386/+440
| |_|/ / / |/| | | |
* | | | | Merge "AudioTrack write from ByteBuffer updates position"Jean-Michel Trivi2014-03-211-17/+15
|\ \ \ \ \
| * | | | | AudioTrack write from ByteBuffer updates positionJean-Michel Trivi2014-03-211-17/+15
* | | | | | MediaHTTPConnection: fix JNI signatureColin Cross2014-03-201-1/+1
* | | | | | MediaHTTPConnection: use jlong to store native pointerColin Cross2014-03-192-4/+4
* | | | | | Merge "Add stream-level suppression to vibrate/audio services."John Spurlock2014-03-196-15/+157
|\ \ \ \ \ \
| * | | | | | Add stream-level suppression to vibrate/audio services.John Spurlock2014-03-196-15/+157
| |/ / / / /
* | | | | | am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor should...Glenn Kasten2014-03-191-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| |\ \ \ \ | | |/ / /
| | * | | mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| * | | | am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow i...Lajos Molnar2014-03-191-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
| | |\ \ \