summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright
Commit message (Collapse)AuthorAgeFilesLines
* HLS: misc bug fixesChong Zhang2015-04-021-0/+11
| | | | | | | | | | | | | | | | | - fix no target-duration case - fix for audio-only <=> audio/video switching - disable audio-only variants if there is at least one variant with video - fix mpeg2ts PTS wraparound when bandwidth adapting - tweak up/down switch marks bug: 19567254 Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
* Merge "MediaSync: support MediaSync in native code."Wei Jia2015-03-242-11/+252
|\
| * MediaSync: support MediaSync in native code.Wei Jia2015-03-202-11/+252
| | | | | | | | | | Bug: 19666434 Change-Id: Ib6678153f43f5063bdaaf53dd8ad5e8d26434e1e
* | am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"Marco Nelissen2015-03-222-2/+2
|\ \ | |/ |/| | | | | * commit 'f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba': ulaw and alaw aren't limited to 8kHz
| * ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-202-2/+2
| | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=158490 Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
| * Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-1910-11/+161
| |\
* | | libstagefright: add ProcessInfo to get process priority.Ronghua Wu2015-03-162-0/+73
| | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
* | | Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-161-0/+2
|\ \ \
| * | | libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I73675c7cc3d742b9a1a98d6c0f48dcf17557e2ad
* | | | Merge "Fix warning while building mediaserver"Glenn Kasten2015-03-131-0/+2
|\ \ \ \
| * | | | Fix warning while building mediaserverGlenn Kasten2015-03-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In file included from frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.h:31:0, from frameworks/av/services/audiopolicy/service/AudioPolicyService.h:38, from frameworks/av/media/mediaserver/main_mediaserver.cpp:36: frameworks/av/services/audiopolicy/managerdefault/ConfigParsingUtils.h:29:0: warning: "ARRAY_SIZE" redefined #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) ^ In file included from frameworks/av/media/libmediaplayerservice/MediaPlayerService.h:31:0, from frameworks/av/media/mediaserver/main_mediaserver.cpp:35: frameworks/av/include/media/stagefright/foundation/ABase.h:21:0: note: this is the location of the previous definition #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) ^ Change-Id: I4b80f783c592a78aa88b3dad297278353740466e
* | | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-105-21/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change replyID-s from uint32_t to an object Move reply handling into the loopers (to reuse a common mutex) Bug: 19607784 Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
* | | | | Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."Wei Jia2015-03-101-0/+77
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | mediaplayer: move MediaClock from NuPlayer to libstagefright.Wei Jia2015-03-091-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I86865e594226419bbbbee217098f96434e43afbe
* | | | | Merge "Include ABase.h to get definition of DISALLOW_EVIL_CONSTRUCTORS."Chih-Hung Hsieh2015-03-061-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Include ABase.h to get definition of DISALLOW_EVIL_CONSTRUCTORS.Chih-Hung Hsieh2015-03-061-0/+1
| |/ / / | | | | | | | | | | | | Change-Id: I13e375e67f20203c542b5350a55f42e925205b11
* | | | stagefright: remove AMessage methods using id()Lajos Molnar2015-03-052-5/+0
| | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
* | | | stagefright: use handler instead of handler-id in AMessageLajos Molnar2015-03-054-12/+44
|/ / / | | | | | | | | | | | | | | | | | | This avoids locking gLooperRoster mutex on post() and deliver(). Bug: 19607784 Change-Id: If6d9d7884dbb08fc390983bda896d223803476ba
* | | MPEG4Writer: add software version to mp4 metaChong Zhang2015-02-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | and account for meta data and geo data when estimating moov size bug: 19460202 Change-Id: I094d15f47dda5e41217181cdb3ac519c00330de5
* | | MPEG4Writer: add capture fps in meta dataChong Zhang2015-02-231-0/+9
| | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
* | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-1/+9
|\ \ \ | | | | | | | | | | | | | | | | * commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225': Add dumpsys info
| * \ \ am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-1/+9
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| | * Add dumpsys infoMarco Nelissen2015-02-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Print a list of looper-handler pairs and the number of messages they've processed, and optionally break those stats out by message type. Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
* | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-121-0/+1
| | | | | | | | | | | | | | | Bug: 19014096 Change-Id: I6de781e4d140a247dfd8fd8f12c3ddd7baa39ad4
* | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-101-0/+68
|\ \ \ | |/ / | | | | | | Change-Id: I14fd8063fa052f16868b8053a211190092131317
| * | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-101-0/+68
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| | * | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-061-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | | am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for ↵Lajos Molnar2015-02-061-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | native flex-YUV support" into lmp-mr1-dev * commit 'e576086224f6e630159eaeec59ab5146c8533dc7': stagefright: add fallback for native flex-YUV support
| * | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native ↵Lajos Molnar2015-02-061-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | flex-YUV support" into lmp-mr1-dev * commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794': stagefright: add fallback for native flex-YUV support
| | * | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use software renderer if codec cannot support flex-YUV on a surface Bug: 17906609 Change-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a
* | | | am 3b5d1195: am 7b66f713: am 57f75272: Merge "stagefright: add support for ↵Lajos Molnar2015-02-041-4/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-041-4/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | flex-YUV formats" into lmp-mr1-dev * commit '7b66f713fc53ee81453763788c02f3c741d19520': stagefright: add support for native flex-YUV formats
| | * | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-041-4/+5
| | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
* | | | am e91c3dd0: am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf ↵Elliott Hughes2015-02-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-041-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
| | * | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 a601b862: am c9e11696: am 36dca156: Merge "Acodec: Send framerate ↵Rachad2015-02-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-021-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | decoder if available" into lmp-mr1-dev * commit 'c9e11696c4f80e9803f7e65e29af962f199a574d': Acodec: Send framerate information to OMX decoder if available
| | * | Acodec: Send framerate information to OMX decoder if availableRachad2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19110889 Change-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc
| * | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-131-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f': Replace MidiFile player with a Midi extractor
| | * | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
* | | | am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for ↵Rachad2015-01-102-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | E-AC3 decoders" into lmp-mr1-dev * commit '7e85361e364bf8f80ab43dd5feb0f584e481019e': ACodec: Added support for E-AC3 decoders
| * | | am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" ↵Rachad2015-01-102-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '26c73acb73b5af94cb27e5d285d1708d25eb6892': ACodec: Added support for E-AC3 decoders
| | * | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-102-0/+3
| | |\ \
| | | * | ACodec: Added support for E-AC3 decodersRachad2014-12-232-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
* | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content ↵Chong Zhang2015-01-081-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | as protected to disable capture" into lmp-mr1-dev * commit '7993d6b343f2723872dac085756743630371454d': mark any copyrighted content as protected to disable capture
| * | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected ↵Chong Zhang2015-01-081-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | to disable capture" into lmp-mr1-dev * commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26': mark any copyrighted content as protected to disable capture
| | * | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-071-0/+1
| | |/ / | | | | | | | | | | | | | | | | bug: 18916274 Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
* | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
* | | | am d7aa535f: am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder ↵Lajos Molnar2014-12-151-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | death" into lmp-mr1-dev * commit 'd7aa535fc6ed1f4f0ee68bd3c7c483717d30205e': MediaCodecList: handle binder death
generated by cgit v1.1 at 2024-05-28 23:54:25 +0000