summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* MtpDatabase: Fix typo affecting parent and format queriesMike Lockwood2012-09-111-2/+2
| | | | | | | Bug: 7114350 Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1 Signed-off-by: Mike Lockwood <lockwood@google.com>
* Merge "Add support for Wifi display." into jb-mr1-devJeff Brown2012-09-071-0/+153
|\
| * Add support for Wifi display.Jeff Brown2012-09-071-0/+153
| | | | | | | | Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
* | AudioSystem: new audio device enumsEric Laurent2012-09-071-11/+44
|/ | | | | | | Update audio device enums to match new definitions in native framework. Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
* Merge "Add context support to backdropper filter." into jb-mr1-devMike Dodd2012-09-071-0/+3
|\
| * Add context support to backdropper filter.Mike Dodd2012-09-061-0/+3
| | | | | | | | | | | | Part of b/7028438 Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7
* | Audio Effects test appMarco Nelissen2012-09-0623-0/+4593
|/ | | | Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f
* am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can ↵Jean-Baptiste Queru2012-09-061-1/+2
|\ | | | | | | | | | | | | not display DRM files of internal storage." * commit '657dba9e66ff02785c2bf034ebecc3c357cbc333': Musicplayer application can not display DRM files of internal storage.
| * am bb60bc26: Merge "Musicplayer application can not display DRM files of ↵Jean-Baptiste Queru2012-09-061-1/+2
| |\ | | | | | | | | | | | | | | | | | | internal storage." * commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c': Musicplayer application can not display DRM files of internal storage.
| | * Musicplayer application can not display DRM files of internal storage.Jan Bjernler2012-08-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make DRM-protected files transferred over MTP be detected. Previously it was inserted into the database as MEDIA_TYPE_NONE, the result of this was that the file was not detected properly. With this fix the file is scanned from the beginning. Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
* | | Merge "Improve multi-user broadcasts." into jb-mr1-devDianne Hackborn2012-08-301-18/+49
|\ \ \
| * | | Improve multi-user broadcasts.Dianne Hackborn2012-08-301-18/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now use ALL and CURRENT when sending broadcasts, to specify where the broadcast goes. Sticky broadcasts are now correctly separated per user, and registered receivers are filtered based on the requested target user. New Context APIs for more kinds of sending broadcasts as users. Updating a bunch of system code that sends broadcasts to explicitly specify which user the broadcast goes to. Made a single version of the code for interpreting the requested target user ID that all entries to activity manager (start activity, send broadcast, start service) use. Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
* | | | Merge "Fix a typo in the sample code" into jb-mr1-devTeng-Hui Zhu2012-08-301-1/+1
|\ \ \ \
| * | | | Fix a typo in the sample codeTeng-Hui Zhu2012-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
* | | | | AudioService: pause music when undockedEric Laurent2012-08-301-1/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send becomming noisy event also when disconnecting a dock (analog, digital or USB) or HDMI. Bug 6760590. Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
* | | | Merge "Add plumbing for new surface flinger display API." into jb-mr1-devJeff Brown2012-08-272-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add plumbing for new surface flinger display API.Jeff Brown2012-08-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up the implementation of Surface and SurfaceSession to use more consistent naming and structure. Added JNI for all of the new surface flinger display API calls. Enforced the requirement that all Surfaces created by the window manager be named. Updated the display manager service to use the new methods. Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
* | | | am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a': Make setCaptureRate locale safe
| * | | am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"Jean-Baptiste Queru2012-08-271-3/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a': Make setCaptureRate locale safe
| | * | Make setCaptureRate locale safeJohan Redestig2012-08-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont use the default String.format in setCaptureRate as it is both locale unsafe and less efficient than regular string concatenation in this case. Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
* | | | Added some common error codes in MediaPlayer.javaJames Dong2012-08-261-0/+16
| |_|/ |/| | | | | | | | | | | | | | o related-to-bug: 6770717 Change-Id: Iea8ba6943755a9af8df5b6e91284c7c1b32c3c6c
* | | Let apps provide a custom data source for extractorsMarco Nelissen2012-08-244-0/+152
| | | | | | | | | | | | | | | | | | | | | | | | Adds android.media.DataSource, which is modeled after its native namesake, and a new method on MediaExtractor that lets apps specify their implementation of a DataSource as the source of data for the extractor. Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
* | | Add context support into the filter framework.Teng-Hui Zhu2012-08-211-1/+12
| | | | | | | | | | | | | | | | | | | | | Basically we need the context to pass the content URI into MediaPlayer. bug:6837809 Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
* | | am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video ↵Jean-Baptiste Queru2012-08-203-0/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | editor codes" * commit 'f96fcd5095e751fc9402d8bbecdf59f53e00d854': To avoid the JNI memory leaks in video editor codes
| * | am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
| |\ \ | | |/ | | | | | | | | | * commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450': To avoid the JNI memory leaks in video editor codes
| | * To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a protential memory leak in video editor JNI codes. When importing so many video clips, the number of local reference will exceed 512, which will cause the Dalvik virtual machine crash. The patch will free each local reference when it's no longer used to avoid memory leaks. Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40 Author: Wei Feng <wei.feng@intel.com> Signed-off-by: Wei Feng <wei.feng@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 40786
* | | am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"Jean-Baptiste Queru2012-08-161-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'b18bcf13fd47102a2527e599cde0b1d59ab7c51e': Fix Issue #35489: drm content corruption on GB
| * | am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"Jean-Baptiste Queru2012-08-161-2/+2
| |\ \ | | |/ | | | | | | | | | * commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8': Fix Issue #35489: drm content corruption on GB
| | * Fix Issue #35489: drm content corruption on GBgit-you.kim72.gmail.com2012-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If rawContent is copied into mediaBuf, readBuf is copied to wrong address. mediaBuf should be forwarded by readBytes. Change-Id: I4fc9c1f7f4e3d5dfe3c7e5cd92261608f6b3e248 Signed-off-by: git-you.kim72.gmail.com <you.kim72@gmail.com>
| * | am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that ↵Jean-Baptiste Queru2012-08-131-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | does not exist" * commit '4da3769d30851f0b517a688a5c835715d7d0b0bf': mediacodec: Don't crash if trying to open a codec that does not exist
| | * mediacodec: Don't crash if trying to open a codec that does not existMartin Storsjo2012-08-131-1/+4
| | | | | | | | | | | | Change-Id: If75e3156517993629f50622a84a9ac573fced815
* | | am d2388b50: am 53ad027c: Merge "MtpStorage: correct the size of reserve ↵Jean-Baptiste Queru2012-08-101-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | space for MTP" * commit 'd2388b50a5c16b920bdd656448107a21e49d753b': MtpStorage: correct the size of reserve space for MTP
| * | am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"Jean-Baptiste Queru2012-08-101-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '53ad027c46bf578e26e5db70319b17a671ce8a36': MtpStorage: correct the size of reserve space for MTP
| | * Merge "MtpStorage: correct the size of reserve space for MTP"Jean-Baptiste Queru2012-08-101-2/+2
| | |\
| | | * MtpStorage: correct the size of reserve space for MTPbo huang2012-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to description in frameworks/base/core/res/res/xml/storage_list.xml, "mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage". Mtpstorage class use it directly and doesn't change it to correct size in megabyes. Mtp initor can not get correct storage information from android. Change-Id: Icf59eb1eb478e67ea5990be96a9decb41aa55504 Signed-off-by: Bo Huang <bo.b.huang@intel.com> Signed-off-by: Jack Ren<jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| * | | am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() ↵Jean-Baptiste Queru2012-08-081-2/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | immediately" * commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3': mediacodec: Don't suggest calling getOutputFormat() immediately
| | * | mediacodec: Don't suggest calling getOutputFormat() immediatelyMartin Storsjo2012-07-131-2/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Calling getOutputFormat() at this point currently crashes in native code. (After a fix to the native code, this gives an IllegalStateException instead.) Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
* | | Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java ↵James Dong2012-08-081-1/+7
|\ \ \ | | | | | | | | | | | | class" into jb-mr1-dev
| * | | Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java classJames Dong2012-08-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | o As a result, applications can listen for death notification from MediaRecorder onError callbacks Change-Id: I49896c4ae8130bd67b52deff6eb97a22b43d3f32
* | | | MediaFile: Fix case sensitive file extension matching for computing MTP ↵Mike Lockwood2012-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format code Bug: 6939136 Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | mediacodec: Don't crash if trying to open a codec that does not existMartin Storsjo2012-08-071-1/+4
| | | | | | | | | | | | | | | | Change-Id: If75e3156517993629f50622a84a9ac573fced815
* | | | mediacodec: Don't suggest calling getOutputFormat() immediatelyMartin Storsjo2012-08-071-2/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Calling getOutputFormat() at this point currently crashes in native code. (After a fix to the native code, this gives an IllegalStateException instead.) Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
* | | Improve scan time for some casesMarco Nelissen2012-08-021-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path being matched has a sqlite wildcard character in it, a "like" match will be quite slow. Unfortunately this is fairly common, since "_" is a wildcard character. However, because in most cases the case of the path in the database will match the case on disk, an "=" match will work, so it is worthwhile to try an "=" match first, before trying a "like". If there are no wildcard characters, the "like" will be as fast as the "=", because of the case-insensitive index on the _data column, so there is no need to try "=" first in that case. b/6751354 Change-Id: I1cd4efbd56a37886cb44a86acb73eb9a3c9f303d
* | | Added a key to retrieve the rotation angle in MediaMetadataRetriever.java classJames Dong2012-07-311-0/+5
| | | | | | | | | | | | | | | | | | o related-to-bug: 6872687 Change-Id: I94569bb8357c39e8309974ede8284b33a996866c
* | | Fix a typo (dependant => dependent)James Dong2012-07-301-2/+2
| | | | | | | | | | | | Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
* | | Relax rules for media apps to stay on RemoteControlDisplayJean-Michel Trivi2012-07-271-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The playback of notification would make the display of the RemoteControlClient disappear from the lockscreen. Fixed by modifying which AudioFocus owner to consider when reevaluating how the RemoteControlDisplay needs to be updated: use the first (starting from the top of the AudioFocus stack) that uses STREAM_MUSIC, or that uses any other stream type for a short period. Change-Id: Id7cef00c5eed1f6ebfa59634eea8e2c9b2f3f5eb
* | | Remove unnecessary stagefright noticesJean-Baptiste Queru2012-07-2648-4848/+0
| | | | | | | | | | | | | | | | | | They now live in frameworks/media Change-Id: Ic8b457c422359f260d6a1fed8c499b74aa9c6491
* | | am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax ↵Jeff Smith2012-07-252-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | external issue 35214 * commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c': Fix several cases of broken droiddoc syntax external issue 35214
| * | am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214Jeff Smith2012-07-252-2/+2
| |\ \ | | | | | | | | | | | | | | | | * commit 'a45746efadd11bb7dfab026fb3c81a25fae74ca4': Fix several cases of broken droiddoc syntax external issue 35214
| | * | Fix several cases of broken droiddoc syntaxJeff Smith2012-07-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external issue 35214 patch contributed by Jeff Smith <whydoubt@yahoo.com> Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
generated by cgit v1.1 at 2025-01-26 14:00:06 +0000