summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MTP: Implement date created field in GetObjectInfoMike Lockwood2013-04-011-1/+2
* Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-devLajos Molnar2013-04-011-2/+2
|\
| * stagefright: matroska: don't crash on parsing errorLajos Molnar2013-03-271-2/+2
* | Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2...Andreas Huber2013-03-281-3/+17
|\ \
| * | Fix SHUTDOWN after SETUP and before PLAY in wifi display.Andreas Huber2013-03-281-3/+17
* | | Merge "Make sure resume() and flush() are handled appropriately even if the c...Andreas Huber2013-03-281-0/+16
|\ \ \
| * | | Make sure resume() and flush() are handled appropriately even if the codecAndreas Huber2013-03-281-0/+16
| |/ /
* | | Merge "Fix valgrind error in software h264 decoder" into jb-mr2-devMarco Nelissen2013-03-281-4/+2
|\ \ \
| * | | Fix valgrind error in software h264 decoderMarco Nelissen2013-03-271-4/+2
* | | | Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-devEino-Ville Talvala2013-03-283-16/+219
|\ \ \ \
| * | | | Camera: Add output side to camera3 HAL deviceEino-Ville Talvala2013-03-273-16/+219
* | | | | Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-devEino-Ville Talvala2013-03-284-62/+1058
|\ \ \ \ \ | |/ / / /
| * | | | Camera: Add input side to camera3 HAL deviceEino-Ville Talvala2013-03-274-62/+1058
* | | | | Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-devEino-Ville Talvala2013-03-289-0/+1363
|\ \ \ \ \ | |/ / / /
| * | | | Camera: Add streams to camera3 HAL deviceEino-Ville Talvala2013-03-279-0/+1363
* | | | | Merge "Fix valgrind error." into jb-mr2-devMarco Nelissen2013-03-281-1/+2
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Fix valgrind error.Marco Nelissen2013-03-271-1/+2
* | | | ToneGenerator: fix truncated tonesEric Laurent2013-03-272-1/+32
* | | | Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-devEric Laurent2013-03-281-5/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | ToneGenerator: fix stop/destroy concurrencyEric Laurent2013-03-261-5/+10
* | | | Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-devIgor Murashkin2013-03-274-15/+162
|\ \ \ \ | |_|/ / |/| | |
| * | | Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-264-15/+162
* | | | Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-devIgor Murashkin2013-03-272-4/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | ProCamera: Fix memory leak in consumeFrameMetadataIgor Murashkin2013-03-272-4/+5
| |/ /
* | | Merge "media.log dump" into jb-mr2-devGlenn Kasten2013-03-261-0/+9
|\ \ \
| * | | media.log dumpGlenn Kasten2013-03-261-0/+9
| | |/ | |/|
* | | Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate...Andreas Huber2013-03-265-29/+88
|\ \ \ | |/ / |/| |
| * | Adapt frame rate instead of keeping that constant and tweaking bitrateAndreas Huber2013-03-265-29/+88
* | | ToneGenerator: fix AudioTrack pointer initEric Laurent2013-03-261-1/+1
|/ /
* | Identify network servers and clients with a OS version related stringAndreas Huber2013-03-268-55/+38
* | Merge "In "special" mode we now establish a UDP RTCP channel in addition to t...Andreas Huber2013-03-2610-26/+135
|\ \
| * | In "special" mode we now establish a UDP RTCP channel in addition to theAndreas Huber2013-03-2510-26/+135
* | | Merge "ToneGenerator: optimize silent tone" into jb-mr2-devEric Laurent2013-03-261-1/+5
|\ \ \
| * | | ToneGenerator: optimize silent toneEric Laurent2013-03-251-1/+5
* | | | Merge "Get rid of TunnelRenderer" into jb-mr2-devAndreas Huber2013-03-253-369/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Get rid of TunnelRendererAndreas Huber2013-03-253-369/+0
* | | | Merge "Misc debugging support and handling of latency changes." into jb-mr2-devAndreas Huber2013-03-252-34/+12
|\ \ \ \ | |/ / /
| * | | Misc debugging support and handling of latency changes.Andreas Huber2013-03-252-34/+12
| |/ /
* | | Merge "Load crypto plugins from additional shared libraries" into jb-mr2-devJeff Tinker2013-03-254-40/+140
|\ \ \ | |/ / |/| |
| * | Load crypto plugins from additional shared librariesJeff Tinker2013-03-224-40/+140
* | | Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-devAndreas Huber2013-03-254-25/+48
|\ \ \
| * | | Separate the mode of the RTP and RTCP channels.Andreas Huber2013-03-254-25/+48
| | |/ | |/|
* | | Merge "Ensure that the payload in each TS packet is an even multiple of 16 by...Andreas Huber2013-03-251-43/+158
|\ \ \ | |/ / |/| |
| * | Ensure that the payload in each TS packet is an even multiple of 16 bytes longAndreas Huber2013-03-211-43/+158
* | | Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-devIgor Murashkin2013-03-221-2/+21
|\ \ \
| * | | ICameraServiceListener.h: Add STATUS_ENUMERATING enumIgor Murashkin2013-03-211-2/+21
* | | | Merge changes Ic92924ce,I53107a39 into jb-mr2-devIgor Murashkin2013-03-212-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Camera2: getSceneMode should return NULL when there are no supported scene modesIgor Murashkin2013-03-211-0/+2
| * | | commandStartFaceDetectionL returned the wrong value when face detection is no...Ziv Hendel2013-03-211-1/+1
| |/ /
* | | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-203-19/+58
|\ \ \ | |_|/ |/| |