summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8f8bffd6: am faa88edb: Merge "Fix static sample table processing, add ↵Andreas Huber2012-08-094-56/+53
|\ | | | | | | | | | | | | support for h.263 video." into jb-mr1-dev * commit '8f8bffd61352915af9d7af6d0279ada039a58d7e': Fix static sample table processing, add support for h.263 video.
| * am faa88edb: Merge "Fix static sample table processing, add support for ↵Andreas Huber2012-08-094-56/+53
| |\ | | | | | | | | | | | | | | | | | | h.263 video." into jb-mr1-dev * commit 'faa88edb9df91b0e7725b0ee4c4fb5e92262b3d5': Fix static sample table processing, add support for h.263 video.
| | * 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
* | | | am 744100a9: am 9352d116: Remove some unused forward lock codeJames Dong2012-08-092-61/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '744100a9bc552975ef55da220910c8a05aa17bdc': Remove some unused forward lock code
| * | | am 9352d116: Remove some unused forward lock codeJames Dong2012-08-092-61/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9352d1168c09903d4ea27b695ef683316c544ae5': Remove some unused forward lock code
| | * | Remove some unused forward lock codeJames Dong2012-08-082-61/+0
| | |/ | | | | | | | | | Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
* | | am 638f936d: am 0d27c65d: Tune the overrun correctionGlenn Kasten2012-08-081-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '638f936d4dd0d4afdc952988ac6b6a9dcbb577e7': Tune the overrun correction
| * | am 0d27c65d: Tune the overrun correctionGlenn Kasten2012-08-081-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '0d27c65ddb5c968baa6db0c26e80f5c451bc52bc': Tune the overrun correction
| | * 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 fc9d21b0: am e983aa4f: am 51af4af2: am e28df5b9: Merge "Store correct ↵Jean-Baptiste Queru2012-08-082-6/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | time stamps in recorded mp4 files" * commit 'fc9d21b02aa5d0da6954084c16a9928b50b92426': Store correct time stamps in recorded mp4 files
| * | am e983aa4f: am 51af4af2: am e28df5b9: Merge "Store correct time stamps in ↵Jean-Baptiste Queru2012-08-082-6/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | recorded mp4 files" * commit 'e983aa4ff4d80af7702888e230b9aaa93a7b7e57': Store correct time stamps in recorded mp4 files
| | * 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
* | | | | | am acc5c275: am f6a35760: Merge "AudioFlinger: fix timed audio" into jb-mr1-devJohn Grossman2012-08-0813-24/+261
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'acc5c275f6affe789184436b7d40fb1656a4596f': AudioFlinger: fix timed audio
| * | | | | am f6a35760: Merge "AudioFlinger: fix timed audio" into jb-mr1-devJohn Grossman2012-08-0813-24/+261
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24': AudioFlinger: fix timed audio
| | * | | | 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>
* | | | | | | am e5262c7f: am 6febe17c: Merge "AudioFlinger: Better handling for master ↵John Grossman2012-08-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volume/mute" into jb-mr1-dev * commit 'e5262c7f7ccd75c3e857081b947d62788d979e0c': AudioFlinger: Better handling for master volume/mute
| * | | | | | am 6febe17c: Merge "AudioFlinger: Better handling for master volume/mute" ↵John Grossman2012-08-082-244/+178
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '6febe17ce31636d07ef6305cf1045a0b942b4f11': AudioFlinger: Better handling for master volume/mute
| | * | | | | 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>
* | | | | | | am 952f6bf8: (-s ours) am 3f0b1eaa: Merge "Change audio flinger to user HAL ↵John Grossman2012-08-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master mute if available" into jb-mr1-dev * commit '952f6bf80858c1ef3543d9b93fa04a5a175f2026': Change audio flinger to user HAL master mute if available
| * | | | | | am 3f0b1eaa: Merge "Change audio flinger to user HAL master mute if ↵John Grossman2012-08-082-10/+115
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available" into jb-mr1-dev * commit '3f0b1eaa411c15f05cc591e9de617bd41c9daad1': Change audio flinger to user HAL master mute if available
| | * | | | | 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 eb8cffd9: am 1e357f46: am ef620093: am efee0095: Merge "Correct ↵Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ID3::StringSize calculation for UCS-2 data." * commit 'eb8cffd91add5dafd12d58611b494172aad9b07e': Correct ID3::StringSize calculation for UCS-2 data.
| * | | | | | am 1e357f46: am ef620093: am efee0095: Merge "Correct ID3::StringSize ↵Jean-Baptiste Queru2012-08-081-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calculation for UCS-2 data." * commit '1e357f4610e788c3e5dea5dd2f01b26bb75c5e36': Correct ID3::StringSize calculation for UCS-2 data.
| | * | | | | 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 88ed043d: am 4bb0e2aa: am 662b15c3: am a858aa96: Merge "avcenc: Remove ↵Jean-Baptiste Queru2012-08-082-10/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redundant zero-initialization of allocated memory" * commit '88ed043d320a8771b102f984e57a88e372b4b934': avcenc: Remove redundant zero-initialization of allocated memory
| * | | | | | am 4bb0e2aa: am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant ↵Jean-Baptiste Queru2012-08-082-10/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zero-initialization of allocated memory" * commit '4bb0e2aa1410191a8cff1f921d1b246232ed42e9': avcenc: Remove redundant zero-initialization of allocated memory
| | * | | | | 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 dadf3690: am 49e74946: am 44237a8d: am b71298ee: Merge "avcenc: ↵Jean-Baptiste Queru2012-08-082-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize all memory allocated by the CBAVC_Malloc callback function" * commit 'dadf369042250e6e96a745526e8f27db3d3ce71c': avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
| * | | | | | | am 49e74946: am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory ↵Jean-Baptiste Queru2012-08-082-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocated by the CBAVC_Malloc callback function" * commit '49e74946370e7af2378e28733ba6d8df8951b068': avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
| | * | | | | | 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 1a562740: am f5a66877: am 68d44b06: am 0ab18f85: Merge "avcenc: Remove ↵Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | useless casts" * commit '1a562740beb85b1a90fc7f44a7b86cd7f0862810': avcenc: Remove useless casts
| * | | | | | | am f5a66877: am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5a66877655695af619909db6c831f78373d733e': avcenc: Remove useless casts
| | * | | | | | am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '68d44b061e92fb6832240457d4f683635bf5328f': avcenc: Remove useless casts
| | | * | | | | am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ab18f853571149de700930fbb783ecd6b2c5582': avcenc: Remove useless casts
generated by cgit v1.1 at 2025-11-26 18:47:51 +0000