3643 Commits

Author SHA1 Message Date
Andreas Huber
b73f4208f0 am bd6ac1e4: am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb
* commit 'bd6ac1e4d444e69d31677fec41d4d1a265098f08':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
2011-01-24 13:31:00 -08:00
Santosh Madhava
01a9c0289e am 47254778: am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb
* commit '47254778584db8d7a8b9ff17e3704fbdf18fa348':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
2011-01-24 13:30:54 -08:00
Gil Dobjanschi
dc5b1762da am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb
* commit '6c170eccf2864e526a145c91102b204cb787c860':
  VideoEditor:Clear Surface API addition
2011-01-24 13:27:07 -08:00
Andreas Huber
bd6ac1e4d4 am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb
* commit 'da6f9295840b0e74f61afa273ce2a767d8148af7':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
2011-01-24 11:16:57 -08:00
Santosh Madhava
4725477858 am 36486912: Merge "Resubmit of \'Fix for isssue 3369932 : stopPreview returns 0\'" into honeycomb
* commit '36486912595525a3ec4f0027deeb91d318ec4d9d':
  Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
2011-01-24 11:16:54 -08:00
Andreas Huber
da6f929584 Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb 2011-01-24 10:45:59 -08:00
Andreas Huber
aac2e9e156 Make AwesomePlayer's reset process more verbose to track down ANRs (again)
Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9
related-to-bug: 3362836
2011-01-24 10:31:52 -08:00
Santosh Madhava
4ff8a0b410 Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
2011-01-24 10:17:05 -08:00
Gil Dobjanschi
6c170eccf2 am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb
* commit '9c265fcc846699050bee169f60defff4f5a73b5c':
  VideoEditor:Clear Surface API addition
2011-01-23 23:38:08 -08:00
Dheeraj Sharma
05d9f81bd6 VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
2011-01-23 21:41:34 -08:00
Mike Lockwood
20bc97fc54 CameraBrowser: new implementation based on new MTP host APIs
Change-Id: I81300e3218d6f6fce87432ce506fc282aa4dc4b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 16:01:30 -08:00
Mike Lockwood
47063a859a Merge "New APIs for MTP and PTP host support" 2011-01-22 15:59:28 -08:00
Mike Lockwood
8182e72479 New APIs for MTP and PTP host support
This replaces the previous ContentProvider based interface

Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 15:56:09 -08:00
Mike Lockwood
f1762fd25f am 2d044d1f: Merge "Remove MTP related log spam" into honeycomb
* commit '2d044d1ff9d5d51eba9669857b7d5ea4e9c2ac52':
  Remove MTP related log spam
2011-01-22 14:37:31 -08:00
Mike Lockwood
2d044d1ff9 Merge "Remove MTP related log spam" into honeycomb 2011-01-22 14:35:39 -08:00
Mike Lockwood
f26a586c86 Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-21 21:00:54 -08:00
Carl Shapiro
8513cf6ff2 am 76afe3e5: Merge "Remove dead code referencing an obsolete interface." into honeycomb
* commit '76afe3e5cdf3a531835d349a6ab04f2fe82e3958':
  Remove dead code referencing an obsolete interface.
2011-01-21 16:13:29 -08:00
Carl Shapiro
8f995b5f6d Remove dead code referencing an obsolete interface.
Bug: 3378919

Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91
2011-01-21 16:10:08 -08:00
Carl Shapiro
17066b8fb2 am 8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
* commit '8dac54c5855cdb3334ea31ff1b5f04972515ff7f':
  Perform orthogonal rotations without using a Skia canvas.
2011-01-21 15:12:14 -08:00
Carl Shapiro
8dac54c585 Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb 2011-01-21 15:09:56 -08:00
Carl Shapiro
48e8ec611a am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb
* commit '366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
2011-01-21 15:08:04 -08:00
Carl Shapiro
d6c276a5ef Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c.

Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
2011-01-21 14:52:51 -08:00
Carl Shapiro
ae12a50a35 Perform orthogonal rotations without using a Skia canvas.
Bug: 3371653

Change-Id: I315f671c0016f61417ff7c2a98d2c96f6b243bdf
2011-01-21 14:45:14 -08:00
Andreas Huber
3564d9eada am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb
* commit '63d64a14790ae21db31b60747864b4a7565b33c3':
  Properly rotate video that's marked as such and decoded to a surface.
2011-01-21 14:44:21 -08:00
Andreas Huber
5e9dc94a3c Properly rotate video that's marked as such and decoded to a surface.
Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c
related-to-bug: 3378148
2011-01-21 14:32:31 -08:00
Andreas Huber
9a62d902ea am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8':
  Some tweaks to HTTP live / nuplayer behaviour
