3836 Commits

Author SHA1 Message Date
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
Dave Sparks
b6e89affd5 am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
  DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
2011-01-20 17:41:30 -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
a2ab9aace3 DO NOT MERGE: 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: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172
related-to-bug: 3362836
2011-01-19 15:44:23 -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
James Dong
da58076a6b Logging the duration range from different media tracks for recording
Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
2011-01-19 11:54:59 -08:00
James Dong
894339298e am 4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb
* commit '4f28901f2a15f566a98bf5d14ac510e05401f960':
  Turn error/exception logging on at the native layer
2011-01-19 11:52:56 -08:00
James Dong
581cad2221 Turn error/exception logging on at the native layer
o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
2011-01-19 11:42:53 -08:00
Andreas Huber
ee48eabab8 am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
* commit '71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
  Return a runtime error if decryption fails instead of asserting.
2011-01-19 11:33:56 -08:00
Andreas Huber
283e031d11 Always revert to the previous bandwidth if the required sequence number cannot be found
Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
2011-01-19 11:30:43 -08:00
Andreas Huber
0cf2616fac Return a runtime error if decryption fails instead of asserting.
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
2011-01-19 11:24:39 -08:00
Andreas Huber
8da1ca5280 am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
* commit '069ee21a2012e0b6fd355253ea81a84ea11138d2':
  Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
2011-01-19 10:40:19 -08:00
Andreas Huber
069ee21a20 Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb 2011-01-19 10:38:16 -08:00
Andreas Huber
d95b46a1d1 Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
Refactor the logic a little.

Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
2011-01-19 10:34:52 -08:00
James Dong
6df89f2efc am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
* commit '8e7d626385eef104d52aa9080b70395ca840a0cd':
  Expose average video frame rate via MPEG4Extractor
2011-01-19 10:31:06 -08:00
James Dong
8e7d626385 Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb 2011-01-19 10:29:04 -08:00
Mike Lockwood
216a7b97eb am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
* commit 'dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
  MTP: Close and reopen driver file after an error.
2011-01-19 10:23:44 -08:00
James Dong
cbb488d678 Expose average video frame rate via MPEG4Extractor
bug - 3362483

Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
2011-01-19 10:20:59 -08:00
Mike Lockwood
dc80b7ec05 Merge "MTP: Close and reopen driver file after an error." into honeycomb 2011-01-19 10:20:38 -08:00
Mike Lockwood
897f894e88 MTP: Close and reopen driver file after an error.
BUG: 3368665

Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 10:11:28 -08:00
James Dong
1324e3b1a4 am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
  Fix the presentation video resolution when it is different from the actual image resolution of the video.
2011-01-19 10:06:23 -08:00
James Dong
4061c9aa6d Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb 2011-01-19 10:05:05 -08:00
Andreas Huber
d3bf3eeadd am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
* commit '2597aedb3869e46f945359c529e03263c77a944d':
  Turn another assertion into a runtime error. Damn you surfaces.
2011-01-19 09:51:42 -08:00
Andreas Huber
ba1b16790a Turn another assertion into a runtime error. Damn you surfaces.
Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab
related-to-bug: 3335220
2011-01-19 09:20:58 -08:00