summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5f480891: am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on ↵Andy Hung2014-12-0910-82/+88
|\ | | | | | | | | | | | | failure to create AudioTrack" into lmp-mr1-dev * commit '5f480891e5818f111f431ae69b4c1354e302242a': Fix NuPlayer assertion on failure to create AudioTrack
| * am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create ↵Andy Hung2014-12-0810-82/+88
| |\ | | | | | | | | | | | | | | | | | | AudioTrack" into lmp-mr1-dev * commit '4c56f8e0329cbdd0f3406bde96fc6f0bba65664d': Fix NuPlayer assertion on failure to create AudioTrack
| | * am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" ↵Andy Hung2014-12-0510-82/+88
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b65842dd9447a7925046b2285b2aa8459dc63ed3': Fix NuPlayer assertion on failure to create AudioTrack
| | | * Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-devAndy Hung2014-12-0510-82/+88
| | | |\
| | | | * Fix NuPlayer assertion on failure to create AudioTrackAndy Hung2014-12-0310-82/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under heavy media load or monkey/stress testing, more than 32 AudioTracks may be created or memory resources may be scarce. Remove the assertion on failure to create AudioTrack and signal MEDIA_ERROR. Bug: 17319843 Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
* | | | | am 3202a2dc: am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource ↵Chong Zhang2014-12-094-39/+172
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | and StreamingSource" into lmp-mr1-dev * commit '3202a2dc337a3f4eb5410781e35f1ca0a1428615': fix threading in RTSPSource and StreamingSource
| * | | | am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and ↵Chong Zhang2014-12-084-39/+172
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | StreamingSource" into lmp-mr1-dev * commit '7cc9a1c59af8a583d33971c0d12e32dc66f742a5': fix threading in RTSPSource and StreamingSource
| | * | | am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into ↵Chong Zhang2014-12-054-39/+172
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '76c156f71f398d08fd88100f499a8a41ddfd3808': fix threading in RTSPSource and StreamingSource
| | | * | Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-devChong Zhang2014-12-054-39/+172
| | | |\ \
| | | | * | fix threading in RTSPSource and StreamingSourceChong Zhang2014-12-034-39/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I9c34401a928dc0ddbd0923aa5f127dc628efbb92
* | | | | | am 5185c956: am 25bad49c: am 852dc963: Merge "avc_util: try to find the ↵Wei Jia2014-12-092-17/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '5185c95673f7c6facd6d57fdc9fc53f52e44eed8': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| * | | | | am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code ↵Wei Jia2014-12-082-17/+15
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '25bad49ce75758b2f68b278f54d7272b1cf4d08c': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| | * | | | am 852dc963: Merge "avc_util: try to find the first start code prefix ↵Wei Jia2014-12-052-17/+15
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev * commit '852dc963a53487f2e2f197ab095299aed9c60a5e': avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
| | | * | | Merge "avc_util: try to find the first start code prefix 0x000001 even ↵Wei Jia2014-12-052-17/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
| | | | * | | avc_util: try to find the first start code prefix 0x000001 even though there ↵Wei Jia2014-12-042-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is non-zero byte at the beginning of the buffer. ESQueue: allow one PES playload contains multiple ADTS AAC frames. Bug: 18532335 Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
* | | | | | | am 900f6535: am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload ↵Andy Hung2014-12-091-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread is not initialized." into lmp-mr1-dev * commit '900f6535af232298e4a77477907a40f68e8dc61b': Fix getTimestamp if offload thread is not initialized.
| * | | | | | am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not ↵Andy Hung2014-12-081-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized." into lmp-mr1-dev * commit '561f50de82ce47f11ba8d4f25db1ca1d8467b2a7': Fix getTimestamp if offload thread is not initialized.
| | * | | | | am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." ↵Andy Hung2014-12-051-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'db995fe3239276be9dfd9e446b10417e07948acc': Fix getTimestamp if offload thread is not initialized.
| | | * | | | Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-devAndy Hung2014-12-051-1/+2
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns INVALID_OPERATION. Bug: 18605649 Change-Id: I440fb687fbf9249098e049982fa83bcd1515fd80
* | | | | | am 4eb26aa2: am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis ↵Lajos Molnar2014-12-091-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample rate to 8-96kHz * commit '4eb26aa2b549aef5a2e0863a95a5cd2c1138cd7b': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| * | | | | am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-081-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '7f099ffd8feeca1d9ac6616e64f422a35cdb9890': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| | * | | | am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-051-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '8790740d6bb1546dee6c87270976415503283820': media_codecs.xml: extend vorbis sample rate to 8-96kHz
| | | * | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | Bug: 18615604 Change-Id: I0245556b8164959dd52fe677901cbfc517627cb4
* | | | | stagefright: support VP9 frame parallel decode in Soft VPXhkuang2014-12-052-66/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VPX component now works with both serial decode mode and frame parallel mode. But VP9 frame parallel decode is not enabled yet until libvpx library enable it. In frame parallel decode, libvpx decoder decodes several frames on all cpus in parallel fashion. If not being flushed, it will only return frame when all the cpus are busy. If getting flushed, it will return all the frames in the decoder. Compare with current serial decode mode in which libvpx decoder is idle between decode calls, libvpx decoder is busy between decode calls. VP9 frame parallel decode is >30% faster than serial decode which will makes devices play 1080P VP9 videos more easily. Bug:17325438 Change-Id: I3c53329c6d0a9ff44f5a34d91ea06697478f08e2
* | | | | am 4d82c2f0: am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length ↵Wei Jia2014-12-051-4/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | checking in validation of ADTS header." into lmp-mr1-dev * commit '4d82c2f0d0361cd0062c3454d557bb1064e92020': ESQueue: add frame length checking in validation of ADTS header.
| * | | | am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in ↵Wei Jia2014-12-051-4/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | validation of ADTS header." into lmp-mr1-dev * commit '848b4c676c3295508b74f85947fc5243ce9466f4': ESQueue: add frame length checking in validation of ADTS header.
| | * | | am 814cbb4e: Merge "ESQueue: add frame length checking in validation of ADTS ↵Wei Jia2014-12-041-4/+19
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | header." into lmp-mr1-dev * commit '814cbb4e33396fce559475270d6f6c0bd7c43fc5': ESQueue: add frame length checking in validation of ADTS header.
| | | * | Merge "ESQueue: add frame length checking in validation of ADTS header." ↵Wei Jia2014-12-041-4/+19
| | | |\ \ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | | * | ESQueue: add frame length checking in validation of ADTS header.Wei Jia2014-12-031-4/+19
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an invalid ADTS buffer to be abandoned when frame length in the header exceeds buffer size. Bug: 18532335 Change-Id: I8057db525d06ff00ca24afd075a7c6c17b87eaa8
* | | | | am 9f104ea6: am 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM ↵Hochi Huang2014-12-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | radio audio got routed to loudspeaker unexpectedly * commit '9f104ea6d1123199f1f2e88934fae939c112a9b3': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| * | | | am 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio ↵Hochi Huang2014-12-051-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | got routed to loudspeaker unexpectedly * commit '94d9177849bb68434d3839a9b0886e09489de7f2': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| | * | | am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to ↵Hochi Huang2014-12-041-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | loudspeaker unexpectedly * commit '18f2f90cff65c384a4e8292cc3296dafafb43d52': [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
| | | * | [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker ↵Hochi Huang2014-12-041-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unexpectedly https://partner-android-review.git.corp.google.com/#/c/187894/ Change-Id: I3f9175bbc302e382155e568e66b88400ec05ffa5 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* | | | am 105860ce: am 93f5b333: am 050ff19e: Merge "libstagefright: defer ↵Lajos Molnar2014-12-041-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | kWhatSetParameters in OutputPortSettingsChangedState" * commit '105860cea2956f31f1c64d7a83a4a3bb21789cb8': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| * | | am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '93f5b333d31fd5fe425faa01b25d1b4d3115a8e6': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| | * \ \ am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '050ff19e650a53fd2b6f1f2490758b4bf3104ca4': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| | | * \ \ Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState"
| | | | * | | libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9719f1698bf411914eb753d3c349a15b9fbf9df6 Signed-off-by: Per Persson <per.persson@intel.com> Signed-off-by: Persson, Mikael <mikael.persson@intel.com> Signed-off-by: Fagerstedt, Axel <axel.fagerstedt@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | | | am c7883e6a: am b783a705: am ab05b4cc: StreamingSource: check mTSParser ↵Wei Jia2014-12-041-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before dereferencing it. * commit 'c7883e6a5381bbc96029f2dc9f949d6b2f8b3558': StreamingSource: check mTSParser before dereferencing it.
| * | | | | | am b783a705: am ab05b4cc: StreamingSource: check mTSParser before ↵Wei Jia2014-12-031-0/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dereferencing it. * commit 'b783a70593c85493a2578dd8fbd7935f1bf00420': StreamingSource: check mTSParser before dereferencing it.
| | * | | | | am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-031-0/+4
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * commit 'ab05b4ccb8ea59079d7f773aa0e090029c479bad': StreamingSource: check mTSParser before dereferencing it.
| | | * | | | StreamingSource: check mTSParser before dereferencing it.Wei Jia2014-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18532335 Change-Id: I7819d8d359fe75ea4c827138e9aaa2454ccfe3b1
* | | | | | | am 0ed71389: am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY ↵Elliott Hughes2014-12-031-4/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is always true for __arm__." * commit '0ed7138903a85526a85d0cea8ff51b56d5aac236': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| * | | | | | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ↵Elliott Hughes2014-12-031-4/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for __arm__." * commit 'eb05baccea81f125d042be33c36dcf1893d903d9': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| | * | | | | am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'b0eb7b0a4c1c8f437d099eb14007863a94fcfbf0': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| | | * | | | Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
| | | |\ \ \ \
| | | | * | | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And this is the only user of that macro... Bug: 18556103 Change-Id: I1b515a54ac8530b150f4dd93070db60c701a5603
* | | | | | | Merge "Clean up makefile to fix build."Dan Albert2014-12-021-6/+10
|\ \ \ \ \ \ \
| * | | | | | | Clean up makefile to fix build.Dan Albert2014-12-021-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediafilter was defining LOCAL_NDK_STL_VARIANT, but never setting LOCAL_SDK_VERSION, so it was a no-op. Since the project was still manually setting the stlport include path, it was getting the stlport headers with precedence over libc++, which breaks the world. Once that is fixed, the project has never linked libRScpp, which is required (I'm not sure how this part has ever worked). Change-Id: Iac70c86bc150eea08329812c0d5744434318d28e