summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* camera3: Pass vendor tags through binder.Ruben Brunk2014-03-1312-49/+829
| | | | | | | | | | Bug: 12134423 - Adds a class for parceling vendor tag definitions. - Passes vendor tag definitions to clients of the camera service. - Switches over to new vendor tag mechanism when reading from HAL. Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
* Merge "LiveSession refactor"Robert Shih2014-02-214-139/+93
|\
| * LiveSession refactorRobert Shih2014-02-204-139/+93
| | | | | | | | Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
* | Merge "audioflinger: fix race condition in SyncEvent callback"Eric Laurent2014-02-213-7/+10
|\ \
| * | audioflinger: fix race condition in SyncEvent callbackEric Laurent2014-02-203-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the SyncEvent callback is implemented by the RecordTrack instead of the RecordThread, there is a possibility that the callback is called after the track deletion. SyncEvent callback now uses a weak pointer instead of a raw pointer as cookie. This allows the callback implementer to acquire a strong reference on the object pointed to by the cookie. Bug: 13114128. Change-Id: Id61b8f06044ed1e52c6f7e7c666cdede68340de2
* | | resolved conflicts for merge of aa0390b7 to masterMarco Nelissen2014-02-202-4/+13
|\ \ \ | |/ / |/| | | | | Change-Id: Ide9dfb5df75cac7c363a3c7fdbd8fabdc326a495
| * | am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as ↵Marco Nelissen2014-02-202-4/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | base in the M3U" * commit '4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae': LiveSession: Use the actual, possibly redirected url as base in the M3U
| | * \ Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
| | |\ \
| | | * | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
* | | | | Allow specifying frames per call to resample()Glenn Kasten2014-02-191-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13073201 Change-Id: Id2f0fcd7562d9ba5a58c128d71bbba42dfea86cc
* | | | | Merge "Fix resampler to allow output of single frame"Andy Hung2014-02-195-6/+38
|\ \ \ \ \
| * | | | | Fix resampler to allow output of single frameAndy Hung2014-02-195-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13073201 Change-Id: If7818a3389a191a37277bbd8e96a59ef8ce68509 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "fix codec buffer leak in error handling when timestamp goes backward"Chong Zhang2014-02-191-7/+7
|\ \ \ \ \ \
| * | | | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-02-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't touch codec buffer if we decided to drop a frame with bad pts Bug: 11971963 Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6
* | | | | | | Merge "Handle recording failure more gracefully."Ruben Brunk2014-02-192-9/+20
|\ \ \ \ \ \ \
| * | | | | | | Handle recording failure more gracefully.Ruben Brunk2014-02-182-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13027666 Change-Id: Iec8239bfcd293c8f466b3780e69883b97f387949
* | | | | | | | Expand support for fragmented mp4Marco Nelissen2014-02-191-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require that there are no other boxes between mdat and moof boxes, or that moof immediately follows moov. Fix SAP parsing and seeking to exact start of segment. Change-Id: I668644c5c7866dd2512f3b7f745fba438ae6e627
* | | | | | | | Merge "Fix crash when seeking fragmented mp4 files"Marco Nelissen2014-02-191-10/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix crash when seeking fragmented mp4 filesMarco Nelissen2014-02-181-10/+17
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewinding a fragmented mp4 file without a segment index (sidx) after playing it to the end would crash. b/13028840 Change-Id: I280e74364589f0acefd432a59f85a6594c009a21
* | | | | | | Merge "Simplify and remove old comment"Glenn Kasten2014-02-181-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Simplify and remove old commentGlenn Kasten2014-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee41641252f65cea9ce0ea0ec1ea4229608f7c64
* | | | | | | | Multi-client recording continuedGlenn Kasten2014-02-183-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mReqChannelCount and mReqSampleRate. Increase number of input frames needed for sample rate converter. Add TODO comments to investigate later. Fix bugs in sample rate conversion. Change-Id: I3aa54b862843d518b6e4ece9a7f52fd27d741629
* | | | | | | | Move handleSyncStartEvent and clearSyncStartEvent to RecordTrackGlenn Kasten2014-02-184-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I611a63e63acf3eb17e2072c1a77b91fe9e62e36a
* | | | | | | | Add _l suffix to readInputParameters/OutputParametersGlenn Kasten2014-02-183-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are always called while thread mutex is locked, or in the thread constructor. Change-Id: I56df71563a52a5cd6cea6fc0914df993519e1b74
* | | | | | | | Multi-client recordingGlenn Kasten2014-02-186-319/+411
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports multiple clients both at native sample rate and with resampling. Change-Id: Icea55b4fd30751761b7debaa3ce016c79e712d8d
* | | | | | | Merge "Move StateQueueInstantiations to libinstantssq"Glenn Kasten2014-02-182-10/+19
|\ \ \ \ \ \ \
| * | | | | | | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-182-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a circular dependency between libmedia and libnbaio Change-Id: I3692cbbe2b76028a953b36606b62cdda70c8c26f
* | | | | | | | Merge "Fix bug with not reporting lost bytes"Glenn Kasten2014-02-181-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix bug with not reporting lost bytesGlenn Kasten2014-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I431d989dbd115b43822e9e48fd4c2b8e6322cfe3
* | | | | | | | Merge "Add private method NBLog::Reader::dumpLine()"Glenn Kasten2014-02-182-37/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-02-182-37/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to abstract out fdprintf vs ALOGI so that callers don't need an 'if' at every location. Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
* | | | | | | | Merge "Fix warning due to incorrect log format"Glenn Kasten2014-02-181-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix warning due to incorrect log formatGlenn Kasten2014-02-181-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I58ff399ace74965ebf8e5690c20637385f9425ad
* | | | | | | Merge "Skip scaling_list definitions in AVC seq header."Andreas Huber2014-02-181-1/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Skip scaling_list definitions in AVC seq header.Andreas Huber2014-02-141-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad013550d9c5aecf3504624eddfc13e680162bf3 related-to-bug: 13030256
* | | | | | | Merge "LiveSession: Add support for block-by-block fetchFile."Robert Shih2014-02-152-35/+80
|\ \ \ \ \ \ \
| * | | | | | | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-02-132-35/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
* | | | | | | | Merge "PlaylistFetcher: Add support for block-by-block decryption."Robert Shih2014-02-152-37/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-02-132-37/+75
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd3f3369275889e716b360087b5b60d01635b578
* | | | | | | | Merge "AnotherPacketSource support to get latest buffered MetaData."Robert Shih2014-02-152-2/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-02-032-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29
* | | | | | | | | Merge "Try not to have sample durations vary too much"Marco Nelissen2014-02-141-0/+16
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Try not to have sample durations vary too muchMarco Nelissen2014-02-131-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbd0f0a253cc74e241236b7a30d1c931e18af753
* | | | | | | | | am 8dad284a: am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8dad284a8ac588ef0be92c6a467e525f07c164cd': libeffects: don't set module path
| * | | | | | | | am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '80b72e6f4202ce26facbe51b8739814bca198a2c': libeffects: don't set module path
| | * | | | | | | Merge "libeffects: don't set module path"Colin Cross2014-02-141-1/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | libeffects: don't set module pathColin Cross2014-02-131-1/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the module path breaks multilib builds where there may be two different module paths for 32-bit and 64-bit, and there is no need to set it to the default. Change-Id: I95d62b5573a0bb0ab6c97649041dfc4309cbc8b9
* | | | | | | | | Merge "Track pid for each session"Marco Nelissen2014-02-1312-41/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Track pid for each sessionMarco Nelissen2014-02-1112-41/+73
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so they can be properly freed. Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
* | | | | | | | | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-139-2986/+1
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subsumed into MP4Extractor. Change-Id: Ic1b6445660adfb985c604f1ca6f0c86585f8de04
generated by cgit v1.1 at 2024-09-26 18:10:54 +0000