summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
| |\ \ \ \ \
| | * | | | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | | | | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 73c5c94 * commit '73c5c94ab53bf0c14fffe5edc62706865cff271d': stagefright: add (temporary) support for automatic video frc
| * | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MediaFormat.setInteger("auto-frc", 1) to turn this feature on. If supported, this feature will show up in codec.getOutputFormat().getInteger("auto-frc") Otherwise, this key will not be present. Bug: 17383204 Change-Id: I03549b3ede4de156e9e2d81b3883010360bb42ae
* | | | | | am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'd60486723cdc0b4b83b77d57ce35023a7516c471': Remove extraneous parentheses
| * | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses that cause compiler warnings in clang Change-Id: I88a3d84738433db85e4a04b673f82da7b0b1be10 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat ↵Robert Shih2014-11-191-0/+20
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | during configuration change" into lmp-mr1-dev * commit '2bbc61fe75a98e39c844c034cdcaf4d01b311834': HLS: fix live lock after missing the boat during configuration change
| * | | | Merge "HLS: fix live lock after missing the boat during configuration ↵Robert Shih2014-11-191-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | change" into lmp-mr1-dev
| | * | | | HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17488643 Change-Id: I4f5de42f86d6c616a67dc803f35c026b35347983
* | | | | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-191-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'db95b7dbba21fc0b1112f9c362d4d942dddefba0': Don't autoloop notifications
| * | | | | Don't autoloop notificationsMarco Nelissen2014-11-181-0/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps think it's cool to use ringtones as notification sounds, but ringtones often loop, which is not appropriate for notifications. Bug: 15929273 Change-Id: I77c4277801cb2561743f8c676ef76ab4d1668b08
* | | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818': Remove extraneous parentheses
| * | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| |\ \ \ \
| | * | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dd9d3e5046da2b36c291957ccdf3291147b847f1': Fix uninitialized variable
| * | | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of !(err == OK && !mCancelled), sdpSize is used uninitialized. Change-Id: I33c6365ca6df13b0051491771d3eee3e35346b6d Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl ↵Robert Shih2014-11-184-0/+47
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | getSelectedTrack" into lmp-mr1-dev * commit '811a92f68dbcab0f88b4be72099d783d3a44c9f6': NuPlayer HTTPLiveSource: impl getSelectedTrack
| * | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-174-0/+47
| |\ \ \ \
| | * | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-064-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17514665 Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
* | | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-179-11/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b': Fix struct vs. class mismatches
| * | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-179-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-175-11/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-175-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
| * | | | | libstagefright: use __predict_false from bionic rather than CONDITION from ↵Mark Salyzyn2014-11-111-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | log/log.h Change-Id: Ieb07a4f58c96326553e87dacca11e3980e283dc8
* | | | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer ↵Wei Jia2014-11-151-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing." into lmp-mr1-dev automerge: b915eeb * commit 'b915eebd82cc347b182265d4f4123b11ba3db812': NuPlayer: tunnel decoder with renderer for data buffer passing.
| * | | | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ↵Wei Jia2014-11-151-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into ↵Robert Shih2014-11-151-27/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 3db2e5a * commit '3db2e5a6bd218ba185a1387d91a974d561d304d5': PlaylistFetcher: handle sporadic fetch erros
| * | | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
| |\ \ \ \ \
| | * | | | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17490472 Change-Id: I2c04e2352f13db762b845f4d35db0a8b851a148c
* | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" ↵Lajos Molnar2014-11-149-440/+764
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '41907c44a597ceb258495715d3dd391fef2907e3': stagefright: add runtime debug support
| * | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-149-440/+764
| |\ \ \ \ \ \
| | * | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-129-440/+764
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18285408 Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
* | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode ↵Chong Zhang2014-11-141-164/+105
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for recording" into lmp-mr1-dev * commit '08961d0b57f33e0486db2ff135f0f7fa4b1a8c58': Stagefright: use MediaCodec in async mode for recording audio policy: move intializations to onFirstRef()
| * | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-131-164/+105
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-121-164/+105
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Async mode reduces the number of messages posted between MediaCodec and MediaCodecSource. This reduces thread wakeups and helps reduce CPU utilization. Bug: 18246026 Change-Id: I4b0837f309fdd12e323c1dfa72525f5a31971a03
* | | | | | | am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some ↵Wei Jia2014-11-141-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | members before returning from queueDiscontinuity()." into lmp-mr1-dev * commit '285dc585019e3c710985edc5e3f55cb934c6512c': AnotherPacketSource: need reset some members before returning from queueDiscontinuity().
| * | | | | | Merge "AnotherPacketSource: need reset some members before returning from ↵Wei Jia2014-11-131-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | queueDiscontinuity()." into lmp-mr1-dev
| | * | | | | | AnotherPacketSource: need reset some members before returning from ↵Wei Jia2014-11-131-4/+4
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queueDiscontinuity(). Bug: 18355014 Bug: 17511837 Change-Id: I4b623d3bc4fbeaf0e8bf4ddd96661469d17afe7a
* | | | | | | am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts program streams ↵Robert Shih2014-11-133-6/+32
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before disabling a/v" into lmp-mr1-dev * commit '2458928ecaf99d237454188aa463e04817ae3028': PlaylistFetcher: check ts program streams before disabling a/v
| * | | | | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into ↵Robert Shih2014-11-133-6/+32
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | lmp-mr1-dev
| | * | | | | PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-123-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14648838 Change-Id: Ibf2b2cbb235f3d80bc33013e2afc053f13b9035f
* | | | | | | am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into ↵Marco Nelissen2014-11-121-14/+61
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'cf957fb7c4a5ca845bfb4639f8b551aeec0075ca': Fix Ogg Vorbis packet timestamps
| * | | | | | Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-devMarco Nelissen2014-11-121-14/+61
| |\ \ \ \ \ \
| | * | | | | | Fix Ogg Vorbis packet timestampsMarco Nelissen2014-11-111-14/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17586090 Change-Id: Iea88f7cc1f623cbea5df24169ea76181925fbb13
* | | | | | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" ↵Andy Hung2014-11-121-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 8bc9b3a * commit '8bc9b3afceb793406a3dee0099ca636b26c58aa5': MediaCodec: Prevent stop() in the UNINITIALIZED state
| * | | | | | | Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-devAndy Hung2014-11-111-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | MediaCodec: Prevent stop() in the UNINITIALIZED stateAndy Hung2014-11-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return INVALID_OPERATION instead. This is a corner case when the decoder is still allocated, occurring after codec error. Bug: 18121124 Change-Id: If87e44dd40db48f63f965b765205f1e733663efd
* | | | | | | | am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of ↵Robert Shih2014-11-112-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetTrackByIndex" into lmp-mr1-dev automerge: a7e65b1 * commit 'e71da1f76a624adf97ca255149a85940a8515941': PlaylistFetcher: clear mStartup for .aac playlists after seek MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex
| * | | | | | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" ↵Robert Shih2014-11-111-4/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
generated by cgit v1.1 at 2024-09-09 06:21:29 +0000