summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-271-1/+1
|\ \ \ \
| * | | | Use new surface flinger API.Jeff Brown2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I594c6e15db5f617d2feaac1a65b5316daa3812d0
* | | | | Merge "Fixed a potential/rare race condtion in ↵James Dong2012-08-271-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | MediaPlayerService::Client::notify() method" into jb-mr1-dev
| * | | | | Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() ↵James Dong2012-08-261-2/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method o The mClient could be disconnected before the notify message is sent out. Use a local reference could help resolve this issue. o related-to-bug: 6782035 Change-Id: Ia2047bd7f2666100fed83c6e5417a3bf2e20cd2c
* | | | | Merge "Fixed a native crash due to unexpected state at destroy time when ↵James Dong2012-08-271-6/+14
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | encoder component's source fails to start" into jb-mr1-dev
| * | | | Fixed a native crash due to unexpected state at destroy time when encoder ↵James Dong2012-08-241-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | component's source fails to start o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to bring the state of the encoder component back to the expected state. o related-to-bug: 7045494 Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
* | | | | Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-devJamie Gennis2012-08-261-16/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | SurfaceMediaSource: a few fixes / cleanupsJamie Gennis2012-08-261-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the setting of mStopped to true in onBuffersReleased - Cleaned up a few function call logs - Removed the 'reset' method. Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
* | | | | Merge "Fix deadlock" into jb-mr1-devMarco Nelissen2012-08-241-1/+17
|\ \ \ \ \
| * | | | | Fix deadlockMarco Nelissen2012-08-241-1/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted to save some space, and ended up with a deadlock. This change basically restores setDataSource(fd, offset, size) to the way it was before I added the new setDataSource(DataSource) method, instead of calling through to it. Change-Id: Iacf4627c8745369fa84b467530189a9f64f8726b
* | | | | Merge "Reduce THD when equalizer is ON." into jb-mr1-devEric Laurent2012-08-242-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reduce THD when equalizer is ON.Eric Laurent2012-08-242-3/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase headroom in LVM bundle to reduce THD when equalizer is ON with high band gains. Also add a workaround for a bug in headroom parameter control. Change-Id: I1d67c9ae475f6cf852c2e0e49bacfc82a5e484fd
* | | | Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-devMarco Nelissen2012-08-241-3/+13
|\ \ \ \
| * | | | Allow directly setting a DataSource for NuMediaExtractorMarco Nelissen2012-08-241-3/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source), which some new code under frameworks/av will use to let applications provide a custom data source for extractors. Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
* | | | Merge "Add a missing NULL check." into jb-mr1-devJohn Grossman2012-08-241-1/+2
|\ \ \ \
| * | | | Add a missing NULL check.John Grossman2012-08-231-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash if its time to start the next media player in a media player chain, but the current player's client has a NULL mAudioOutput, as is the case when the low level player implements MediaPlayerHWInterface. Change-Id: If555da3a46960cbee91ff26e5b1fd05e52c8ef28
* | | | am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a ↵Jean-Baptiste Queru2012-08-241-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | different type error" * commit '07315f8262f843f3624c70974642e4fb733a661c': Fixed redefinition of 'i' with a different type error
| * | | am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"Jean-Baptiste Queru2012-08-231-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '4b60ac04a878eaf8344b56189509ccd6925855c2': Fixed redefinition of 'i' with a different type error
| | * | Merge "Fixed redefinition of 'i' with a different type error"Jean-Baptiste Queru2012-08-231-2/+2
| | |\ \
| | | * | Fixed redefinition of 'i' with a different type errorTareq A. Siraj2012-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed the redefinition of 'i' to 'k'. Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4 Author: Tareq A. Siraj <tareq.a.siraj@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
* | | | | am 78015984: am 6e55a0f7: Merge "Fixed member access into incomplete type ↵Jean-Baptiste Queru2012-08-241-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | build error" * commit '780159840d754eae8e4e3f693ea10932634053f8': Fixed member access into incomplete type build error
| * | | | am 6e55a0f7: Merge "Fixed member access into incomplete type build error"Jean-Baptiste Queru2012-08-231-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '6e55a0f71eef07c6041077e6e9e7fad8c973a752': Fixed member access into incomplete type build error
| | * | | Fixed member access into incomplete type build errorTareq A. Siraj2012-08-221-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included the ARTPAssembler.h file to fix the 'member access into incomplete type "android::ARTPAssembler"' error reported by clang. Change-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d Author: Tareq A. Siraj <tareq.a.siraj@intel.com> Reviewed-by: Edwin Vane<edwin.vane@intel.com>
* | | | Send current bandwidth info event when buffering occursJeffrey Tinker2012-08-233-3/+21
| |_|/ |/| | | | | | | | | | | | | | | | | There is a dependent change in vendor/widevine repo. Change-Id: If063f4b1c8857e5bfc7be54ab0f97a4ed169b303 related-to-bug: 5883234
* | | am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline ↵Jean-Baptiste Queru2012-08-213-6/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | assembly" * commit '8d4d590dcbbd2b178976d0bd024625e9d6216365': avcenc: Update a comment about the inline assembly
| * | am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"Jean-Baptiste Queru2012-08-213-6/+3
| |\ \ | | |/ | | | | | | | | | * commit '1e75e9721254ae5df05c3d88b30ed7f778406261': avcenc: Update a comment about the inline assembly
| | * Merge "avcenc: Update a comment about the inline assembly"Jean-Baptiste Queru2012-08-213-6/+3
| | |\
| | | * avcenc: Update a comment about the inline assemblyMartin Storsjo2012-08-213-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the inline assembly was fixed in commit 3fdb405597f the comment was no longer accurate. Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
* | | | am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional"Jean-Baptiste Queru2012-08-211-8/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8a825ec079da6f2b89149c53568cb9721c10d923': h264 streaming: make profile-level-id optional
| * | | am aa411adf: Merge "h264 streaming: make profile-level-id optional"Jean-Baptiste Queru2012-08-211-8/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3': h264 streaming: make profile-level-id optional
| | * | Merge "h264 streaming: make profile-level-id optional"Jean-Baptiste Queru2012-08-211-8/+13
| | |\ \ | | | |/ | | |/|
| | | * h264 streaming: make profile-level-id optionalPatrik2 Carlsson2012-08-201-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profile-level-id is made optional according to rfc3984: "If no profile-level-id is present, the Baseline Profile without additional constraints at Level 1 MUST be implied." Change-Id: If868468a48917ceccb963b8ac15767583da29723
* | | | am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly ↵Jean-Baptiste Queru2012-08-213-17/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | constraints" * commit '41ee747fc019eb5856454c698adf23f55073c69e': avcenc: Fix the gcc inline assembly constraints
| * | | am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"Jean-Baptiste Queru2012-08-213-17/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5ebce52c46360b349daa8c944ca81e3c74accec0': avcenc: Fix the gcc inline assembly constraints
| | * | avcenc: Fix the gcc inline assembly constraintsMartin Storsjo2012-08-203-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use +r for registers whose value is used as input to the block. Also switch input registers to output registers with +r, for registers that are modified by the assembly block (SUB_SAD in sad_inline.h). Without this, the inline assembly fails on modern gcc versions (tested on gcc 4.6), where the intended input value never is loaded into the registers, causing segfaults at runtime. Currently this assembly isn't used, but this change makes it work properly if enabled. Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
* | | | am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '894a7e450704b0c7858a2187a5432b479ac69c1d': avcenc: Properly indent assembly blocks
| * | | am 9e13e927: Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9e13e927206b7c7c15359af2b0ccc8f525e78a7d': avcenc: Properly indent assembly blocks
| | * | avcenc: Properly indent assembly blocksMartin Storsjo2012-08-203-18/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also line break multiline assembly blocks - previously they were virtually unreadable. Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
* | | | Merge "Revert "Swap the order of creating IAudioTrack and thread"" into ↵Glenn Kasten2012-08-201-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | Revert "Swap the order of creating IAudioTrack and thread"Glenn Kasten2012-08-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d464eb0b8cffb994a754ff108795e858a882414. It caused the wrong thread ID -1 to be passed to IAudioFlinger::createTrack(). Change-Id: Ic221d2bb4af572d3d2d752af19238c52f6728e3a
* | | | | am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from ↵Nick Kralevich2012-08-208-54/+94
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | h264" * commit 'add7c4d329586119fb8b5501b049905004400233': hardening: eliminate text relocations from h264
| * | | | am 46b7eeb8: Merge "hardening: eliminate text relocations from h264"Nick Kralevich2012-08-208-54/+94
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '46b7eeb8be7449515082ecb1a61700affb44115f': hardening: eliminate text relocations from h264
| | * | | Merge "hardening: eliminate text relocations from h264"Nick Kralevich2012-08-208-54/+94
| | |\ \ \
| | | * | | hardening: eliminate text relocations from h264Ard Biesheuvel2012-08-138-54/+94
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
* | | | | | am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the ↵Jean-Baptiste Queru2012-08-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition for padding" * commit 'af5f9f05937521acb4855848d77bed1d4ed7db0a': MPEG2TSWriter: Fix an off-by-one in the condition for padding
| * | | | | am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for ↵Jean-Baptiste Queru2012-08-201-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | padding" * commit 'cd622346235829f60246a061560adf5921ba129c': MPEG2TSWriter: Fix an off-by-one in the condition for padding
| | * | | | Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"Jean-Baptiste Queru2012-08-201-1/+1
| | |\ \ \ \
| | | * | | | MPEG2TSWriter: Fix an off-by-one in the condition for paddingMartin Storsjo2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a remuxed file play without any decoding warnings, while there still were some occasional warnings with the previous version. Change-Id: I31d73446ded1eeb3da10783c5ef841270563ca12
* | | | | | | am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a': avcenc: Remove a leftover define
| * | | | | | am 02a4ec21: Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '02a4ec216cf5ca903e1765ca3e7ff2985436b236': avcenc: Remove a leftover define
generated by cgit v1.1 at 2024-06-10 14:14:01 +0000