Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2014-11-17 | 5 | -11/+11 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 5 | -11/+11 | |
| * | | | | | libstagefright: use __predict_false from bionic rather than CONDITION from lo... | Mark Salyzyn | 2014-11-11 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer pa... | Wei Jia | 2014-11-15 | 1 | -1/+1 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ... | Wei Jia | 2014-11-15 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | NuPlayer: tunnel decoder with renderer for data buffer passing. | Wei Jia | 2014-11-14 | 1 | -1/+1 | |
* | | | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr... | Robert Shih | 2014-11-15 | 1 | -27/+37 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-dev | Robert Shih | 2014-11-15 | 1 | -27/+37 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | PlaylistFetcher: handle sporadic fetch erros | Robert Shih | 2014-11-13 | 1 | -27/+37 | |
* | | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into... | Lajos Molnar | 2014-11-14 | 9 | -440/+764 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-dev | Lajos Molnar | 2014-11-14 | 9 | -440/+764 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | stagefright: add runtime debug support | Lajos Molnar | 2014-11-12 | 9 | -440/+764 | |
* | | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo... | Chong Zhang | 2014-11-14 | 1 | -164/+105 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-dev | Chong Zhang | 2014-11-13 | 1 | -164/+105 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | Stagefright: use MediaCodec in async mode for recording | Praveen Chavan | 2014-11-12 | 1 | -164/+105 | |
| | | |_|_|/ / | | |/| | | | | ||||||
* | | | | | | | am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some members... | Wei Jia | 2014-11-14 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "AnotherPacketSource: need reset some members before returning from que... | Wei Jia | 2014-11-13 | 1 | -4/+4 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | AnotherPacketSource: need reset some members before returning from queueDisco... | Wei Jia | 2014-11-13 | 1 | -4/+4 | |
| | | |_|/ / / | | |/| | | | | ||||||
* | | | | | | | am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts program streams be... | Robert Shih | 2014-11-13 | 3 | -6/+32 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into l... | Robert Shih | 2014-11-13 | 3 | -6/+32 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | PlaylistFetcher: check ts program streams before disabling a/v | Robert Shih | 2014-11-12 | 3 | -6/+32 | |
* | | | | | | | am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-m... | Marco Nelissen | 2014-11-12 | 1 | -14/+61 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-dev | Marco Nelissen | 2014-11-12 | 1 | -14/+61 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix Ogg Vorbis packet timestamps | Marco Nelissen | 2014-11-11 | 1 | -14/+61 | |
* | | | | | | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in... | Andy Hung | 2014-11-12 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev | Andy Hung | 2014-11-11 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | MediaCodec: Prevent stop() in the UNINITIALIZED state | Andy Hung | 2014-11-04 | 1 | -2/+5 | |
* | | | | | | | | am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTra... | Robert Shih | 2014-11-11 | 2 | -4/+6 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" in... | Robert Shih | 2014-11-11 | 1 | -4/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex | Robert Shih | 2014-11-08 | 1 | -4/+5 | |
| * | | | | | | | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lm... | Robert Shih | 2014-11-11 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| | * | | | | | | | PlaylistFetcher: clear mStartup for .aac playlists after seek | Robert Shih | 2014-11-07 | 1 | -0/+1 | |
| | |/ / / / / / | ||||||
* | | | | | | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | Remove the executable bit from source files | Martin Storsjo | 2014-11-07 | 91 | -0/+0 | |
| * | | | | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-16 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | am c40da54b: Merge "Fix freed memory references" into lmp-dev | Lajos Molnar | 2014-10-16 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev | Lajos Molnar | 2014-10-14 | 1 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp | Lajos Molnar | 2014-10-14 | 10 | -362/+454 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | am 512e9792: stagefright: support passing GraphicBuffer in metadata buffer | Lajos Molnar | 2014-10-14 | 4 | -21/+75 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat... | Chong Zhang | 2014-10-13 | 2 | -1/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st... | Wei Jia | 2014-10-13 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo... | Guang Zhu | 2014-10-13 | 1 | -21/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat... | Chong Zhang | 2014-10-10 | 1 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ... | Lajos Molnar | 2014-10-10 | 1 | -9/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5002d02e: Merge "Recover from errors" into lmp-dev | Marco Nelissen | 2014-10-07 | 1 | -5/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ... | Rachad | 2014-10-07 | 1 | -1/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-06 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaC... | Chong Zhang | 2014-10-04 | 1 | -5/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder... | Ronghua Wu | 2014-10-03 | 2 | -3/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am aaa527fb: Merge "send available codec buffer count with codec notification... | Chong Zhang | 2014-10-03 | 1 | -2/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |