summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-034-69/+165
|\ | | | | | | | | * commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836': Fix issue 3371080
| * am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-034-69/+165
| |\ | | | | | | | | | | | | * commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5': Fix issue 3371080
| | * Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-034-69/+165
| | |\
| | | * Fix issue 3371080Eric Laurent2011-02-034-69/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified default volume control logic in AudioService: 1 IN_CALL volume if in video/audio chat 2 NOTIFICATION if notification is playing or was playing less than 5s ago. 3 MUSIC Modified silent mode: - now also affect MUSIC stream type - entering silent mode when VOL- hard key is pressed once while selected stream volume is already at 0 (except for VOICE_CALL stream). - exiting silent mode when pressing VOL+ hard key while in silent mode Play sound FX (audible selections, keyboard clicks) at a fixed volume. Modified audio framework: - isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger) - iStreamActive() now specifies a time window during which the stream is considered active after it actually stopped. Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
* | | | am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during ↵Dheeraj Sharma2011-02-031-28/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | transition generation" into honeycomb * commit 'd13f987f73df03b06c70c631452f6cafbdc254e1': Fix for issue : 3419353 Crash during transition generation
| * | | am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition ↵Dheeraj Sharma2011-02-031-28/+33
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | generation" into honeycomb * commit '36b685ffb0e3c1848bc8085757da3e673d19028a': Fix for issue : 3419353 Crash during transition generation
| | * | Fix for issue : 3419353 Crash during transition generationDheeraj Sharma2011-02-021-28/+33
| | | | | | | | | | | | | | | | Change-Id: I1f15f05c87bdc1ad8acdb6fc5db3c350e5b28947
* | | | am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video ↵Gil Dobjanschi2011-02-031-207/+188
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | clips invalidate the entire project" into honeycomb * commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e': Bug fix: 3419287 Deleted images and video clips invalidate the entire project
| * | | am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips ↵Gil Dobjanschi2011-02-021-207/+188
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | invalidate the entire project" into honeycomb * commit 'ed2c513337ae7581ef73b88424da91ef2d862a78': Bug fix: 3419287 Deleted images and video clips invalidate the entire project
| | * | Bug fix: 3419287 Deleted images and video clips invalidate the entire projectGil Dobjanschi2011-02-021-207/+188
| | |/ | | | | | | | | | Change-Id: I9dcc3b9fa0574fefe688c1616e69ba37811bde51
* | | Bug 1804058 FLAC extractorGlenn Kasten2011-02-032-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: dependent on external/flac for libFLAC Implemented and tested: * FLAC container * mono and stereo * standard sample rates * standard bit depths * sniffer * media scanner * Vorbis comment metadata including album art * random access seeking with "torture test" * web browser integration for audio/flac (not audio/x-flac), but note that most web servers don't correctly report the MIME type Not implemented: * 24-bit to 16-bit dither or noise shaping in AudioFlinger * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger * replay gain is better done in AudioFlinger * multi-channel, would need AudioFlinger support * Ogg container, does not seem to be very popular yet Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
* | | am 3d3621f0: am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." ↵Dharmaray Kundargi2011-02-022-18/+43
|\ \ \ | |/ / | | | | | | | | | | | | | | | into honeycomb * commit '3d3621f08b02ae559036c7d085c02276ae0a24d9': Fix issue 3412777 ANR on adding effects.
| * | am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycombDharmaray Kundargi2011-02-022-18/+43
| |\ \ | | |/ | | | | | | | | | * commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5': Fix issue 3412777 ANR on adding effects.
| | * Fix issue 3412777 ANR on adding effects.Dharmaray Kundargi2011-02-022-18/+43
| | | | | | | | | | | | Change-Id: Id3c480a8261423412a99375f71cf6ee585b6c22b
* | | am e00d44ce: am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio ↵Nemmara Venkateswaran2011-02-024-28/+281
|\ \ \ | |/ / | | | | | | | | | | | | | | | in overlay" into honeycomb * commit 'e00d44ced228dc523f4492edd66d4eeb5dabd305': Fix for issue 3370023 : Wrong aspect ratio in overlay
| * | am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" ↵Nemmara Venkateswaran2011-02-024-28/+281
| |\ \ | | |/ | | | | | | | | | | | | | | | into honeycomb * commit '47b8c96b253ab24d0df089c87ce0798d4981400a': Fix for issue 3370023 : Wrong aspect ratio in overlay
| | * Fix for issue 3370023 : Wrong aspect ratio in overlaySantosh Madhava2011-02-024-28/+281
| | | | | | | | | | | | Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
* | | am dacacb50: am 22ad6243: Merge "Fix for issue 3410895 Transition ↵Dheeraj Sharma2011-02-011-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | regeneration not happening after changing aspect ratio of project" into honeycomb * commit 'dacacb50ed616bc52c092d9716252ec49a94457d': Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
| * | am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not ↵Dheeraj Sharma2011-02-011-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | happening after changing aspect ratio of project" into honeycomb * commit '22ad6243d7c9081e4f1a13097cfa4638cf42c3fe': Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
| | * Fix for issue 3410895 Transition regeneration not happening after changing ↵Dheeraj Sharma2011-02-011-0/+2
| | | | | | | | | | | | | | | | | | aspect ratio of project Change-Id: Ice53fb284e029b1d22093048e8343f9ce8d853dd
* | | am 537cc3b1: am ba2ee617: Merge "Fix for issue 3409874:Crash during addition ↵Dheeraj Sharma2011-02-012-27/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | of pan and zoom effect if start and end rect are unchanged" into honeycomb * commit '537cc3b19d84e5b0c8d3631c051bb36a4c8cf784': Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
| * | am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and ↵Dheeraj Sharma2011-01-312-27/+63
| |\ \ | | |/ | | | | | | | | | | | | | | | zoom effect if start and end rect are unchanged" into honeycomb * commit 'ba2ee6178ec386e838434cef902fb7de34ec6585': Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
| | * Fix for issue 3409874:Crash during addition of pan and zoom effect if start ↵Dheeraj Sharma2011-01-312-27/+63
| | | | | | | | | | | | | | | | | | and end rect are unchanged Change-Id: Iddd1b9b2c430439c4bef4f1cf20fb166ac572d60
* | | am 8ceccbed: am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe ↵Dharmaray Kundargi2011-02-016-54/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | in Java." into honeycomb * commit '8ceccbed7177234f219f2aa39f71554f9141d084': Fix issue 3408285. Fix issue in Thread safe in Java.
| * | am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." ↵Dharmaray Kundargi2011-01-316-54/+35
| |\ \ | | |/ | | | | | | | | | | | | | | | into honeycomb * commit '327549f9961b8cd562d1a92c1455005672aa2b95': Fix issue 3408285. Fix issue in Thread safe in Java.
| | * Fix issue 3408285. Fix issue in Thread safe in Java.Dharmaray Kundargi2011-01-316-54/+35
| | | | | | | | | | | | Change-Id: Ifddcecfc2d7b1bd3e8a91c4850c169e1fb7c65ae
* | | am 1aa865aa: am 2bb13573: Bug fix: 3405930 Crash editing overlay textGil Dobjanschi2011-01-319-655/+454
|\ \ \ | |/ / | | | | | | | | | * commit '1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673': Bug fix: 3405930 Crash editing overlay text
| * | am 2bb13573: Bug fix: 3405930 Crash editing overlay textGil Dobjanschi2011-01-319-655/+454
| |\ \ | | |/ | | | | | | | | | * commit '2bb13573d619e3371d06847d36db78a20b17dfab': Bug fix: 3405930 Crash editing overlay text
| | * Bug fix: 3405930 Crash editing overlay textGil Dobjanschi2011-01-319-655/+454
| | | | | | | | | | | | Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
* | | am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." ↵Dharmaray Kundargi2011-01-303-9/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | into honeycomb * commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579': Merging the same files on top of tree.
| * | am ff843254: Merge "Merging the same files on top of tree." into honeycombDharmaray Kundargi2011-01-303-9/+20
| |\ \ | | |/ | | | | | | | | | * commit 'ff8432548eb96655190486ee0f0fa08de5451e66': Merging the same files on top of tree.
| | * Merging the same files on top of tree.Dharmaray Kundargi2011-01-303-9/+20
| | | | | | | | | | | | | | | | | | Add support for .m4v Issue 3395600 Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
* | | am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect ↵Dheeraj Sharma2011-01-301-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | is not accurate in JAVA and JNI" into honeycomb * commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d': Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
| * | am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not ↵Dheeraj Sharma2011-01-301-6/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | accurate in JAVA and JNI" into honeycomb * commit '45911e1969fd1843bac5806e06f351123b67f596': Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
| | * Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and ↵Dheeraj Sharma2011-01-301-6/+6
| | |\ | | | | | | | | | | | | JNI" into honeycomb
| | | * Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNIDheeraj Sharma2011-01-301-6/+6
| | | | | | | | | | | | | | | | Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
* | | | am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after ↵Dheeraj Sharma2011-01-301-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | returning from playing exported movie" into honeycomb * commit 'bd633b7297c60771223f0e8799c418cdbce3017c': 3404665 Preview window is blank after returning from playing exported movie
| * | | am 167e7488: Merge "3404665 Preview window is blank after returning from ↵Dheeraj Sharma2011-01-301-2/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | playing exported movie" into honeycomb * commit '167e7488af4d53673ff2fcc0723ae2a1584f5194': 3404665 Preview window is blank after returning from playing exported movie
| | * | 3404665 Preview window is blank after returning from playing exported movieDheeraj Sharma2011-01-301-2/+0
| | |/ | | | | | | | | | Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
* | | am 965f22ba: am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION ↵Jean-Michel Trivi2011-01-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | to evaluate stream vol changes" into honeycomb * commit '965f22ba325ea488034174bf76194470a6f0ee52': Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
| * | am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate ↵Jean-Michel Trivi2011-01-271-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | stream vol changes" into honeycomb * commit '3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a': Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
| | * Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changesJean-Michel Trivi2011-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user is in a phone or VoIP call, the volume keys should control the STREAM_VOICE_CALL volume. Before MODE_IN_COMMUNICATION was introduced to cover VoIP use cases, having an active VoIP call was determined by checking whether there was any track used the output stream STREAM_VOICE_CALL, which can give false positives. This CL checks instead against the audio mode to see if MODE_IN_COMMUNICATION is selected to determine if a VoIP call is in progress. This implies that applications that play on STREAM_VOICE_CALL shouldn't rely on that fact alone to expect the volume keys to control the STREAM_VOICE_CALL volume, and should instead, rely on the official mechanism for that: android.app.Activity.setVolumeControlStream(int) Change-Id: Ia487951ea1684477aa3d522c9031fad484d8a40d
* | | am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency ↵Santosh Madhava2011-01-272-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | in Java" into honeycomb * commit 'c4f5b712049a5891bc2d1a87031134f3fe0acb03': Fix for issue 3370007 Overlay transparency in Java
| * | am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into ↵Santosh Madhava2011-01-272-2/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | honeycomb * commit '270cbcc16a72f982d84afeb5e3fd3f166936394a': Fix for issue 3370007 Overlay transparency in Java
| | * Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycombSantosh Madhava2011-01-272-2/+5
| | |\
| | | * Fix for issue 3370007 Overlay transparency in JavaSantosh Madhava2011-01-272-2/+5
| | | | | | | | | | | | | | | | Change-Id: I68be6f56ad58672a771485a028fc0cd8a0514e8a
* | | | am b408c3e9: am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in ↵Basavapatna Dattaguru2011-01-271-84/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | create" into honeycomb * commit 'b408c3e984dbc3af43befc6fd16ff74dd24457a9': Fix Issue: 3373525: reduces app. 100mS in create
| * | | am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into ↵Basavapatna Dattaguru2011-01-271-84/+32
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | honeycomb * commit '64a2c359aeda59e4bc43d48f31ade919e918ea26': Fix Issue: 3373525: reduces app. 100mS in create
| | * | Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycombBasavapatna Dattaguru2011-01-271-84/+32
| | |\ \ | | | |/ | | |/|
| | | * Fix Issue: 3373525: reduces app. 100mS in createBasavapatna Dattaguru2011-01-271-84/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated by removing code duplication Updated with review comments Change-Id: I57a596ed09d4d543964059e18a86e143108305ec