1119 Commits

Author SHA1 Message Date
Andreas Huber
b8fb6c0bd8 am 8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-03 16:44:26 -08:00
Andreas Huber
9ee55cc1bc am 2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp

* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
  Squashed commit of the following:
2009-12-03 16:40:04 -08:00
Andreas Huber
874c508c53 am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp

* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
  Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
2009-12-03 16:39:27 -08:00
Dave Sparks
b06ecc4011 am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp

* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
  Remove old hack A/V sync hack that is no longer needed.
2009-12-03 16:34:07 -08:00
Ray Chen
29d503c6cc am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 16:31:56 -08:00
Andreas Huber
85e5d39e60 Two more uses of strlcpy that break the sim build. Now fixed. 2009-12-03 16:22:52 -08:00
Andreas Huber
805cc709b7 Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build. 2009-12-03 16:07:05 -08:00
Andreas Huber
1f1c7bad42 I accidentally broke this code while refactoring MediaScanner. This is the fix. 2009-12-03 15:45:53 -08:00
Android (Google) Code Review
2d6d609c9e Merge change I74bf38a0 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-12-03 13:27:08 -08:00
Andreas Huber
bfb9fb143b Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore. 2009-12-03 13:21:54 -08:00
Andreas Huber
b0caf946b7 Squashed commit of the following:
commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 3 11:33:57 2009 -0800

    stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...

commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 2 12:39:07 2009 -0800

    More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
2009-12-03 12:49:09 -08:00
Naveen Kalla
6c84d7313e Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Tone format for TONE_CDMA_ANSWER should be 660Hz + 1000Hz, with a 500ms ON
duration.
2009-12-03 12:17:18 -08:00
Android (Google) Code Review
7c09a0ff36 Merge change Ib904c2a4 into eclair-mr2
* changes:
  Remove old hack A/V sync hack that is no longer needed.
2009-12-03 11:25:54 -08:00
Ray Chen
1b794bbbdc am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:35:45 -08:00
Ray Chen
3bd0a4843a am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-plus-aosp

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:35:36 -08:00
Android (Google) Code Review
e12de4d504 Merge change Id5fa58cf into eclair
* changes:
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:24:18 -08:00
Dave Sparks
b904c2a452 Remove old hack A/V sync hack that is no longer needed. 2009-12-03 10:13:32 -08:00
Wei-Ta Chen
b355012797 Fix the broken build of omxjpegdecoder: http://b/2299035.
1) Add the include path for jni.h.

2) Rename InitCheck() and read_at() to initCheck() and readAt(),
   repectively in StreamSource, as done in DataSource.

3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
   Need to do so because SkJPEGImageDecoder is not defined in a header file.
2009-12-03 23:19:19 +08:00
Ray Chen
9495f8a154 am cb6203cd: am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4'

* commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 20:23:48 -08:00
Ray Chen
cb6203cdcb am 9db1a37c: am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp

* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:35:12 -08:00
Ray Chen
9db1a37cc4 am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:25:43 -08:00
Eric Laurent
ed2168524b am e77d4083: am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b'

* commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 18:49:50 -08:00
Eric Laurent
e77d408345 am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp

* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 18:39:17 -08:00
Andreas Huber
4612a9c53c am ae34cf92: am 781ac162: Merge change I8768f2cc into eclair-mr2
Merge commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e'

* commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e':
  A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
2009-12-01 17:26:32 -08:00
Andreas Huber
ae34cf92db am 781ac162: Merge change I8768f2cc into eclair-mr2
Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp

* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
  A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
2009-12-01 17:10:19 -08:00
Ray Chen
6f762b2d84 am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-plus-aosp

* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
  DATE_TAKEN should be in millisecond instead of second.
