summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup unused parameters or variable in EffectBundleJean-Michel Trivi2014-07-081-4/+3
| | | | | | | No unused parameter warning in EffectBundle. Remove unused variable declaration in Virtualizer_getParameter Change-Id: Ibe1c051bc21ac53a6c770b4aa28e31ac5d559d9b
* Merge "MatroskaExtractor: track specific seeking"Robert Shih2014-07-023-26/+96
|\
| * MatroskaExtractor: track specific seekingRobert Shih2014-06-193-26/+96
| | | | | | | | | | | | | | Divide cues based on tracks to support track specific seeking. Bug: 15595215 Change-Id: Ibb853b0955c62af72243ed29253f939d07628ae4
* | Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-014-13/+137
| | | | | | | | Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
* | Merge "Add HEVC encoder support to ACodec"Rachad2014-06-271-0/+60
|\ \
| * | Add HEVC encoder support to ACodecRachad2014-06-261-0/+60
| | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
* | | Fix AAC timestampsMarco Nelissen2014-06-262-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When playing an mpeg-2 transport stream with AAC audio, there will be more than one packet per input buffer, resulting in multiple output buffers for each input buffers. Additional timestamps needs to be generated in that case. b/15755476 Change-Id: I2df50b0cb3690eb36d56871daa1263de0028db06
* | | Merge "HLS: only queue discontinuity for first block"Chong Zhang2014-06-261-0/+3
|\ \ \
| * | | HLS: only queue discontinuity for first blockChong Zhang2014-06-251-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 15020526 Change-Id: I15f9ab0f38dc510e584c668eea73ece61844d413
* | | | ndk: 64-bit compile warningsMark Salyzyn2014-06-263-9/+12
| | | | | | | | | | | | | | | | Change-Id: I214973a97547bf714e56e4596359cb2bd9cdea9c
* | | | libstagefright: 64-bit compile warningsMark Salyzyn2014-06-2628-136/+170
| | | | | | | | | | | | | | | | Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
* | | | mtp: 64-bit compile warningsMark Salyzyn2014-06-252-5/+8
| | | | | | | | | | | | | | | | Change-Id: I9ebc270c990d2f83311cec8fef8f1d2842ebf291
* | | | am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument ↵Mark Salyzyn2014-06-244-29/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning messages" * commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311': libmediaplayerservice: unused argument warning messages
| * \ \ \ am 940c688d: Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-244-29/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '940c688d76828ffd83929c661e75b5197903d30f': libmediaplayerservice: unused argument warning messages
| | * | | | libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
* | | | | | Improve MTP error checkingMarco Nelissen2014-06-241-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ab02ca0e99a1c284411fb368a773fb481d72ab2
* | | | | | am 620f348f: am da69fdbb: Merge "Fix buffer allocation"Marco Nelissen2014-06-231-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '620f348faf3ce0c39e71338a005f1528765f4d1e': Fix buffer allocation
| * | | | | am da69fdbb: Merge "Fix buffer allocation"Marco Nelissen2014-06-231-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'da69fdbbeb79885a3c063a2017bd6d2848fcc312': Fix buffer allocation
| | * | | | Fix buffer allocationMarco Nelissen2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/15293123 Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
| * | | | | am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-131-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '90732a3be5e70156486aca94bde8aa81106329ba': Remove dependency on Parcel::{read,write}IntPtr
| | * | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
| | |\ \ \ \
| | | * | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 (cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96) Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
| * | | | | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-139-152/+251
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| | * | | | | Update OMX messages for 64 bitAndy Hung2014-06-129-148/+234
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Parse trex and mehd boxes"Marco Nelissen2014-06-234-16/+141
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Parse trex and mehd boxesMarco Nelissen2014-06-234-16/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also get duration from mvhd if available, use that in addition to track durations to determine total length of file, clear track header struct so we don't read uninitialized garbage from it, and take composition time offset into account for proper ordering when B frames are used. b/15669839 Change-Id: Ibf3e35b5c7299bac11d0e78a391545fc325dd2d0
* | | | | | 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.
generated by cgit v1.1 at 2024-05-17 21:11:08 +0000