2511 Commits

Author SHA1 Message Date
James Dong
65a73f4e8c Rotation support
- We only support 0, 90, 180, and 270 degree clockwise rotation

- Some players are known to ignore composition matrix in the MP4 file,
  although this is part of the MP4 file standard.
  Both QT and YT are supporting the rotation

Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
2010-11-05 15:47:52 -07:00
James Dong
c25c28a496 am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
  Revert "Support rotation in media recorder"
2010-11-03 19:44:45 -07:00
James Dong
c80c28801d Revert "Support rotation in media recorder"
This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
2010-11-03 19:22:47 -07:00
Hiroshi Lockheimer
0ce42c9d31 am c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
2010-11-03 17:59:43 -07:00
James Dong
f1febe470a Support rotation in media recorder
o needs to be tested with camera hal and camcorder application

Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
2010-11-03 17:49:55 -07:00
James Dong
a3f5b615d7 am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
2010-11-03 09:25:08 -07:00
James Dong
6786fccf5a DO NOT MERGE
Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
2010-11-02 19:30:01 -07:00
Gloria Wang
35a4f21bd6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
2010-11-02 14:02:59 -07:00
Gloria Wang
eab18ea34d - Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
2010-11-01 16:12:16 -07:00
Chia-chi Yeh
67f41771d5 Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
2010-11-01 10:56:45 +08:00
Eric Laurent
03a4090b4d Update java doc for visualizer FFT capture.
The java doc for visualizer FFT capture was not describing
correctly the layout of the data returned by getFft() method.

Change-Id: Idec09538490ea73b211db253b1b8b733ca4d4a72
2010-10-28 10:14:07 -07:00
Yu Shan Emily Lau
751cc4245f am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:14:36 -07:00
Yu Shan Emily Lau
8b023a2ea2 Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:12:58 -07:00
Marco Nelissen
cd08ada7f1 am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:08:14 -07:00
Marco Nelissen
f514bdc964 Fix off-by-two and other bugs in the visualization code.
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
2010-10-27 10:23:59 -07:00
Andreas Huber
e1e8274588 am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:23:54 -07:00
Andreas Huber
0a612889b5 Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
2010-10-26 15:06:44 -07:00
Yu Shan Emily Lau
93aa00c664 Add the mediaplayer release in the test validation. This is to ensure the media player release properly.
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
2010-10-26 14:36:09 -07:00
Gloria Wang
b8791479af resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
2010-10-25 16:11:18 -07:00
Gloria Wang
d5770917a5 DRM framework support:
- add a sniffer for DRM files
- add DRMSource and DRMExtractor for es_based DRM
- add pread in FileSource.cpp for container_based DRM
- add native DRM framework API calls in the player for
  DRM audio/video playback

Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
2010-10-25 12:16:56 -07:00
Mike Lockwood
b04e3940d1 Fixes for simulator build on lucid
strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
2010-10-24 08:52:08 -07:00
Eric Laurent
5a9d273718 am b6a2256e: Merge "Fix issue 3126094." into gingerbread
Merge commit 'b6a2256e5461160a89d077b761d3253d95ce869f' into gingerbread-plus-aosp

* commit 'b6a2256e5461160a89d077b761d3253d95ce869f':
  Fix issue 3126094.
2010-10-22 18:41:29 -07:00
Eric Laurent
cc02ac54ac Fix issue 3126094.
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.

Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
2010-10-22 18:08:13 -07:00
James Dong
6123e0f7c9 am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on
2010-10-21 20:18:16 -07:00
James Dong
89a0104c7c Turn the media time adjustment in file writer back on
o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device

bug - 3058745

Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
2010-10-21 18:41:31 -07:00
James Dong
8ad6335d2c am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
  File writer size estimation improvement
2010-10-20 21:28:38 -07:00
James Dong
22b37fa6e0 File writer size estimation improvement
o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
  and set it to the smaller estimated value.

low risk change

bug - 3111983

Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
2010-10-19 22:59:22 -07:00
Andreas Huber
2d00c60509 am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp

* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
  If we encounter video stream EOS while seeking we may still need to seek audio.
2010-10-19 10:08:32 -07:00
Andreas Huber
4d450a8657 If we encounter video stream EOS while seeking we may still need to seek audio.
Change-Id: Ie260942247b6810ca94e86328a3725d75b12181d
related-to-bug: 3108724
2010-10-19 09:34:44 -07:00
Andreas Huber
8b5161c2ae am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.
Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp

