summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-072-10/+16
|\
| * Fix warnings about unused parametersGlenn Kasten2014-02-072-10/+16
| | | | | | | | Change-Id: I27dc108e2c1f7ffd414bb7ff3d4c349651da6c26
* | Merge "Fix whitespace"Glenn Kasten2014-02-072-13/+26
|\ \
| * | Fix whitespaceGlenn Kasten2014-02-072-13/+26
| |/ | | | | | | Change-Id: I9add0872030a26933f6b6dad1be299154611cc56
* | Merge "set AAC MPEG version to MPEG-2"Chong Zhang2014-02-071-1/+1
|\ \
| * | set AAC MPEG version to MPEG-2Chong Zhang2014-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | wifi display play spec only allows MPEG-2 AAC. Bug: 12747927 Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
* | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"Glenn Kasten2014-02-071-1/+2
|\ \ \
| * | | Change Format_frameBitShift() API for non-power-of-2 sizesGlenn Kasten2014-02-031-1/+2
| | | | | | | | | | | | | | | | Change-Id: Ie39ff51ab8c403ca9d9898396297efdaa3193588
* | | | Merge "Add FIXMEs about audio_format_t assumption"Glenn Kasten2014-02-071-0/+2
|\ \ \ \ | |/ / /
| * | | Add FIXMEs about audio_format_t assumptionGlenn Kasten2014-02-031-0/+2
| | | | | | | | | | | | | | | | Change-Id: I0d38241b61f70013573f4a0b9306547afe5f38ad
* | | | Merge "Change NBAIO_Format from typedef to struct"Glenn Kasten2014-02-071-6/+8
|\ \ \ \ | |/ / /
| * | | Change NBAIO_Format from typedef to structGlenn Kasten2014-02-031-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to support arbitrary sample rates, channel counts, and sample formats in NBAIO. Change-Id: I5eda412648b094358f5eefc38300e9ec8a734cd3
* | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"Glenn Kasten2014-02-074-9/+9
|\ \ \ \ | |/ / /
| * | | Use Format_isValid() and Format_isEqual() instead of direct comparisonGlenn Kasten2014-02-034-9/+9
| | | | | | | | | | | | | | | | Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9
* | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO"Glenn Kasten2014-02-071-0/+10
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Add Format_isValid() and Format_isEqual() to NBAIOGlenn Kasten2014-02-031-0/+10
| | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct. Change-Id: I8eb1c7d98fd12f997641e462359864fdb834abe6
* | | Merge "Remove libstagefright_http_support from the PDK build."Andreas Huber2014-02-061-0/+4
|\ \ \ | |_|/ |/| |
| * | Remove libstagefright_http_support from the PDK build.Andreas Huber2014-02-061-0/+4
| | | | | | | | | | | | Change-Id: Ie9f81b1cd2694e65fe2d7590cf2ad9e7dad162ce
* | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-0610-196/+1152
|\ \ \ | |/ / |/| |
| * | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-0510-196/+1152
| | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
* | | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \ \
| * | | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | b/12890850 Change-Id: I985a1ae94d7d62701296d95da34974eb29fcc535
* | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-0627-1655/+14
|\ \ \ \
| * | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0527-1655/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-7/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-7/+16
| |/ / | | | | | | | | | Change-Id: I62d6534a9581e84ae20c2422f7ad9aeda9b7c4df
* | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-0556-112/+827
|\ \ \ | |/ / |/| | | | | available to media code"
| * | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-0456-112/+827
| | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-045-6/+6
|\ \ \
| * | | Fix unused parameter warnings in audioGlenn Kasten2014-02-035-6/+6
| | | | | | | | | | | | | | | | Change-Id: I665ba3358dd9502f0adec70d486e7bf8a2e1b0fe
* | | | Merge "Change Format_Invalid from enum to global const"Glenn Kasten2014-02-041-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct Change-Id: I36d1fe81d2f974224750f753453753303c224591
* | | | Merge "Allow for larger codec private data"Marco Nelissen2014-02-041-30/+50
|\ \ \ \ | |/ / / |/| | |
| * | | Allow for larger codec private dataMarco Nelissen2014-02-031-30/+50
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This change adds support for multibyte sizes in the ESDS. Previously the Matroska extractor only supported single byte sizes, so codec private data had to be less than 108 bytes, and would crash if it was bigger. b/12584090 Change-Id: I9edfc2f687187d1e98bcfd2fe56576312435df3e
* | | Merge "Use const NBAIO_Format& in parameter lists"Glenn Kasten2014-02-034-7/+7
|\ \ \
| * | | Use const NBAIO_Format& in parameter listsGlenn Kasten2014-01-314-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct. Change-Id: I8d73a6b29580c65105afd78f24db7e2f4a1eb872
* | | | Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."Robert Shih2014-02-031-3/+6
|\ \ \ \
| * | | | MPEG4Writer: use "mp42" as major/minor brand in ftyp box.Robert Shih2014-01-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12783430 Change-Id: I7c8029de1db21fcac0ce3e4505661189535c45f1
* | | | | Merge "Added support to query ACodec whether adaptive playback is enabled."Robert Shih2014-02-031-0/+5
|\ \ \ \ \
| * | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-01-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b0308aa8550c643706959277e46dad586c37297
* | | | | | Merge "Fixed misplaced bracket for switch-case block."Robert Shih2014-02-031-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed misplaced bracket for switch-case block.Robert Shih2014-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66b410e1e19601ad65d8357bda4c0c58e2dc15dc
* | | | | | am 324d9157: am 5db1e3a6: Merge "correct one logic error in decide whether ↵Lajos Molnar2014-02-032-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should render or not" * commit '324d9157a30f85fb12afa56b2230663ccdd61ced': correct one logic error in decide whether should render or not
| * \ \ \ \ \ am 5db1e3a6: Merge "correct one logic error in decide whether should render ↵Lajos Molnar2014-02-032-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or not" * commit '5db1e3a6f30c252ed61461dd8c58786e905e5f5a': correct one logic error in decide whether should render or not
| | * | | | | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
* | | | | | | | am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there ↵Eric Laurent2014-02-035-31/+88
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds" * commit 'af1aa00e5e6fa3dcd5b7d9145ac6f7659f98bb68': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| * | | | | | | am c4eef29a: Merge "fix deadlock issues that arise when there are ↵Eric Laurent2014-02-035-31/+88
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds" * commit 'c4eef29af4e306319d8741e0c3ade1ede9a0a2b5': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| | * | | | | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-315-31/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds Whenever there are parallel calls to proxy and non sub-effects wrappers, some of the calls are not completed. This is due to deadlock arsing out of Proxy waiting for the subeffect call to return and subeffect waiting for proxy to release lock. The call flow is changed to a cleaner and simple one - Proxy gets the aeli(effect library info) of subeffects during the EffectGetSubEffects() call. Therby, proxy will manage the sub effects by itself rather than going through effects factory. Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044 Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
| * | | | | | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597 (cherry picked from commit 774eb18c40c3a7da0bc1636a9779f02315ddbad8)
generated by cgit v1.1 at 2024-07-01 15:08:48 +0000