summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* libeffects: 64-bit compile warningsMark Salyzyn2014-06-202-26/+32
| | | | Change-Id: I210129f5742b046f7ceef48194f039352eff596d
* libnbaio: 64-bit compile warningsMark Salyzyn2014-06-202-3/+5
| | | | Change-Id: I9517c32193031dcc7af7b2104e985d66805b84aa
* libmediaplayerservice: 64-bit compile warningsMark Salyzyn2014-06-203-10/+10
| | | | Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
* libmedia: 64-bit compile warningsMark Salyzyn2014-06-2012-58/+76
| | | | Change-Id: I600f062fa7148c01851023c1240c39939e648002
* AudioTrack: add support for compressed audioEric Laurent2014-06-191-15/+52
| | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-183-16/+247
|\ | | | | | | | | | | * changes: AudioPolicyManager: return output for audio attributes AudioTrack construction with audio attributes
| * AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-183-10/+88
| | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
| * AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-10/+163
| | | | | | | | | | | | | | | | | | | | | | | | Store audio attributes in AudioTrack class. When an AudioTrack is "set" with non null audio attributes, derive a stream type that reflects the attributes. When an AudioTrack is "set" without attributes, and only has a stream type, derive default audio attributes. Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
* | Merge "Fail more gracefully on allocation failure"Marco Nelissen2014-06-171-7/+26
|\ \
| * | Fail more gracefully on allocation failureMarco Nelissen2014-06-171-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check allocations when the size is read from a file and might therefore be invalid. b/14388161 Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
* | | Merge "Fix logging"Marco Nelissen2014-06-161-4/+4
|\ \ \ | |/ /
| * | Fix loggingMarco Nelissen2014-06-131-4/+4
| | | | | | | | | | | | | | | | | | | | | Make the log message specify whether it was an encoder or a decoder that failed to instantiate. Change-Id: Ie357775114c8dea722d87381c13affdfb19dcde4
* | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-146-3/+383
|\ \ \
| * | | support for CEA-608 closed captionChong Zhang2014-06-136-3/+383
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
* | | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-1210-65/+154
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | refactor getTrackInfo()Chong Zhang2014-06-1310-65/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (this is in preparation for supporting other cc source) - split into two methods: getTrackCount() and getTrackInfo() - move track info parcelling to NuPlayer - parcel in the mime type of the subtitle format Bug: 15470448 Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
* | | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-122-17/+11
|\ \ \
| * | | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-112-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio stream type is not used in the getSampleRate() and getFrameCount() methods. Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
* | | | am 3bcffa13: force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * commit '3bcffa136909c1fb6e88ee4efd12ccac18360a85': force command flush after releasing a reference to shared memory
| * | | force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After releasing a reference to a shared memory interface, IPCThreadState::self()->flushCommands() must be called to ensure that the corresponding reference is also cleared immediately in the remote process. Otherwise the binder implementaiton will not push the clear systematically causing the memory region not to be freed. See issues 10711502 and 2801375. Bug: 14057166. Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
| * | | Merge "Added paused state to NuPlayerDecoder" into lmp-preview-devWei Jia2014-06-102-2/+20
| |\ \ \
| | * | | Added paused state to NuPlayerDecoderWei Jia2014-06-102-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents decoder from requesting new buffer until the decoder is resumed, and prevents processing a potential DISCONTINUITY while the player is still flushing. Bug: 13133027 Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0 (cherry picked from commit 704e72658b1082264a26a83c50046da34f07d1a1)
| * | | | Guard against malformed filesMarco Nelissen2014-06-101-4/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | b/15433074 Change-Id: I35363def42d38eba49dd5aece566fd345743937e
* | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-23/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * \ \ \ am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-23/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f': Offer a type-safe album art interface.
| | * \ \ \ Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-114-23/+29
| | |\ \ \ \
| | | * | | | Offer a type-safe album art interface.Elliott Hughes2014-06-114-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | | | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Jeff Tinker2014-06-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-101-2/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1
* | | | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-112-3/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'ca44dc79b5a163030ab0963f80aa771871de092d': Add libcrypto for users of libstagefright.
| * | | | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-102-3/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '8d6d8f546c1d6c55b79b454c720c03a80c738444': Add libcrypto for users of libstagefright.
| | * | | | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* | | | | | Merge "MediaProfiles: Add 4K video related constants"Zhijun He2014-06-101-0/+2
|\ \ \ \ \ \
| * | | | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-0/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 15287656 Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
* | | | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
| * | | | | am d3af4265: Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'd3af4265dca4c8ebcead5376f1c73a5dafc34778': Link libcrypto for MD5_* functions.
| | * | | | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
| * | | | | am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for ↵Lajos Molnar2014-06-051-9/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | videoeditor * commit '17a6dd60f5f8a28af1db451bcbf44805648c844a': DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
| | * | | | | DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15320804 Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
* | | | | | | Log an error when audio/video encoder failed to createChong Zhang2014-06-111-1/+5
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49 related-to-bug: 15106730
* | | | | | Merge "Remove unneeded code"Marco Nelissen2014-06-101-6/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove unneeded codeMarco Nelissen2014-06-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e
* | | | | | add back HEVC SoftOMX decoderLajos Molnar2014-06-063-0/+853
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Iea399e0cfec1f78584c74089f01821d8552ced40
* | | | | | Remove SoftOMX HEVC decoderLajos Molnar2014-06-063-849/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db
* | | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for ↵Lajos Molnar2014-06-069-8/+1023
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | HEVC" into lmp-preview-dev * commit '8a45461198c69e9e15f133c2e11ded47fc4c708b': stagefright: added support, and SoftOMX decoder, for HEVC
| * | | | | Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into ↵Lajos Molnar2014-06-069-8/+1023
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-preview-dev
| | * | | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-069-8/+1023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed QuerySupportedProfileLevels in SoftVideoDecoderOMXComponent.cpp Bug: 14571712 Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
* | | | | | | Merge "Guard against malformed files"Marco Nelissen2014-06-061-4/+28
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Guard against malformed filesMarco Nelissen2014-06-061-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/15433074 Change-Id: I35363def42d38eba49dd5aece566fd345743937e
* | | | | | | Merge "do not drop TS packet on discontinuity at payload start"Chong Zhang2014-06-061-1/+3
|\ \ \ \ \ \ \
generated by cgit v1.1 at 2024-05-18 16:54:38 +0000