2009-12-01 17:08:54 -08:00
Eric Laurent
5e392e2b02 am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 17:04:24 -08:00
Andreas Huber
8768f2ccef A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s). 2009-12-01 15:26:54 -08:00
Ray Chen
d5fa58cf3d Fix timezone issue to comply with EXIF standard. 2009-11-30 14:39:08 -08:00
Ray Chen
0b6ee9fc5e DATE_TAKEN should be in millisecond instead of second. 2009-11-30 11:07:47 -08:00
Eric Laurent
55da000c1d am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:05:52 -08:00
Eric Laurent
524dc046b1 Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
2009-11-27 05:07:55 -08:00
Gloria Wang
54b9a7c9f1 am 03c185bf: am c61b0de8: Merge change Id6ccc9bc into eclair-mr2
Merge commit '03c185bf763fd2a289131d64e4b14d4a5461d80f'

* commit '03c185bf763fd2a289131d64e4b14d4a5461d80f':
  Update documentation: The width of the image for face detection must be even.
2009-11-25 13:55:26 -08:00
Gloria Wang
03c185bf76 am c61b0de8: Merge change Id6ccc9bc into eclair-mr2
Merge commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa' into eclair-mr2-plus-aosp

* commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa':
  Update documentation: The width of the image for face detection must be even.
2009-11-25 13:46:30 -08:00
Android (Google) Code Review
c61b0de83b Merge change Id6ccc9bc into eclair-mr2
* changes:
  Update documentation: The width of the image for face detection must be even.
2009-11-25 13:41:34 -08:00
Gloria Wang
d6ccc9bcf0 Update documentation: The width of the image for face detection must be even. 2009-11-24 16:07:19 -08:00
Dave Sparks
9f14b6a521 am 3d14b1a1: am 1e914ac7: am 16cc72bd: Fix simulator build.
Merge commit '3d14b1a17066b57b579859c246da1397f4e0a123'

* commit '3d14b1a17066b57b579859c246da1397f4e0a123':
  Fix simulator build.
2009-11-23 20:08:12 -08:00
Dave Sparks
53fbe69a48 am 551e1a76: am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80'

* commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80':
  Set metadata retriever thread group to the caller's group.
2009-11-23 20:07:47 -08:00
Dave Sparks
3d14b1a170 am 1e914ac7: am 16cc72bd: Fix simulator build.
Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp

* commit '1e914ac7fce9523b5a932389798589eba91ca4dd':
  Fix simulator build.
2009-11-23 20:03:28 -08:00
Dave Sparks
551e1a7608 am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp

* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
  Set metadata retriever thread group to the caller's group.
2009-11-23 20:03:03 -08:00
Dave Sparks
0b1a97637a am 16cc72bd: Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-plus-aosp

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
  Fix simulator build.
2009-11-23 19:59:15 -08:00
Dave Sparks
e444cae5d7 am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-plus-aosp

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
  Set metadata retriever thread group to the caller's group.
2009-11-23 19:58:37 -08:00
Dave Sparks
1e914ac7fc am 16cc72bd: Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
  Fix simulator build.
2009-11-23 19:58:33 -08:00
Dave Sparks
ebcb7c3167 am 8424ec32: Merge change I0f9a53d4 into eclair
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
  Set metadata retriever thread group to the caller's group.
2009-11-23 19:58:00 -08:00
Dave Sparks
16cc72bdef Fix simulator build. 2009-11-23 19:51:33 -08:00
Dave Sparks
0f9a53d499 Set metadata retriever thread group to the caller's group.
This patch modifies the native binder interface to the metadata
retriever to pass the caller's thread group across the binder
interface. On the server side, the thread scheduler group is
set to the caller's scheduler group temporarily and restored
after the request has completed. This patch also reverts a
previous patch where the priority of the thread was forced to
a low priority foreground thread.

This should give apps more control over the priority of their
metadata retrieval, particularly allow background process to
run without hogging the CPU.
2009-11-23 16:51:15 -08:00
Andreas Huber
f0de482c02 am 4bbdf934: am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '4bbdf934458253dbdb331d2b614a085256ba8d6c'

* commit '4bbdf934458253dbdb331d2b614a085256ba8d6c':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 16:07:26 -08:00
Andreas Huber
2fadaf5634 am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 16:06:56 -08:00
Andreas Huber
19cbbb8b0f am d1f11997: am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'

* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 16:06:25 -08:00
Andreas Huber
4bbdf93445 am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 15:39:26 -08:00