summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera3Device: Support batch requestsChien-Yu Chen2015-09-038-199/+387
| | | | | | | | | | | | | | | | Refactor request threadLoop to three parts: waiting for next batch of requests, preparing HAL requests and output buffers for next batch of requests, and submitting the batch of requests to HAL. Set the batch size to the size of the request list if it's a video recording request in a high speed video configuration. Add a flush lock so that HAL's flush() won't be called while submitting a batch of requests. Bug: 23360060 Change-Id: Icd395b1f955a9b336eec6fa5aff6b17741ce08c7
* Merge "nuplayer: let non-offload AudioSink to handle the reconnect when ↵Ronghua Wu2015-09-021-1/+9
|\ | | | | | | there's video." into mnc-dr-dev
| * nuplayer: let non-offload AudioSink to handle the reconnect when there's video.Ronghua Wu2015-09-021-1/+9
| | | | | | | | | | Bug: 23707144 Change-Id: Ie0e2db8dc91a78f82fb935d165aa11abe73697a3
* | am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before ↵Lajos Molnar2015-09-021-4/+3
|\ \ | | | | | | | | | | | | | | | | | | first track" into mnc-dev * commit 'd35955dd6ccdb4aecdf8217f708b9f8015fc9957': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
| * \ Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" ↵Lajos Molnar2015-09-021-4/+3
| |\ \ | | | | | | | | | | | | into mnc-dev
| | * | stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-08-311-4/+3
| | | | | | | | | | | | | | | | | | | | Bug: 21725583 Change-Id: I799c1967759c7e49fb50281a1708188450caac77
* | | | am fe751bea: Camera: Fix flashlight deadlockChien-Yu Chen2015-09-022-3/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'fe751bea0d3eedd6e817aebf4e457425b82e7117': Camera: Fix flashlight deadlock
| * | Camera: Fix flashlight deadlockChien-Yu Chen2015-09-012-3/+5
| |/ | | | | | | | | | | | | | | Use a dedicated mutex for torch UID map so it won't cause a deadlock after flashlight app gets killed while the torch is on. Bug: 23722318 Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
* | Merge "Camera3Device: Don't hold mutex during HAL device close." into mnc-dr-devEino-Ville Talvala2015-08-301-6/+14
|\ \
| * | Camera3Device: Don't hold mutex during HAL device close.Eino-Ville Talvala2015-08-281-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The HAL device shutdown will likely need to wait on various events and queues to drain, and holding the mutex will prevent, for example, error notifications from being processed. This can lead to deadlocks. Bug: 23501571 Change-Id: I873ac23ef30545adf533e7839445448573ab5048
* | | am 389e7653: Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
|\ \ \ | |/ / |/| / | |/ | | * commit '389e765394a950b9697bba49c1998f2029bd58b4': Fix for security vulnerability in media server
| * Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
| |\
| | * Fix for security vulnerability in media serverJeff Tinker2015-08-271-1/+19
| | | | | | | | | | | | | | | bug: 23540426 Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
* | | am 909318b3: am dbf995ce: am 6b203f06: am 66b24004: am 0ea9e276: am ↵Andy Hung2015-08-280-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit '909318b3c7e5d80c8a79f8a37200e797a287c061': libmedia: clear reply data for IEffect command
| * | am dbf995ce: am 6b203f06: am 66b24004: am 0ea9e276: am 184ad88d: am ↵Andy Hung2015-08-280-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit 'dbf995cecdbfcb74437cf2b6b123b10821371f82': libmedia: clear reply data for IEffect command
| | * \ am 6b203f06: am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am ↵Andy Hung2015-08-281-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit '6b203f06b969ba92181dbf781544b40cc2c41b7c': libmedia: clear reply data for IEffect command
| | | * \ am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge ↵Andy Hung2015-08-281-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "libmedia: clear reply data for IEffect command" into klp-dev * commit '66b24004345ff8a688e8548409b0b7d5a8902232': libmedia: clear reply data for IEffect command
| | | | * \ am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear ↵Andy Hung2015-08-281-2/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reply data for IEffect command" into klp-dev * commit '0ea9e2761a04c4f592d854dbde2749395735fe56': libmedia: clear reply data for IEffect command
| | | | | * \ am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for ↵Andy Hung2015-08-281-2/+2
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IEffect command" into klp-dev * commit '184ad88ddd6bbdf01e131e8e5b75bef5be67b29b': libmedia: clear reply data for IEffect command
| | | | | | * \ am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect ↵Andy Hung2015-08-281-2/+2
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command" into klp-dev * commit 'fba72ab0fcf7298492dcd9e3045913435d30d3a9': libmedia: clear reply data for IEffect command
| | | | | | | * \ am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f394f12167fddbc755855d06b615509517c99f14': libmedia: clear reply data for IEffect command
| | | | | | | | * \ Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| | | | | | | | |\ \
| | | | | | | | | * | libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
* | | | | | | | | | | am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is ↵Wei Jia2015-08-281-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still in shutdown process." into mnc-dev * commit '5d76e54d2f3b02b52be035e37681fde0caf15eaa': NuPlayer: do not create audio decoder if the player is still in shutdown process.
| * | | | | | | | | | Merge "NuPlayer: do not create audio decoder if the player is still in ↵Wei Jia2015-08-281-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shutdown process." into mnc-dev
| | * | | | | | | | | | NuPlayer: do not create audio decoder if the player is still in shutdown ↵Wei Jia2015-08-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process. Bug: 23350795 Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b
* | | | | | | | | | | | am 03dee050: am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am ↵Nick Kralevich2015-08-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '03dee05039103fbc983ddc9f728f1fa974d0a5a5': IMediaPlayer.cpp: make sure structures are initialized to 0
| * | | | | | | | | | | am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am ↵Nick Kralevich2015-08-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '608c349d611e03e0143c23c3f77ddc62b137e354': IMediaPlayer.cpp: make sure structures are initialized to 0
| | * | | | | | | | | | am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am ↵Nick Kralevich2015-08-271-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '4e861bf5d43eae00ae4cb8727c5a408c3728288b': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | * | | | | | | | | am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: ↵Nick Kralevich2015-08-271-0/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMediaPlayer.cpp: make sure structures are initialized to 0 * commit 'e1dc15ecfaa5bbbda28647749bad51e6d18d0c79': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | * | | | | | | | am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make ↵Nick Kralevich2015-08-271-0/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sure structures are initialized to 0 * commit '762c713900bd764570c8fda4e238497200da66d6': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | * | | | | | | am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure ↵Nick Kralevich2015-08-271-0/+2
| | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structures are initialized to 0 * commit 'b04cfdf51746dea51d2bb2f56fe9ef789fd30bd9': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | | * | | | | | am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are ↵Nick Kralevich2015-08-271-0/+2
| | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized to 0 * commit 'd437c77716fcf454d99b8424bb01f37643b970cc': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | | | * | | | | am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0981df6e3db106bfb7a56a2b668c012fcc34dd2c': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | | | | * | | | IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | | | | |/ / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Credit https://code.google.com/p/android/issues/detail?id=183310 Bug: 23515142 Change-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427 (cherry picked from commit b73b826cc16291b33649402497efbe0f946413bd)
* | | | | | | | | | | am d0b5910f: libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0b5910f78b45ce98511d31ec327ccaafe127f3f': libmedia: clear reply data for IEffect command
| * | | | | | | | | | libmedia: clear reply data for IEffect commandAndy Hung2015-08-261-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
* | | | | | | | | | Merge "AudioSink: Fix for gapless offload playback" into mnc-dr-devEric Laurent2015-08-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioSink: Fix for gapless offload playbackPreetam Singh Ranawat2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gapless mode is not working for offload playback due to mismatch in flags of current track and next track to be played. AUDIO_OUTPUT_FLAG_DIRECT is added in AudioTrack flags for current track which does not match exactly with requested flags for next track. Because of this mismatch, reuse of the AudioTrack is not allowed. To fix this, update audio sink flags with requested flags and use track flags only to setPlaybackRate if AUDIO_OUTPUT_FLAG_DIRECT flag is not set. Bug: 23221273 authored-by: Preetam Singh Ranawat <apranawat@codeaurora.org> Change-Id: I52761ccd854b66a7bc218e83c9b44598771c46f7
* | | | | | | | | | | am 3a124eb0: am f67f894f: (-s ours) am ff9a97f6: am 92aa0532: am 5e47eb95: ↵Abhishek Arya2015-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev * commit '3a124eb05e7ef3056ebc1abc7390e8371dd52112': DO NOT MERGE - Fix software video decoder buffer size calculation
| * | | | | | | | | | am f67f894f: (-s ours) am ff9a97f6: am 92aa0532: am 5e47eb95: am 35a7b54e: ↵Abhishek Arya2015-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev * commit 'f67f894fead9065dcffda03a127cee7d746c9226': DO NOT MERGE - Fix software video decoder buffer size calculation
| | * | | | | | | | | am ff9a97f6: am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) ↵Abhishek Arya2015-08-250-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev * commit 'ff9a97f62344dc318b90c5b62ae3c7d3be5ab90e': DO NOT MERGE - Fix software video decoder buffer size calculation
| | | * | | | | | | | am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: ↵Abhishek Arya2015-08-250-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev * commit '92aa0532ab7cfd70011f70bc909249b894a840d0': DO NOT MERGE - Fix software video decoder buffer size calculation
| | | | * | | | | | | am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT ↵Abhishek Arya2015-08-250-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE - Fix software video decoder buffer size calculation" into klp-dev * commit '5e47eb9512890ea443977d3b54125b33f8259f63': DO NOT MERGE - Fix software video decoder buffer size calculation
| | | | | * | | | | | am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix ↵Abhishek Arya2015-08-250-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | software video decoder buffer size calculation" into klp-dev * commit '35a7b54e828336121d26060dd7e7adb5f5027d32': DO NOT MERGE - Fix software video decoder buffer size calculation
| | | | | | * | | | | am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video ↵Abhishek Arya2015-08-250-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder buffer size calculation" into klp-dev * commit 'f9a51893d739000cd70caf10c83d0e603371f5b1': DO NOT MERGE - Fix software video decoder buffer size calculation
| | | | | | | * | | | am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size ↵Abhishek Arya2015-08-251-1/+1
| | | | | | | |\ \ \ \ | | | | | | | | | |/ / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calculation" into klp-dev * commit '9a2be5d49d57b239bf6345f033eab01ba98f3889': DO NOT MERGE - Fix software video decoder buffer size calculation
| | | | | | | | * | | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" ↵Abhishek Arya2015-08-251-1/+1
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | | | | | | | | * | | DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various software video decoders would specify the buffer size as if it were fully cropped, which then failed a sanity check in SoftwareRenderer. They now return the full buffer size. Bug: 21717327 Bug: 21443020 Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5 (cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)
* | | | | | | | | | | | am e9a3a244: am 529c5cbf: (-s ours) am 1fd9995c: am 196a8a9f: am c4757a87: ↵Wei Jia2015-08-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b504ca53: am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data. * commit 'e9a3a244bf823fcab5bfa07056bea64f55e412fb': DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
generated by cgit v1.1 at 2024-09-12 01:28:44 +0000