2382 Commits

Author SHA1 Message Date
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
Andreas Huber
28b93967d0 am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp

* commit '165c6579660c22edafb61fee2a0cf39334a2a905':
  HTTP Live content that are tagged as complete are now seekable.
2010-10-13 09:17:13 -07:00
Andreas Huber
312644cdbb Merge "Support for writing to MPEG2 transport stream files." into gingerbread 2010-10-13 09:14:40 -07:00
Andreas Huber
9adf466021 Support for writing to MPEG2 transport stream files.
Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
2010-10-12 16:05:23 -07:00
Andreas Huber
54d09724e3 HTTP Live content that are tagged as complete are now seekable.
Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde
related-to-bug: 2368598
2010-10-12 14:32:10 -07:00
Andreas Huber
5b0d063010 am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp

* commit '1010da2e02216b2f94fbe763a82d53201b340217':
  Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
2010-10-11 12:37:50 -07:00
Andreas Huber
0dc6403f3c Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282
related-to-bug: 3073813
2010-10-11 11:30:30 -07:00
Andreas Huber
cac43e8a2c am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
Merge commit 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp

* commit 'beffefa24f398b610d58dd583d9f5613dc529c28':
  RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
2010-10-08 15:55:44 -07:00
Andreas Huber
0c46b69f61 RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
Change-Id: Ie61230cd60dd6c682baf72529100369ad6291189
related-to-bug: 3073955
2010-10-08 15:25:19 -07:00
Andreas Huber
e0c8545a23 am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp

* commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10':
  Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
2010-10-08 12:54:32 -07:00
Andreas Huber
38285db197 Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Change-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6
2010-10-08 12:06:27 -07:00
Andreas Huber
2b4f1f4cb8 am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
2010-10-08 11:18:03 -07:00
Andreas Huber
f72dd0190e Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread 2010-10-08 11:16:07 -07:00
Andreas Huber
5dcf588a81 am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp

* commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c':
  Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
2010-10-08 11:05:10 -07:00
Andreas Huber
b9bf545774 Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread 2010-10-08 10:59:52 -07:00
Andreas Huber
6934207ac3 Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
Change-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150
2010-10-08 10:38:39 -07:00
James Dong
d31fc2397a am 6dcdfdb4: Merge "Name the writer threads" into gingerbread
Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp

* commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f':
  Name the writer threads
2010-10-08 10:35:57 -07:00
Andreas Huber
14ea1048e7 am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp

* commit 'c5912acc04226a8f9377d1aad50de8d3f883854c':
  Disable the access unit timeout temporarily while a seek operation is in progress.
2010-10-08 10:35:53 -07:00
Andreas Huber
10b9b3f3fe Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2
related-to-bug: 3073955
2010-10-08 10:16:24 -07:00
James Dong
6dcdfdb42a Merge "Name the writer threads" into gingerbread 2010-10-08 10:06:22 -07:00
Andreas Huber
c5912acc04 Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread 2010-10-08 10:01:37 -07:00
Andreas Huber
e51e80990e Disable the access unit timeout temporarily while a seek operation is in progress.
Change-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea
related-to-bug: 3073955
2010-10-08 09:04:25 -07:00
Eric Laurent
4f21e517d0 am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
  Added getter for session Id to AudioSink
2010-10-08 08:30:03 -07:00
Eric Laurent
b37fcbfd7f Merge "Added getter for session Id to AudioSink" into gingerbread 2010-10-08 08:28:08 -07:00
Andreas Huber
d96a068cc7 am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp

* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
2010-10-08 08:17:54 -07:00
James Dong
c67acb2b28 Name the writer threads
Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
2010-10-07 20:20:59 -07:00
Eric Laurent
b3bdf3f008 Added getter for session Id to AudioSink
Added a method to expose the audio session id at AudioSink interface
so that the AudioPlayer in stagefright can retrieve it.

Also:
- Fixed audio effect send level not being initialized in mediaplayer.
- Fixed compilation error when LOGV is enabled in mediaplayer JNI

Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
2010-10-07 18:23:03 -07:00
Andreas Huber
3418835893 Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
Change-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61
related-to-bug: 3065605
2010-10-07 16:52:42 -07:00
Andreas Huber
bb70837397 am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp

* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
2010-10-07 14:02:26 -07:00
Andreas Huber
45bd1159fa am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-07 14:02:01 -07:00