Commit Graph

674 Commits

Author SHA1 Message Date
Andreas Huber
4d5d6c0f3f am 7453da3f: am e981c334: Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'

* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
  Extract video thumbnails from the largest sync sample among the first 20.
2009-10-22 19:04:51 -07:00
Andreas Huber
7453da3f42 am e981c334: Extract video thumbnails from the largest sync sample among the first 20.
Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp

* commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732':
  Extract video thumbnails from the largest sync sample among the first 20.
2009-10-22 14:49:35 -07:00
Andreas Huber
e981c33446 Extract video thumbnails from the largest sync sample among the first 20.
Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
2009-10-22 14:22:57 -07:00
Andreas Huber
83a4e86179 am 0c012efa: am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclair
Merge commit '0c012efaab175a46df0cb217e639f414495e4a1b'

* commit '0c012efaab175a46df0cb217e639f414495e4a1b':
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-22 11:15:43 -07:00
Andreas Huber
0c012efaab am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclair
Merge commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b' into eclair-mr2-plus-aosp

* commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b':
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-22 11:02:35 -07:00
Andreas Huber
f7f671edef am b0e6a9a0: Merge change I7a03b074 into eclair
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2

* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-22 10:46:50 -07:00
Andreas Huber
77f3ca360e am 917d0aec: am bfd5b386: Merge change If68c168d into eclair-mr2
Merge commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330'

* commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330':
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
2009-10-21 15:30:17 -07:00
Andreas Huber
917d0aece5 am bfd5b386: Merge change If68c168d into eclair-mr2
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp

* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
2009-10-21 15:24:07 -07:00
Andreas Huber
7a03b074a5 Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers. 2009-10-21 15:06:21 -07:00
Andreas Huber
f68c168d36 Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever. 2009-10-21 14:01:30 -07:00
Andreas Huber
f16a0b7399 do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
2009-10-20 11:49:01 -07:00
Andreas Huber
5f72500ffa am ec6c6dcf: am 8cca3a6e: Merge change Ib1678609 into eclair-mr2
Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd'

* commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd':
  Avoid signaling a format change to the client if its insubstantial.
2009-10-19 13:35:39 -07:00
Andreas Huber
53f5c0446e am b27849d3: am eaa91ed1: Merge change I63d524fd into eclair-mr2
Merge commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1'

* commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1':
  Fixing the build by renaming private "string.h" header file.
2009-10-19 13:25:19 -07:00
Andreas Huber
ec6c6dcf5b am 8cca3a6e: Merge change Ib1678609 into eclair-mr2
Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp

* commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba':
  Avoid signaling a format change to the client if its insubstantial.
2009-10-19 13:25:13 -07:00
Andreas Huber
b27849d3bf am eaa91ed1: Merge change I63d524fd into eclair-mr2
Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp

* commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f':
  Fixing the build by renaming private "string.h" header file.
2009-10-19 13:16:07 -07:00
Andreas Huber
b1678609ca Avoid signaling a format change to the client if its insubstantial.
For example, the original port settings change may just indicate a change
in the number of buffers to allocate, which won't be visible to the client
in any case.
2009-10-19 13:06:40 -07:00
Andreas Huber
63d524fdf0 Fixing the build by renaming private "string.h" header file. 2009-10-19 10:15:44 -07:00
Yu Shan Emily Lau
c2f945c047 am c3d8f16a: am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d'

* commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:55:16 -07:00
Yu Shan Emily Lau
c3d8f16a72 am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp

* commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:44:27 -07:00
Yu Shan Emily Lau
720ac1d4fa am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2

* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:21:22 -07:00
Andreas Huber
07914840df am 4b9dbdfa: am d96f6e85: Merge change I8176f35e into eclair-mr2
Merge commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a'

* commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a':
  Reimplement the OMX backend for stagefright.
2009-10-16 13:02:24 -07:00
Andreas Huber
4b9dbdfa18 am d96f6e85: Merge change I8176f35e into eclair-mr2
Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp

* commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d':
  Reimplement the OMX backend for stagefright.
2009-10-16 12:51:42 -07:00
Andreas Huber
784202ea11 Reimplement the OMX backend for stagefright.
Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup.

Changed APIs to conform to the rest of the system.
2009-10-16 11:22:43 -07:00
Yu Shan Emily Lau
999101368f 1) Add 10 seconds wait time before collecting the end memory.
2) Modified the player stress test, shorten the plabyack time.
2009-10-15 18:52:31 -07:00
Ray Chen
7ebee2f9e7 am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2
Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5'

* commit '34cc52922d4268633b3730dfd73658be6a06a2c5':
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 17:08:01 -07:00
Andreas Huber
c69cfdbace am 28af587a: am c642199d: Merge change Ibd7b43bb into eclair-mr2
Merge commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3'

* commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3':
  Separated private from public header files.
2009-10-13 17:07:48 -07:00
Andreas Huber
ee19004b46 am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2
Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420'

* commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420':
  Fix various compiler warnings accumulated over time.
2009-10-13 17:07:37 -07:00
Andreas Huber
5dc13b769f am 9550e289: am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e'

* commit '9550e2892f88194c9abbb85616bb55db67231d6e':
  OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