2011-01-21 13:17:42 -08:00
Andreas Huber
19922adceb Some tweaks to HTTP live / nuplayer behaviour
- play audio-only streams again
- workaround for malformed streams that switch PIDs across bandwidths
- attempt to pick a different bandwidth stream if the previously chosen one appears
  to be malformed/unsupported.

Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9
related-to-bug: 2368598
2011-01-21 10:34:40 -08:00
Santosh Madhava
10fcc6f500 am ff23e4d7: Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
* commit 'ff23e4d7f872df4d5880e69cc3742fc08d66f00b':
  Fix for issue 3370052 : Export progress percentage is incorrect
2011-01-20 23:46:27 -08:00
Santosh Madhava
f82856f3d2 am 95788cf4: Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb
* commit '95788cf478d177d6748c40d4ce725fb4f93aec82':
  Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
2011-01-20 23:46:23 -08:00
Santosh Madhava
ff23e4d7f8 Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb 2011-01-20 23:44:29 -08:00
Santosh Madhava
95788cf478 Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb 2011-01-20 23:44:05 -08:00
Andreas Huber
ec0c94b7d7 am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
* commit 'c4f82e3387429ae94e4874b7dc1649b3c643b505':
  Implement missing pause/resume support for NuPlayer.
2011-01-20 17:14:59 -08:00
Santosh Madhava
9d5ca4a14c Fix for issue 3370052 : Export progress percentage is incorrect
Change-Id: If1a39ab4c34e44b84dc6ada7b4d7b634ac347099
2011-01-20 17:10:40 -08:00
Andreas Huber
601fe0e595 Implement missing pause/resume support for NuPlayer.
Change-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134
related-to-bug: 2368598
2011-01-20 15:23:04 -08:00
Santosh Madhava
bdb2e79a41 Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
Change-Id: I028f0c74f71c8b5497a6c904b93a3f09dde559e0
2011-01-20 14:52:06 -08:00
James Dong
3230f1a97d am 637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
* commit '637739d4bf014e82af19ec4465e6031579ca6eea':
  Eliminate recording sound by starting the video track before audio track.
2011-01-20 09:28:55 -08:00
James Dong
637739d4bf Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb 2011-01-20 09:27:01 -08:00
James Dong
44b004b0c2 Eliminate recording sound by starting the video track before audio track.
Due to the variable delays in the system, the recording sound can still be heard
if the audio track is started early. This happens even after we suppress a relative
long period of initial audio for a recording session. By starting the video track
before the audio track, we effectively play the recording sound earlier.

bug - 3371141

Change-Id: I2cccf77eae953d96827fc080c618b1d962445c26
2011-01-20 06:58:16 -08:00
Andreas Huber
559da2fd89 am 3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
* commit '3cd6302b9e54ff888df5eb47b35d25e7dac1d763':
  Prefill the cache before trying to instantiate the media extractor.
2011-01-19 15:24:28 -08:00
Andreas Huber
3cd6302b9e Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb 2011-01-19 15:12:41 -08:00
Andreas Huber
9634665ed6 Prefill the cache before trying to instantiate the media extractor.
The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30
related-to-bug: 3362836
2011-01-19 15:07:19 -08:00
Gil Dobjanschi
fc8ea8ecb4 am c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
* commit 'c4edeb5a60a45af874474ae7244c921a268430f1':
  Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
2011-01-19 14:13:41 -08:00
Gil Dobjanschi
c4edeb5a60 Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
2011-01-19 14:10:32 -08:00
Dharmaray Kundargi
97619db928 am fe93351c: Merge "remove eng developement local tags in make file" into honeycomb
* commit 'fe93351cf1e16dcb32c3c824cf4f1201991b2130':
  remove eng developement local tags in make file
2011-01-19 14:04:27 -08:00
Dharmaray Kundargi
fe93351cf1 Merge "remove eng developement local tags in make file" into honeycomb 2011-01-19 14:02:12 -08:00
James Dong
aa474aa6f9 am fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb
* commit 'fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287':
  Logging the duration range from different media tracks for recording
2011-01-19 13:59:02 -08:00
James Dong
fc37018a90 Merge "Logging the duration range from different media tracks for recording" into honeycomb 2011-01-19 13:57:06 -08:00
Dharmaray Kundargi
6dbd3ee67b remove eng developement local tags in make file
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
2011-01-19 12:14:46 -08:00
Andreas Huber
4026ea7c25 am 0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
* commit '0353459d405e20750b3ddd8abad83eace1ed2a39':
  Always revert to the previous bandwidth if the required sequence number cannot be found
2011-01-19 11:59:14 -08:00
Andreas Huber
0353459d40 Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb 2011-01-19 11:56:15 -08:00