* commit 'd68cda472a3646966a203338ccac04f0783293b7':
  An attempt to unregister a handler that's no longer registered should not cause an assertion.
2010-10-18 15:17:07 -07:00
Andreas Huber
d68cda472a An attempt to unregister a handler that's no longer registered should not cause an assertion.
There are edge cases in which a handler attempts to unregister itself while on another thread a message fails to be delivered to that very handler and causes automatic unregistration. In this case the handler's good cleanup intentions are thwarted by the CHECK.

Change-Id: I4e41b5e7b619159ecce4856c15cccca031a28b5b
related-to-bug: 3101247
QA-impact: no(!!!) risk
2010-10-18 15:06:04 -07:00
Andreas Huber
9b2f18df24 am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp

* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
  For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
2010-10-18 11:50:19 -07:00
Andreas Huber
bc96c2848d Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 2010-10-18 11:46:44 -07:00
Andreas Huber
8f5214eb6f am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread
Merge commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823' into gingerbread-plus-aosp

* commit '02ec432e6eff2ab59165c5b7c9b1a0d6689d0823':
  If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
2010-10-18 11:24:05 -07:00
Andreas Huber
99bc1da79b If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
Change-Id: I686320d9d4cd826f43c0813c6ba1dc4949d1115f
2010-10-18 10:39:29 -07:00
Andreas Huber
5a40e394f1 For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
related-to-bug: 3106534
Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
2010-10-18 10:16:08 -07:00
Andreas Huber
fb47487259 am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp

* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
  Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
2010-10-15 18:25:14 -07:00
Andreas Huber
a4f391c9bf Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
2010-10-15 13:31:29 -07:00
Andreas Huber
cb90947bf8 am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread
Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp

* commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c':
  Make sure we cache the sampleTable again if using the caching datasource.
2010-10-15 08:54:17 -07:00
Andreas Huber
6da2ae11b6 Make sure we cache the sampleTable again if using the caching datasource.
QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position.

Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5
related-to-bug: 3098873
2010-10-15 08:38:49 -07:00
Eric Laurent
83ed30e5e7 am ae0bb04a: Merge "Fix issue 3098850" into gingerbread
Merge commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac' into gingerbread-plus-aosp

* commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac':
  Fix issue 3098850
2010-10-14 18:03:10 -07:00
Eric Laurent
02d0ff60c4 Fix issue 3098850
Media framework test permissions were not updated when commit
14beea487c065ca902bfd7089399eb71a805e302 added
MODIFY_AUDIO_SETTINGS permission check for global effects.

Change-Id: I2a97be74f33d62fbb749642b1e7a26ddf92378f2
2010-10-14 17:12:43 -07:00
Andreas Huber
27c7fb1a86 am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp

* commit '90d59d180bd963f00161e6bfaabfda432960cab6':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
2010-10-13 15:50:27 -07:00
Andreas Huber
0c9b577e4d Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599
related-to-bug: 3073955
2010-10-13 15:12:08 -07:00
Andreas Huber
bb5d7c2161 am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp

* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
2010-10-13 14:28:52 -07:00
Andreas Huber
5f42391701 Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 2010-10-13 14:25:32 -07:00
Andreas Huber
8e4f3c76dd am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Merge commit '646e0d5ab342f414f556574f2d078bd6deb22ed3' into gingerbread-plus-aosp

* commit '646e0d5ab342f414f556574f2d078bd6deb22ed3':
  Some webcams output rtp streams but never send any rtcp data in violation of
2010-10-13 14:22:57 -07:00
Andreas Huber
cc5fb1d5e5 Some webcams output rtp streams but never send any rtcp data in violation of
the specs. Attempt to use fake timestamps to be able to play these...

Change-Id: Ia7a926616fb764e972955df4acdb59d85cdd93df
related-to-bug: 3087310
2010-10-13 12:15:03 -07:00
Andreas Huber
4deb3eb534 Attempt to derive the avg. bitrate of the entire stream from metadata.
related-to-bug: 3093224
Change-Id: I4726b023373e04468cc12fd64f7fe6ee923add95
2010-10-13 10:39:41 -07:00
Andreas Huber
a127c07c42 am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp

* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
  Support for writing to MPEG2 transport stream files.
2010-10-13 09:19:28 -07:00