summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
| | | | | | | o add a log message in AwesomePlayer::reset before acquiring the lock Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb related-to-bug: 4409547
* Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| | | | | | For bug 4392094. Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
* Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-184-29/+155
|\ | | | | | | into honeycomb-mr2
| * Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
* | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into ↵Gloria Wang2011-05-182-8/+4
|\ \ | | | | | | | | | honeycomb-mr2
| * | DO NOT MERGEGloria Wang2011-05-132-8/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
* | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-171-1/+7
|\ \ | | | | | | | | | sizeof(codec-specific-data) != 2" into honeycomb-mr2
| * | DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-041-1/+7
| |/ | | | | | | | | | | | | sizeof(codec-specific-data) != 2 Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1 related-to-bug: 4381047
* | MTP: Have GetStorageInfo command return correct storage type for removable ↵Mike Lockwood2011-05-162-4/+8
|/ | | | | | | storage Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | | | | | | | | | Don't let the "no media" status of one directory leak to the remaining files and directories in the same parent. Bug: 4364077 Change-Id: Ie756ccd06b1962b06143fc02a1a3927c3aba143a Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-035-1/+34
| | | | | | | | | This allows the PC to access thumbnails in JPEG files over MTP/PTP Bug: 3219495 Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | | | | Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| | | | | | | | | | | | | | | | | | | | | | MTP does not support partial writes of files (the entire file must be transferred at once). This makes it impossible to implement a FUSE file system for MTP with acceptable performance. To fix this problem, this change adds extended MTP operations to allow partial writes to files: SendPartialObject - allows writing a subset of a file, or appending to the end of a file TruncateObject - allows changing the size of a file BeginEditObject - must be called before using SendPartialObject and TruncateObject EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject We also add GetPartialObject64, which is the same as GetPartialObject but has a 64 bit offset rather than 32. Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding ↵Mike Lockwood2011-05-031-13/+11
| | | | | | | | | | | | | | | | files from the media provider Previously we ignored any files and directories that had name started with '.' and ignored any directories that contained a ".nomedia" file. Now to support transferring any file via MTP, we now add these previously ignored files to the media database, but will not mark them as audio, video, image or playlist files. That way they will be included in the files table but will be hidden from the audio, video, images and playlist views that are used by apps like Music and Gallery. Bug: 3405327 Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-034-8/+9
| | | | | | | | | | | | | | - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
| | | | | | | | | This patch is meant for testing only. We will remove this patch once we tracked down all those spinning issues. related-to-bug: 4339075 Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
* Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | | | Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
* Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
| | | | Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
* Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
| | | | | | | | | | | This change adds a check to verify that the ANativeWindow to which decoded video buffers are queued sends those buffers to SurfaceFlinger. The check is done when the buffer content is flagged as protected. This change also adds an error in the case where protected buffers are needed, but an ANativeWindow is not being used as the video destination. Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b Bug: 4269240
* Bug 4167061Glenn Kasten2011-03-301-1/+1
| | | | Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
* Merge "When http streaming and Content-Length is unknown, make sure to ↵Andreas Huber2011-03-301-1/+8
|\ | | | | | | return all" into honeycomb-mr1
| * When http streaming and Content-Length is unknown, make sure to return allAndreas Huber2011-03-301-1/+8
| | | | | | | | | | | | | | data that we successfully received before signalling the error. Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce related-to-bug: 4190765
* | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
|/ | | | | Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e related-to-bug: 4147205
* Merge "After a seek there's a brief period where audio time isn't ↵Andreas Huber2011-03-281-0/+5
|\ | | | | | | reestablished." into honeycomb-mr1
| * After a seek there's a brief period where audio time isn't reestablished.Andreas Huber2011-03-251-0/+5
| | | | | | | | | | | | | | | | Don't use audio time to trigger a "we're very late, skipping ahead" action until it's reestablished. Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1 related-to-bug: 4173683
* | Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
|/ | | | | Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba related-to-bug: 3316960
* Switch to use SF cached sourceJames Dong2011-03-251-6/+1
| | | | | | bug - 3500025 Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
* Bug 4159373 Use HDCP debug settingsGlenn Kasten2011-03-231-0/+37
| | | | Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
* DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
| | | | | Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4 related-to-bug: 4148291
* If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
| | | | | | | This avoids a potential out-of-bounds problem in the code below. Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c related-to-bug: 4139974
* Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-176-0/+95
| | | | | | bug - 4119349 Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
* Add the default camera id to mCameraIds for emulator and those devices ↵James Dong2011-03-161-0/+5
| | | | | | | | without media_profiles.xml configuration file. bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
* DO NOT MERGE: Fix a race condition when playing an audio-only stream and ↵Andreas Huber2011-03-161-12/+5
| | | | | | | seeking before starting. Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7 related-to-bug: 4039068
* MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
| | | | | | | Bug: 3509060 Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
| | | | | | | | | Fixes problem reading large thumbnails via PTP Bug: 4065217 Change-Id: I643672512829c93ab0827091f39103dbb1918071 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Bug 3012968 DRM output controlGlenn Kasten2011-03-102-0/+24
| | | | | | | Modifies Stagefright to verify that there is a hardware-protected path to video sink for DRM content. Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
* Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-082-80/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the stability problems experienced when using a bluetooth headset supporting both A2DP and SCO. Problems occur when starting the video chat at which time the A2DP output is being stopped to start SCO. At that time, active AudioTracks are invalidated by AudioFlinger so that a new AudioTrack binder interface can be recreated by the client process on the new mixer thread with correct parameters. The problem was that the process to restore the binder interface was not protected against concurrent requests which caused 2 binder interfaces to be created sometimes. This could lead to permanent client deadlock if one of the client threads was waiting for a condition of the first created binder interface while the second one was created (as the AudioFlinger would only signal conditions on the last one created). This concurrent request situation is more likely to happen when a client uses the JAVA AudioTrack as the JNI implementation uses simultaneously the native AudioTrack callback and write push mechanisms. By doing so, the code that checks if the binder interface should be restored (in obtainBuffer()) is much more likely to be called concurrently from two different threads. The fix consists in protecting the critical binder interface restore phase with a flag in the AudioTrack control block. The first thread acting upon the binder interface restore request will raise the flag and the second thread will just wait for a condition to be signaled when the restore process is complete. Also protected all accesses to the AudioTrack control block by a mutex to prevent access while the track is being destroyed and restored. If a mutex cannot be held (e.g because we call a callback function), acquire a strong reference on the IAudioTrack to prevent its destruction while the cblk is being accessed. Modified AudioTrack JNI to use GetByteArrayElements() instead of GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem callback being called during the critical section when media server process restarts. Anyway with current JNI implementation, either versions do not copy data most of the times and the criticial version does not guaranty no data copy. The same modifications have been made to AudioRecord. Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
* Add missing copyright headers to a couple of filesJames Dong2011-03-072-0/+32
| | | | | | bug - 4025673 Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
* Fix a leak from AACEncoder.cppJames Dong2011-03-041-0/+3
| | | | | | bug - 3470617 Change-Id: I328e92bc1b2aca72e5856703dae00f957f40bc27
* Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file ↵James Dong2011-03-041-2/+2
| | | | | | | | | | | must have the same mode For some mp3 files, the mode can be changed from one audio frame to another. Without the capability to switch modes, the decoded audio may have lots of artifacts. bug - 3253310 Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
* Merge "- To track the usage of all audio output devices - To track the ↵Gloria Wang2011-03-022-2/+129
|\ | | | | | | currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
| * - To track the usage of all audio output devicesGloria Wang2011-03-022-2/+129
| | | | | | | | | | | | | | | | - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData() Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
* | Merge "Stagefright: Use the ANW min undequeued bufs query."Jamie Gennis2011-03-022-28/+53
|\ \
| * | Stagefright: Use the ANW min undequeued bufs query.Jamie Gennis2011-02-282-29/+53
| | | | | | | | | | | | | | | | | | | | | | | | This change modifies Stagefright's ANativeWindow initialization to use the new MIN_UNDEQUEUED_BUFFERS query on the ANativeWindow. Change-Id: I62565945e90ac40de326de77adcfa5577ed89975 Related-Bug: 3356050
* | | Merge "Resize internal PES buffers dynamically instead of relying on a fixed ↵Andreas Huber2011-03-021-1/+12
|\ \ \ | | | | | | | | | | | | maximum size."
| * | | Resize internal PES buffers dynamically instead of relying on a fixed ↵Andreas Huber2011-03-021-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | maximum size. Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
* | | | Merge "Allow optional specification of a PTS timestamp when signalling a ↵Andreas Huber2011-03-0211-22/+120
|\ \ \ \ | |/ / / | | | | | | | | discontinuity."
| * | | Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-0211-22/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If present, rendering will be suppressed until reaching the timestamp. Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19 related-to-bug: 3489454
* | | | Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes ↵James Dong2011-03-021-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | as in unit of bits"
| * | | PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in ↵James Dong2011-03-021-2/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | unit of bits bug - 3464899 Change-Id: Idef81a1bd3846d60fc5e4a40c11ce1ba78ebaa23
generated by cgit v1.1 at 2024-08-21 13:46:00 +0000