summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-devJohn Grossman2012-08-1327-6348/+519
|\ | | | | | | | | | | * changes: Move the AAH RTP code out of framework and into vendor. Add the ability to dynamicaly register MediaPlayer types.
| * Move the AAH RTP code out of framework and into vendor.John Grossman2012-08-1321-6196/+1
| | | | | | | | | | | | | | | | | | | | Relocate the AAH RTP code from framework/av into vendor/google_devices/phantasm. This change is the deletion, there will be a separate CL which re-introduces on the vendor side of things. Change-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c Signed-off-by: John Grossman <johngro@google.com>
| * Add the ability to dynamicaly register MediaPlayer types.John Grossman2012-08-139-217/+583
| | | | | | | | | | | | | | | | | | | | | | | | Add the ability to dynamically register low level MediaPlayer factories which will be probed at setDataSource time to determine the proper MediaPlayerBase to instantiate. This change is in preparation for moving libaah_rtp out of frameworks/base and into phantasm platform directory. Change-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076 Signed-off-by: John Grossman <johngro@google.com>
* | Merge "Signal end of stream if no more fragments are going to be available." ↵Andreas Huber2012-08-132-1/+15
|\ \ | |/ |/| | | into jb-mr1-dev
| * Signal end of stream if no more fragments are going to be available.Andreas Huber2012-08-092-1/+15
| | | | | | | | Change-Id: I16696740d3551aa8a5ba904ec757c64b0ecd1307
* | am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT ↵Jean-Baptiste Queru2012-08-102-6/+40
|\ \ | | | | | | | | | | | | | | | | | | and PMT" * commit '3ca352c4cd01f6df3b691f835efc68a5771e724e': MPEG2TSWriter: Write a proper CRC in PAT and PMT
| * \ am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
| |\ \ | | | | | | | | | | | | | | | | * commit '24893fef8e0f816a8a21749fa3eb9eed9173a0fd': MPEG2TSWriter: Write a proper CRC in PAT and PMT
| | * \ Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
| | |\ \
| | | * | MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-102-6/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
* | | | | am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity ↵Jean-Baptiste Queru2012-08-102-7/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | counters for PAT and PMT" * commit '31a593b901eeb924ae5214962c628397dd0197f2': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
| * | | | am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT ↵Jean-Baptiste Queru2012-08-102-7/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | and PMT" * commit '2001d2ac01e36c13c1abda5f73b6404cba2648e1': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
| | * | | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-102-7/+19
| | |\ \ \ | | | |/ /
| | | * | MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-102-7/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: If94e31e51c563867db6d2376ad771f9751416084
* | | | | am ff4c64d6: am c64a1787: Merge "Fix initialization of audio mixer track ↵Jean-Baptiste Queru2012-08-101-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | resources for MIPS." * commit 'ff4c64d6b1b58494a1b15f1a664e5c421d095d15': Fix initialization of audio mixer track resources for MIPS.
| * | | | am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."Jean-Baptiste Queru2012-08-101-1/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c64a178711bf7bb9b71d65a47156b34083311392': Fix initialization of audio mixer track resources for MIPS.
| | * | | Merge "Fix initialization of audio mixer track resources for MIPS."Jean-Baptiste Queru2012-08-101-1/+5
| | |\ \ \
| | | * | | Fix initialization of audio mixer track resources for MIPS.Paul Lind2012-08-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value 1 << 32 (maxNumTracks defaults to 32) is surprisingly not defined in C, and differs on MIPS than the other arch. Therefore the track resources were not initialized properly, resulting in failure to play any audio. The fix allows the mConfiguredNames bitmask to be correctly set to all 1's in the 32-track case, for all arch. Change-Id: Ied3e1305952e9567602e2cd76c5ef3acb0809ee0 Signed-off-by: Paul Lind <plind@mips.com>
* | | | | | Merge "Handle malformed raw AAC/AMR writer better" into jb-mr1-devJames Dong2012-08-102-3/+19
|\ \ \ \ \ \
| * | | | | | Handle malformed raw AAC/AMR writer betterJames Dong2012-08-092-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I196fe196c26b83be09fcd54174ceb4e135073c2b
* | | | | | | Camera2: Swap AF notification order, minor bug fix.Eino-Ville Talvala2012-08-102-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In continuous AF modes, when an AF trigger/cancel is received in the middle of a passive AF scan, we want to send both an AF move stop callback and an AF done callback. Swap the order of sending to simplify life when the app just wants to pay attention to the AF done callback during an active AF trigger. Bug: 6243944 Change-Id: I127d1675bc37ef828ef89c70b8cfab75f9428a2f
* | | | | | | Camera2: Add trigger support, and implement autofocusEino-Ville Talvala2012-08-104-7/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add skeletons for all triggering actions into Camera2Device - Add support for AF triggers to HAL - Add support for AF notifications from HAL Bug: 6243944 Change-Id: I21025440849ae41f7083e1dcb72c99f8e5b2d5f7
* | | | | | | Merge "Update state only if calls to native window are successful" into ↵James Dong2012-08-101-3/+13
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | jb-mr1-dev
| * | | | | | Update state only if calls to native window are successfulJames Dong2012-08-091-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a20f3ca787e11ca9c8c904b257e3c8a4e529136
* | | | | | | Merge "Fix static sample table processing, add support for h.263 video." ↵Andreas Huber2012-08-094-56/+53
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | Fix static sample table processing, add support for h.263 video.Andreas Huber2012-08-094-56/+53
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I5628d3437b5e6f8836d78557fd07ab87e5a914e3
* | | | | | Remove some unused forward lock codeJames Dong2012-08-082-61/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
* | | | | Tune the overrun correctionGlenn Kasten2012-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new overrun correction is: if the previous write() cycle time is < 50% of expected, then sleep enough extra to make the total cycle time = 95% of expected. This should help compensate for HAL implementations that have uneven cycle times due to sample rate conversion. Bug: 6881638 Change-Id: I5ab58afdfceee7ac523177f021fbf62d743d571a
* | | | | am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 ↵Jean-Baptiste Queru2012-08-082-6/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | files" * commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4': Store correct time stamps in recorded mp4 files
| * | | | am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-082-6/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c': Store correct time stamps in recorded mp4 files
| | * | | Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-082-6/+17
| | |\ \ \
| | | * | | Store correct time stamps in recorded mp4 filesJohannes Carlsson2012-07-302-6/+17
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and 21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time" which is not the same as Unix epoch time. This is already correctly handled in MPEG4Extractor.cpp when reading files. The specification also supports 64 bit timestamps which would make it a bit more future proof, but unfortunately it seems like support for this in players are poor (tested both Windows media player and Quicktime player). Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
* | | | | Merge "AudioFlinger: fix timed audio" into jb-mr1-devJohn Grossman2012-08-0813-24/+261
|\ \ \ \ \
| * | | | | AudioFlinger: fix timed audioJohn Grossman2012-08-0813-24/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e20ac92c564a2f4e8123885807abdf0a78de0dd7) > AudioFlinger: fix timed audio > > Addresses Bug 6900517. > > Finish up support for timed audio in the new FastMixer world. Pay special > attention to remaining lock-less and voluntary yield free on the FastMixer > thread. This fixes audio playback for Q on JB. > > Change-Id: Iaf815e58a1b1d0a0190051794bec8dc5c9231785 > Signed-off-by: John Grossman <johngro@google.com> Change-Id: I9bd687acc345a05867af48e71116690fdb0ce1b5 Signed-off-by: John Grossman <johngro@google.com>
* | | | | | Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-devJohn Grossman2012-08-082-244/+178
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioFlinger: Better handling for master volume/muteJohn Grossman2012-08-082-244/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 93d906837e0e89aa1d9c913ab2b531b809f9bb9e) > AudioFlinger: Better handling for master volume/mute > > Changes to address bug 6842827. > > When a HAL is loaded, cache whether or not the HAL supports > set_master_volume/mute in the AudioHwDevice structure. Store an > AudioHwDevice in AudioStream(In|Out) structures instead of just an > audio_he_device_t. This give threads (PlaybackThreads in > particular) access to the cached capabilities. > > When setting master volume/mute, change the system to always set the > setting on all HAL which support it and also to set the setting on all > PlaybackThreads. Change PlaybackThreads to apply the setting at the > in SW mix stage of the pipeline if its assigned HAL does not support > the setting, or to ignore the setting of the assigned HAL does support > it. > > Change-Id: Ia14137a30b4c3ee6f2d7ddcc8cba87bf5eec87f4 > Signed-off-by: John Grossman <johngro@google.com> Change-Id: Icb6bc13764e100a2003eb1dee2231132ab287d98 Signed-off-by: John Grossman <johngro@google.com>
* | | | | | Merge "Change audio flinger to user HAL master mute if available" into ↵John Grossman2012-08-082-10/+115
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | jb-mr1-dev
| * | | | | Change audio flinger to user HAL master mute if availableJohn Grossman2012-08-082-10/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 91de9b56282d126ffb36344266af5fee3cefcfdd) > Change audio flinger to user HAL master mute if available > > Hand merge from ics-aah > > > Change audio flinger to user HAL master mute if available: DO NOT MERGE > > > > Replicate the pattern used for HAL master volume support to make use > > of master mute support if the HAL supports it. This is part of the > > change needed to address bug 6828363. Because of the divergences > > between ICS and master, this change will need to be merged by hand. > > > > Signed-off-by: John Grossman <johngro@google.com> > > Change-Id: I6d83be524021d273d093bcb117b8f2fe57c23685 > > Change-Id: I32280582905c969aaec2bb166ec5c61df82d737a > Signed-off-by: John Grossman <johngro@google.com> Change-Id: I5cd709187221d307fe25c5117ccaadca5f6b197b Signed-off-by: John Grossman <johngro@google.com>
* | | | | | am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for ↵Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | UCS-2 data." * commit 'ef62009372d050b431939835d4e2c5ee77da8831': Correct ID3::StringSize calculation for UCS-2 data.
| * | | | | am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'efee009528f446542d51f1ce50e2189e8a2f71dd': Correct ID3::StringSize calculation for UCS-2 data.
| | * | | | Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
| | |\ \ \ \
| | | * | | | Correct ID3::StringSize calculation for UCS-2 data.Jesper Tragardh2012-07-111-1/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Album art was not displayed when albums were transferred via MediaGo because the length of the description in the APIC tag was not correctly calculated. The method StringSize used to calculate the length of the tag does not add the size of the null termination in UCS-2 case. Change-Id: I5409d42f5e87d315e6e03c4d7e6cbd8a378a160d
* | | | | | am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant ↵Jean-Baptiste Queru2012-08-082-10/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zero-initialization of allocated memory" * commit '662b15c377e1ebe6aed8ff5cf82c684f0c8894dc': avcenc: Remove redundant zero-initialization of allocated memory
| * | | | | am a858aa96: Merge "avcenc: Remove redundant zero-initialization of ↵Jean-Baptiste Queru2012-08-082-10/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocated memory" * commit 'a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f': avcenc: Remove redundant zero-initialization of allocated memory
| | * | | | Merge "avcenc: Remove redundant zero-initialization of allocated memory"Jean-Baptiste Queru2012-08-082-10/+0
| | |\ \ \ \
| | | * | | | avcenc: Remove redundant zero-initialization of allocated memoryMartin Storsjo2012-07-122-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The allocation callback is now supposed to always return initialized memory. Change-Id: I7a4d036e498c9f87c730dda3aab5057eb764a1e7
* | | | | | | am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by ↵Jean-Baptiste Queru2012-08-082-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the CBAVC_Malloc callback function" * commit '44237a8d58dc218257687f2cbe8fd33d73a713e8': avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
| * | | | | | am b71298ee: Merge "avcenc: Initialize all memory allocated by the ↵Jean-Baptiste Queru2012-08-082-2/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CBAVC_Malloc callback function" * commit 'b71298eeeb16d942dd5144e550731e6e29b6436e': avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
| | * | | | | Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback ↵Jean-Baptiste Queru2012-08-082-2/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | function"
| | | * | | | avcenc: Initialize all memory allocated by the CBAVC_Malloc callback functionMartin Storsjo2012-07-122-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind reported use of uninitialized memory in AVCEncodeSlice, which this fixes. Change-Id: Ia09ad3e50d05b2b0487a4d588d9b00fc0828c816
* | | | | | | am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '68d44b061e92fb6832240457d4f683635bf5328f': avcenc: Remove useless casts