4167 Commits

Author SHA1 Message Date
Gil Dobjanschi
99ec3e7f27 am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb
* commit '7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
  Bug fix: 3421011 ANR during delete video clip
2011-02-03 17:45:33 -08:00
Eric Laurent
2e8fbebff4 am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080
2011-02-03 17:18:46 -08:00
Gil Dobjanschi
3f1c573940 Bug fix: 3421011 ANR during delete video clip
Change-Id: I9ba027619d611d76f41d9430a4ad3c9ee5211711
2011-02-03 17:18:17 -08:00
Dheeraj Sharma
7ee76cfeea am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
* commit 'd13f987f73df03b06c70c631452f6cafbdc254e1':
  Fix for issue :  3419353 Crash during transition generation
2011-02-03 17:18:13 -08:00
Gil Dobjanschi
223f2696bb am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-03 17:16:43 -08:00
Andreas Huber
792faa453a Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)" 2011-02-03 16:19:59 -08:00
Andreas Huber
e7c83d4a71 Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)
Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
2011-02-03 16:09:57 -08:00
Andreas Huber
bd352c3cdc Make sure timestamps attached to encoded media are composition timestamps.
not decoding timestamps. Obviously there is no difference between them if the
content in question does not involve frame reordering.

Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893
related-to-bug: 3398314
2011-02-03 16:08:30 -08:00
Glenn Kasten
f9f223edb4 Bug 1804058 FLAC extractor
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
2011-02-03 13:39:10 -08:00
Eric Laurent
6f1bd261b7 am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080
2011-02-03 10:28:24 -08:00
Eric Laurent
9c0a1003bd Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00
Dheeraj Sharma
d13f987f73 am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
  Fix for issue :  3419353 Crash during transition generation
2011-02-03 09:38:43 -08:00
Eric Laurent
25101b0b9a Fix issue 3371080
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
2011-02-03 09:26:24 -08:00
Dheeraj Sharma
13984592b1 Fix for issue : 3419353 Crash during transition generation
Change-Id: I1f15f05c87bdc1ad8acdb6fc5db3c350e5b28947
2011-02-02 23:26:30 -08:00
Gil Dobjanschi
3f9a851e07 am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit 'ed2c513337ae7581ef73b88424da91ef2d862a78':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-02 22:06:33 -08:00
Gil Dobjanschi
29206e9175 Bug fix: 3419287 Deleted images and video clips invalidate the entire project
Change-Id: I9dcc3b9fa0574fefe688c1616e69ba37811bde51
2011-02-02 22:02:20 -08:00
Kenny Root
3fe81c9e2b Merge "Fix some memory leaks found in static analysis" 2011-02-02 17:14:35 -08:00
Dharmaray Kundargi
2d0010674a am 3d3621f0: am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb
* commit '3d3621f08b02ae559036c7d085c02276ae0a24d9':
  Fix issue 3412777 ANR on adding effects.
2011-02-02 16:20:56 -08:00
Dharmaray Kundargi
3d3621f08b am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb
* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
  Fix issue 3412777 ANR on adding effects.
2011-02-02 15:52:05 -08:00
Kenny Root
3d384f8edb Fix some memory leaks found in static analysis
Change-Id: Icd630009793c51acfaed45763ef50489ead40024
2011-02-02 14:07:10 -08:00
Dharmaray Kundargi
8930a1259d am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
* commit '2fa861cc6ef65696854dc4a85494bea6dd87fd8e':
  Fix issue 3408285 Crash while generating KenBurns
2011-02-02 13:22:29 -08:00
Dharmaray Kundargi
2fa861cc6e am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
* commit '261ddb81206a502a4fd4c9fe1cdc0d931c0e6db1':
  Fix issue 3408285 Crash while generating KenBurns
2011-02-02 13:19:11 -08:00
Dharmaray Kundargi
a3f87f855b Fix issue 3412777 ANR on adding effects.
Change-Id: Id3c480a8261423412a99375f71cf6ee585b6c22b
2011-02-02 13:09:08 -08:00
Dharmaray Kundargi
261ddb8120 Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb 2011-02-02 11:14:33 -08:00
Nemmara Venkateswaran
bf1e5cefe2 am e00d44ce: am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb
* commit 'e00d44ced228dc523f4492edd66d4eeb5dabd305':
  Fix for issue 3370023 : Wrong aspect ratio in overlay
2011-02-02 09:31:35 -08:00
Nemmara Venkateswaran
e00d44ced2 am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb
* commit '47b8c96b253ab24d0df089c87ce0798d4981400a':
  Fix for issue 3370023 : Wrong aspect ratio in overlay
