summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change AudioTrack resampling buffers from 3 to 2Andy Hung2015-02-063-78/+48
| | | | | | | | | | | | | Move computation of minimum AudioTrack buffer size to server for normal streaming PCM tracks. Use server-side computation to exactly determine requirements for the resampler to avoid triple buffering. This reduces latency for normal audio tracks that require resampling, and makes things consistent with the minimum buffer size. Change-Id: I2f2ca0e599ee20e16559bc5c5dab61ed100da16c
* am 7dbbc7ec: am a291dabc: am 6fbcf633: Merge "httplive: Set start time and ↵Robert Shih2015-02-042-6/+14
|\ | | | | | | | | | | | | segment start time in conjunction." into lmp-mr1-dev * commit '7dbbc7ec95c3040668388162a0ffbc45b68af6f1': httplive: Set start time and segment start time in conjunction.
| * am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start ↵Robert Shih2015-02-042-6/+14
| |\ | | | | | | | | | | | | | | | | | | time in conjunction." into lmp-mr1-dev * commit 'a291dabcab10cafc1749d1d9493d269049502256': httplive: Set start time and segment start time in conjunction.
| | * am 6fbcf633: Merge "httplive: Set start time and segment start time in ↵Robert Shih2015-02-042-6/+14
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | conjunction." into lmp-mr1-dev * commit '6fbcf6331abfbbc935bf89332f84303733e578b2': httplive: Set start time and segment start time in conjunction.
| | | * Merge "httplive: Set start time and segment start time in conjunction." into ↵Robert Shih2015-02-042-6/+14
| | | |\ | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * httplive: Set start time and segment start time in conjunction.Robert Shih2015-02-042-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add comments describing how start time and segment start time are used. Based on AOSP CL https://android-review.googlesource.com/127653 by Joakim Johansson <joakim.c.johansson@sonymobile.com> but uses the lowest segment start time instead of highest. Bug: 18821145 Change-Id: I14cf1186d0daf517a24e8423c3a708b4c9ba06c4
* | | | | am 3b5d1195: am 7b66f713: am 57f75272: Merge "stagefright: add support for ↵Lajos Molnar2015-02-043-40/+95
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | native flex-YUV formats" into lmp-mr1-dev * commit '3b5d119522bdf9c23be622be395d7a95d465616e': stagefright: add support for native flex-YUV formats
| * | | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native ↵Lajos Molnar2015-02-043-40/+95
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | flex-YUV formats" into lmp-mr1-dev * commit '7b66f713fc53ee81453763788c02f3c741d19520': stagefright: add support for native flex-YUV formats
| | * | | am 57f75272: Merge "stagefright: add support for native flex-YUV formats" ↵Lajos Molnar2015-02-043-40/+95
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '57f75272fcd16b205ed60cdd0b33ffc19991fd10': stagefright: add support for native flex-YUV formats
| | | * | Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-devLajos Molnar2015-02-043-40/+95
| | | |\ \
| | | | * | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-043-40/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
* | | | | | am e91c3dd0: am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf ↵Elliott Hughes2015-02-0414-54/+54
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out of the way." * commit 'e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7': Move AString's StringPrintf out of the way.
| * | | | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
| | * \ \ \ \ am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec0472ba9c1cfaee293636536f3951c0e6e671b4': Move AString's StringPrintf out of the way.
| | | * \ \ \ \ Merge "Move AString's StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
| | | |\ \ \ \ \
| | | | * | | | | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-0414-54/+54
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
* | | | | | | | am 7bc90358: am 5d46bd54: am 3ae5f313: audiopolicy: send device connect ↵Eric Laurent2015-02-041-2/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification to HALs * commit '7bc903581f879c86f3881a2f7563bd28c1ac29b7': audiopolicy: send device connect notification to HALs
| * | | | | | | am 5d46bd54: am 3ae5f313: audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '5d46bd54a279f24d0476b83947ce29e786b5c72c': audiopolicy: send device connect notification to HALs
| | * | | | | | am 3ae5f313: audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '3ae5f31393609b7fa92f24132c66e9a8c9244a45': audiopolicy: send device connect notification to HALs
| | | * | | | | audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device disconnect notifications are sent from audiopolicy to the HALs. Send connect notifications as well. Bug: 19249796. Bug: 17785277. Change-Id: Ia823ed154d6a0c7ceb84b0a94f0c3b78392faaf6
* | | | | | | am 07840f75: am 3a7ed550: am efbb6195: NuPlayer: pause playback when ↵Chong Zhang2015-02-046-34/+251
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffering is low * commit '07840f7544de883fe5c00cbd18bc6458a20e2691': NuPlayer: pause playback when buffering is low
| * | | | | | am 3a7ed550: am efbb6195: NuPlayer: pause playback when buffering is lowChong Zhang2015-02-046-34/+251
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '3a7ed550579b5ecd99439c44ce13a48b3f0639ae': NuPlayer: pause playback when buffering is low
| | * | | | | am efbb6195: NuPlayer: pause playback when buffering is lowChong Zhang2015-02-046-34/+251
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'efbb61950db36a5eb789be83f077246172507c67': NuPlayer: pause playback when buffering is low
| | | * | | | NuPlayer: pause playback when buffering is lowChong Zhang2015-02-036-34/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix buffering percentage report (should be the buffered position) bug: 18730095 Change-Id: I11e7ca4ba9e772a1ae76861ca1ff1725b62f65ae
* | | | | | | CameraService: intercept Camera moduleYin-Chia Yeh2015-02-0321-61/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap camera module returned from HAL so get_camera_info returns static_camera_characteristics processed by framework, which generates keys added after HAL3.2 is released. Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
* | | | | | | am f6b13961: am 81898637: am 16e8d463: Merge "camera2: fix various ↵Eino-Ville Talvala2015-02-031-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BpCameraDeviceUser methods to return correct result." * commit 'f6b1396150ed55fa9829e31f11533cd65c61d914': camera2: fix various BpCameraDeviceUser methods to return correct result.
| * | | | | | am 81898637: am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser ↵Eino-Ville Talvala2015-02-031-4/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods to return correct result." * commit '8189863774bd479f0060bbe1e4ce74dadcfc55c3': camera2: fix various BpCameraDeviceUser methods to return correct result.
| | * | | | | am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser methods to ↵Eino-Ville Talvala2015-02-031-4/+4
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return correct result." * commit '16e8d463bc5c8805ae6815c67875b16d177a9d8a': camera2: fix various BpCameraDeviceUser methods to return correct result.
| | | * | | | Merge "camera2: fix various BpCameraDeviceUser methods to return correct ↵Eino-Ville Talvala2015-02-031-4/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | result."
| | | | * | | | camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-02-031-4/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - submitRequest*(): res is the request ID and not always equals to NO_ERROR. - cancelRequest() and flush(): the result of reading last frame number should be put in resFrameNumber, not in res. Change-Id: Ic81c58f4ac14c05b3db4bdc5c99f48d00665d3fc Signed-off-by: John Lin <jolin@mozilla.com>
* | | | | | | am 3097dafa: am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle ↵Rachad2015-02-021-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for all non tunneled mode video playback" into lmp-mr1-dev * commit '3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5': Acodec: reset sideband handle for all non tunneled mode video playback
| * | | | | | am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle for all non ↵Rachad2015-02-021-0/+9
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tunneled mode video playback" into lmp-mr1-dev * commit '0d8e85f929f0257a3af5ec743365b0140b5e75b4': Acodec: reset sideband handle for all non tunneled mode video playback
| | * | | | | am 77f877f8: Merge "Acodec: reset sideband handle for all non tunneled mode ↵Rachad2015-01-311-0/+9
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video playback" into lmp-mr1-dev * commit '77f877f82733263bca825b92a3f4537caafabf74': Acodec: reset sideband handle for all non tunneled mode video playback
| | | * | | | Merge "Acodec: reset sideband handle for all non tunneled mode video ↵Rachad2015-01-311-0/+9
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | playback" into lmp-mr1-dev
| | | | * | | | Acodec: reset sideband handle for all non tunneled mode video playbackRachad2015-01-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19202023 Change-Id: I414847d72a3c9fd79f858c4ee457270ec65470b6
* | | | | | | | am a601b862: am c9e11696: am 36dca156: Merge "Acodec: Send framerate ↵Rachad2015-02-022-3/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information to OMX decoder if available" into lmp-mr1-dev * commit 'a601b86287ab5437a7e9aaf6f09bc171803cdc3d': Acodec: Send framerate information to OMX decoder if available
| * | | | | | | am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX ↵Rachad2015-02-022-3/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder if available" into lmp-mr1-dev * commit 'c9e11696c4f80e9803f7e65e29af962f199a574d': Acodec: Send framerate information to OMX decoder if available
| | * | | | | | am 36dca156: Merge "Acodec: Send framerate information to OMX decoder if ↵Rachad2015-01-312-3/+16
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available" into lmp-mr1-dev * commit '36dca156e0b5bf1865d1f6a1c692c71e10583481': Acodec: Send framerate information to OMX decoder if available
| | | * | | | | Merge "Acodec: Send framerate information to OMX decoder if available" into ↵Rachad2015-01-312-3/+16
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * | | | Acodec: Send framerate information to OMX decoder if availableRachad2015-01-292-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19110889 Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
* | | | | | | | am 82bbd248: am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless ↵Robert Shih2015-02-021-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check" into lmp-mr1-dev * commit '82bbd248d0578e5da04aa95d9906006275c330b5': Wrong format used in seamless check
| * | | | | | | am c37a6e6b: am 7a434265: Merge "Wrong format used in seamless check" into ↵Robert Shih2015-02-021-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'c37a6e6bbe038cf94d11abdb6f8003e7476e11af': Wrong format used in seamless check
| | * | | | | | am 7a434265: Merge "Wrong format used in seamless check" into lmp-mr1-devRobert Shih2015-01-311-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a4342651cc6539fc9a8775ce1e322a47adeda78': Wrong format used in seamless check
| | | * | | | | Merge "Wrong format used in seamless check" into lmp-mr1-devRobert Shih2015-01-311-4/+4
| | | |\ \ \ \ \
| | | | * | | | | Wrong format used in seamless checkjoakim johansson2015-01-301-4/+4
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targetFormat that is sent to supportsSeamlessFormatChange function corresponds to the data in mInputFormat but the format provided is the output format, so the check will always return false. Use the input format instead. Bug: 18821145 Change-Id: Iea3cbd59e423da5f2f813e98505b40dc341061b8
* | | | | | | | am f5a60185: am 9787254f: am 296a0d03: Merge "PlaylistFetcher: clear packet ↵Robert Shih2015-02-021-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sources when adjusting starting sequence number" into lmp-mr1-dev * commit 'f5a60185ec550d8447a44172027925550e6849d9': PlaylistFetcher: clear packet sources when adjusting starting sequence number
| * | | | | | | am 9787254f: am 296a0d03: Merge "PlaylistFetcher: clear packet sources when ↵Robert Shih2015-02-021-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adjusting starting sequence number" into lmp-mr1-dev * commit '9787254f1ef27e86390a31a7ef05d94ff2f65232': PlaylistFetcher: clear packet sources when adjusting starting sequence number
| | * | | | | | am 296a0d03: Merge "PlaylistFetcher: clear packet sources when adjusting ↵Robert Shih2015-01-311-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting sequence number" into lmp-mr1-dev * commit '296a0d038e9e485d7a10b54057f24a562a2e76e3': PlaylistFetcher: clear packet sources when adjusting starting sequence number
| | | * | | | | Merge "PlaylistFetcher: clear packet sources when adjusting starting ↵Robert Shih2015-01-311-0/+4
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | sequence number" into lmp-mr1-dev
| | | | * | | | | PlaylistFetcher: clear packet sources when adjusting starting sequence numberRobert Shih2015-01-301-0/+4
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19215971 Change-Id: I4ad29cf0ac24dea330017a1b0159b06922d768ae