2009-10-13 17:06:41 -07:00
Andreas Huber
9f6ff40c57 am 96c1dfcc: am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
Merge commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e'

* commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e':
  Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
2009-10-13 17:04:28 -07:00
Andreas Huber
0b4acfcc60 am c55bb59e: am ef703f60: Merge change I98276091 into eclair-mr2
Merge commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7'

* commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7':
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-13 17:04:19 -07:00
Ray Chen
0236486486 am 7c86fc06: am 23a2d92f: Merge change Ib01005ea into eclair-mr2
Merge commit '7c86fc066a010ed50877ee3066d542f873d762c2'

* commit '7c86fc066a010ed50877ee3066d542f873d762c2':
  Avoid extracting EXIF data for non-JPEG images.
2009-10-13 14:28:59 -07:00
Andreas Huber
e25adeaf41 am e1ba4226: am 936fff36: Merge change Ib64cab41 into eclair-mr2
Merge commit 'e1ba422636937ee1ca84938d018282344d319543'

* commit 'e1ba422636937ee1ca84938d018282344d319543':
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
2009-10-13 14:28:35 -07:00
Andreas Huber
74ae80b623 am 1c83540e: am 2d295a96: Merge change Iedebfe8d into eclair-mr2
Merge commit '1c83540e3829dc9664728f1f017686f16f61a4ea'

* commit '1c83540e3829dc9664728f1f017686f16f61a4ea':
  Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
2009-10-13 11:59:00 -07:00
Andreas Huber
fccdd7aee8 am 39c923a9: am 23bccd6c: Merge change I729c3938 into eclair-mr2
Merge commit '39c923a94c377a75e34153f6dddb83fc9883d2a7'

* commit '39c923a94c377a75e34153f6dddb83fc9883d2a7':
  Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
2009-10-13 11:58:40 -07:00
Andreas Huber
c2370c424b am a6b76c35: am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'

* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
  The vendor is about to check in a fix for this issue, the workaround is no longer needed
2009-10-13 11:54:43 -07:00
Ray Chen
34cc52922d am b65a90d7: Merge change I73b00501 into eclair-mr2
Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp

* commit 'b65a90d76ff486208974f0b1dac8e880ba29174b':
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 10:50:30 -07:00
Android (Google) Code Review
b65a90d76f Merge change I73b00501 into eclair-mr2
* changes:
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 13:43:18 -04:00
Andreas Huber
28af587a05 am c642199d: Merge change Ibd7b43bb into eclair-mr2
Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp

* commit 'c642199d1d60176980e2781bb78f42dce93e1c84':
  Separated private from public header files.
2009-10-13 10:41:12 -07:00
Andreas Huber
b7a69ce8f2 am fe324a61: Merge change I8d87cd98 into eclair-mr2
Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp

* commit 'fe324a61c39d5db59f09fdae81c808d7851841e6':
  Fix various compiler warnings accumulated over time.
2009-10-13 10:41:03 -07:00
Andreas Huber
bd7b43bb02 Separated private from public header files. 2009-10-13 10:22:55 -07:00
Andreas Huber
8d87cd98a8 Fix various compiler warnings accumulated over time. 2009-10-13 10:06:37 -07:00
Andreas Huber
9550e2892f am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e' into eclair-mr2-plus-aosp

* commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e':
  OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
2009-10-13 09:56:09 -07:00
Andreas Huber
cfd55579c2 OMXCodec now notifies the reader of changes in the output format by returning a special result/error code. 2009-10-13 09:46:46 -07:00
Andreas Huber
96c1dfccb2 am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
Merge commit '63f20ec1a8d31c85261056c6c171140b93bcde0a' into eclair-mr2-plus-aosp

* commit '63f20ec1a8d31c85261056c6c171140b93bcde0a':
  Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
2009-10-12 16:24:53 -07:00
Andreas Huber
c55bb59e54 am ef703f60: Merge change I98276091 into eclair-mr2
Merge commit 'ef703f60d5c00527048fdaf1c24984762f6fd434' into eclair-mr2-plus-aosp

* commit 'ef703f60d5c00527048fdaf1c24984762f6fd434':
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-12 16:24:46 -07:00
Andreas Huber
63f20ec1a8 Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
related-to-bug: 1986192
2009-10-12 16:04:30 -07:00
Andreas Huber
fa8de75250 Change to a int64_t usecs representation for timestamps and duration throughout stagefright. 2009-10-12 16:00:07 -07:00
Ray Chen
73b0050111 Check cursor and URI value for nullity to prevent NPE. 2009-10-12 13:19:34 -07:00
Andreas Huber
ea745866de am 1e988a04: am f894d111: Merge change I6c32aa75 into eclair-mr2
Merge commit '1e988a04b55fcaab6116b8d565b68b4f62d01633'

* commit '1e988a04b55fcaab6116b8d565b68b4f62d01633':
  Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
2009-10-12 12:34:08 -07:00
Eric Laurent
b0b3c14d89 am 82162049: am 4e362817: am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '821620494f0f073a27124e96139d5320df79d7e4'

* commit '821620494f0f073a27124e96139d5320df79d7e4':
  Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
2009-10-12 12:26:44 -07:00