2011-02-02 09:29:13 -08:00
Dharmaray Kundargi
beb9fc8ee8 Fix issue 3408285 Crash while generating KenBurns
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
2011-02-02 03:25:01 -08:00
Santosh Madhava
63298a9809 Fix for issue 3370023 : Wrong aspect ratio in overlay
Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
2011-02-02 01:38:45 -08:00
Dharmaray Kundargi
13c0552643 am e9c5ade3: am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.
* commit 'e9c5ade37168e43203c060635c66dbd4de2ae458':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.
2011-02-01 20:44:33 -08:00
Dharmaray Kundargi
e9c5ade371 am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.
* commit 'c08f85a6484ee5da7062a5eac0f19912bd7e2513':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.
2011-02-01 20:42:32 -08:00
Dharmaray Kundargi
c08f85a648 Fix issue 3414805 Crash during Overlay editing. JNI fixes.
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
2011-02-01 20:19:16 -08:00
Dheeraj Sharma
9cd6a8e2cf am dacacb50: am 22ad6243: Merge "Fix for issue 3410895 Transition 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
2011-02-01 13:26:51 -08:00
Dheeraj Sharma
b5f497b404 am 537cc3b1: am ba2ee617: Merge "Fix for issue 3409874:Crash during addition 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
2011-02-01 13:25:05 -08:00
Dharmaray Kundargi
4fd9eaf5a9 am 8ceccbed: am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb
* commit '8ceccbed7177234f219f2aa39f71554f9141d084':
  Fix issue 3408285. Fix issue in Thread safe in Java.
2011-02-01 13:23:43 -08:00
Gloria Wang
944170f2cf Merge "- Support comfort noise in AMRExtractor - Support duration and seeking in AMRExtractor for different bit rates" 2011-02-01 10:35:10 -08:00
Gloria Wang
069715b6f8 - Support comfort noise in AMRExtractor
- Support duration and seeking in AMRExtractor for different bit rates

Bug 2530101

Change-Id: I12beffea73cea0ec056f0e0cf51a4a8d46d897b8
2011-02-01 10:05:59 -08:00
Dheeraj Sharma
dacacb50ed am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not 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
2011-02-01 09:02:36 -08:00
Dheeraj Sharma
8afee6694b Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
Change-Id: Ice53fb284e029b1d22093048e8343f9ce8d853dd
2011-02-01 00:28:55 -08:00
Dheeraj Sharma
537cc3b19d am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and 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
2011-01-31 22:09:24 -08:00
Dheeraj Sharma
178d4f4111 Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
Change-Id: Iddd1b9b2c430439c4bef4f1cf20fb166ac572d60
2011-01-31 21:25:46 -08:00
Dharmaray Kundargi
8ceccbed71 am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb
* commit '327549f9961b8cd562d1a92c1455005672aa2b95':
  Fix issue 3408285. Fix issue in Thread safe in Java.
2011-01-31 19:03:36 -08:00
Dharmaray Kundargi
327549f996 Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb 2011-01-31 19:01:13 -08:00
Andreas Huber
0026394ed9 am b450d96b: am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
* commit 'b450d96b3d13cd341ef7aa4483c2223ddfecce3c':
  Disconnect HTTP live sessions as soon as the request comes in.
2011-01-31 18:38:07 -08:00
Andreas Huber
b450d96b3d am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
* commit '537fa17f21390fcb4a8d4b24f1cc80ca147ccce0':
  Disconnect HTTP live sessions as soon as the request comes in.
2011-01-31 18:31:05 -08:00
Dharmaray Kundargi
a573b563b3 Fix issue 3408285. Fix issue in Thread safe in Java.
Change-Id: Ifddcecfc2d7b1bd3e8a91c4850c169e1fb7c65ae
2011-01-31 17:54:55 -08:00
Andreas Huber
17ab86cdb1 Disconnect HTTP live sessions as soon as the request comes in.
Instead of waiting until pending events have been processed.

Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug: 3409681
2011-01-31 16:18:49 -08:00
Mike Lockwood
4639532261 MTP: Use ro.product.manufacturer system property value for MTP manufacturer name
Previously it was hard coded to "Google, Inc."

BUG: 3405965

Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-31 17:11:24 -05:00
Gil Dobjanschi
0458159852 am 1aa865aa: am 2bb13573: Bug fix: 3405930 Crash editing overlay text
* commit '1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
  Bug fix: 3405930 Crash editing overlay text
2011-01-31 04:16:16 -08:00
Gil Dobjanschi
1aa865aae0 am 2bb13573: Bug fix: 3405930 Crash editing overlay text
* commit '2bb13573d619e3371d06847d36db78a20b17dfab':
  Bug fix: 3405930 Crash editing overlay text
2011-01-31 04:13:06 -08:00
Gil Dobjanschi
2bb13573d6 Bug fix: 3405930 Crash editing overlay text
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
2011-01-31 03:57:15 -08:00