summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove "LOCAL_MODULE_TAGS := debug" for stagefright testsMike Lockwood2013-06-062-12/+0
* am e097efde: am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
|\
| * am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| |\
| | * camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
* | | am 1d263b89: am 62a8f67f: camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
|\ \ \ | |/ /
| * | am 62a8f67f: camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
| |\ \ | | |/
| | * camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
* | | am 25c8c528: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -...The Android Open Source Project2013-06-060-0/+0
|\ \ \ | |/ /
| | |
| | \
| *-. \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-060-0/+0
| |\ \ \
| | | * \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-060-0/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-050-0/+0
| | | | |\
| | * | | | Camera2/3: Move recording frame processing to its own thread.Eino-Ville Talvala2013-06-053-12/+61
| | * | | | stagefright: Fix port-reconfiguration & output-buffer-filled race conditionLajos Molnar2013-06-051-6/+4
| | * | | | Camera2/3: Don't trigger AF when in INFINITY focus mode.Eino-Ville Talvala2013-06-041-1/+10
| | | |_|/ | | |/| |
* | | | | stagefright: created SoftVideoDecoderOMXComponentLajos Molnar2013-06-059-794/+456
* | | | | am 4dd110ae: am 254446a8: Camera2/3: Move recording frame processing to its o...Eino-Ville Talvala2013-06-053-12/+61
|\ \ \ \ \ | |/ / / /
| * | | | am 254446a8: Camera2/3: Move recording frame processing to its own thread.Eino-Ville Talvala2013-06-053-12/+61
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Camera2/3: Move recording frame processing to its own thread.Eino-Ville Talvala2013-06-043-12/+61
| | | |/ | | |/|
* | | | Track exact timestamps in SoftMPEG4/H263 decodersLajos Molnar2013-06-052-4/+15
* | | | Reset PV decoder on SoftMPEG4 decoder resetLajos Molnar2013-06-051-0/+5
* | | | Merge "Fix underruns when sample rate != native sample rate"Glenn Kasten2013-06-041-2/+4
|\ \ \ \
| * | | | Fix underruns when sample rate != native sample rateGlenn Kasten2013-06-041-2/+4
* | | | | am cbbd6c83: am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINIT...Eino-Ville Talvala2013-06-041-1/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode....Eino-Ville Talvala2013-06-041-1/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-devEino-Ville Talvala2013-06-041-1/+10
| | |\ \ \
| | | * | | Camera2/3: Don't trigger AF when in INFINITY focus mode.Eino-Ville Talvala2013-06-031-1/+10
* | | | | | Merge "Fix uninitialized variable error in HLS bandwidth determination."Andreas Huber2013-06-031-1/+1
|\ \ \ \ \ \
| * | | | | | Fix uninitialized variable error in HLS bandwidth determination.Andreas Huber2013-06-031-1/+1
* | | | | | | Merge "Fix our software decoders to reset (more of) their internal state"Andreas Huber2013-06-0311-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Fix our software decoders to reset (more of) their internal stateAndreas Huber2013-06-0311-0/+30
| |/ / / / / /
* | | | | | | am e64d4133: am 25b5617c: Merge "stagefright: Fix port-reconfiguration & outp...Lajos Molnar2013-06-030-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-fil...Lajos Molnar2013-06-031-6/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race cond...Lajos Molnar2013-06-031-6/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | stagefright: Fix port-reconfiguration & output-buffer-filled race conditionLajos Molnar2013-05-311-6/+4
* | | | | | Merge "Use sp<AudioTrack> instead of raw AudioTrack *"Glenn Kasten2013-06-0315-86/+60
|\ \ \ \ \ \
| * | | | | | Use sp<AudioTrack> instead of raw AudioTrack *Glenn Kasten2013-06-0315-86/+60
| | |_|_|/ / | |/| | | |
* | | | | | Merge "wifi-display: fix resolution list and keepalive interval"Chong Zhang2013-06-033-3/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | wifi-display: fix resolution list and keepalive intervalChong Zhang2013-05-303-3/+30
* | | | | | am f9bb8358: am b7319a7e: Update HTTP proxy configuration for all media playb...Andreas Huber2013-06-0316-2/+172
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am b7319a7e: Update HTTP proxy configuration for all media playback inside st...Andreas Huber2013-06-0316-2/+172
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-05-3116-2/+172
| | | |/ / | | |/| |
* | | | | Merge "New HLS implementation supporting independent stream sources, audio-on...Andreas Huber2013-05-3124-868/+2575
|\ \ \ \ \
| * | | | | New HLS implementation supporting independent stream sources, audio-only streamsAndreas Huber2013-05-3124-868/+2575
| | |_|/ / | |/| | |
* | | | | Merge "Consistent whitespace"Glenn Kasten2013-05-316-16/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Consistent whitespaceGlenn Kasten2013-05-306-16/+33
* | | | | Merge "wifi-display: fixes for PAUSE/PLAY state"Chong Zhang2013-05-311-3/+5
|\ \ \ \ \
| * | | | | wifi-display: fixes for PAUSE/PLAY stateChong Zhang2013-05-301-3/+5
* | | | | | Merge "Edit list uses timescale from movie header"Marco Nelissen2013-05-302-7/+11
|\ \ \ \ \ \
| * | | | | | Edit list uses timescale from movie headerMarco Nelissen2013-05-302-7/+11
* | | | | | | am 268f5ccf: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-300-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |