2083 Commits

Author SHA1 Message Date
Dave Sparks
6ab8346a03 am c05c83e2: am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly hig
Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2'

* commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:46:07 -07:00
Dave Sparks
f3c6c982f6 am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:37:15 -07:00
James Dong
a94e11429a am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 12:23:48 -07:00
Dave Sparks
9883af6a83 am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:23:44 -07:00
James Dong
a05d4d886a am 48a7c1d2: am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'

* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:50:46 -07:00
James Dong
42a18c09e7 Check and clip some video encoding parameters against media profiles before passing them to video encoder
Change-Id: I69e0e7411806a4ece6c0bf0e02c74eaaf48a17ac
2010-06-17 11:34:10 -07:00
James Dong
99cc3295cf am d8402d78: am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'

* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:28:28 -07:00
James Dong
cd677a3085 Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 2010-06-17 11:25:19 -07:00
James Dong
39e876ad74 Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 2010-06-16 16:10:52 -07:00
James Dong
1c8bc7bb99 When filling the cache, we always time out waiting for a condition that won't occur.
We are actually improving the power consumption for streaming applications like Pandora.

Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
2010-06-16 14:12:53 -07:00
Marco Nelissen
cad5726e3a TimedEventQueue is apparently important for glitch-free media playback, and so
having it inherit its priority from the thread that created it is a bad idea.
Instead, set the priority explicitly, and bump it to slightly higher than normal.

Change-Id: I01843f24905790ce2e2cde5d11a99346cfbf968d
2010-06-16 11:09:01 -07:00
James Dong
7e28c0108b am 56b64c75: am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Merge commit '56b64c75c3809c55c2053f77802344a9e035343f'

* commit '56b64c75c3809c55c2053f77802344a9e035343f':
  This patch enables each omx instance to have a separate message dispatcher, and
2010-06-15 11:20:23 -07:00
Mike Lockwood
15d3e0a9f4 Merge "MTP: Use stat.st_mode instead of dirent.d_type to determine file type." 2010-06-15 08:57:21 -07:00
Mike Lockwood
8071de9096 Merge "MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN" 2010-06-15 08:57:13 -07:00
Mike Lockwood
9eb5ac9cc7 MTP: Use stat.st_mode instead of dirent.d_type to determine file type.
dirent.d_type is not implemented on all file systems.

Change-Id: I50a01fd77a9f976f215e7ff98dd04f0f2611bbce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 23:00:30 -07:00
Mike Lockwood
f30218bea7 MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN
The previous code was calling stat() on the parent directory rather than the actual file.

Change-Id: If64552cb37552c77618a81ae4333307a018efe13
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 22:57:22 -07:00
Mike Lockwood
7028db3bed Merge "MTP device: Read manufacturer name and serial number from system properties." 2010-06-14 18:01:01 -07:00
Mike Lockwood
622ccdc218 MTP device: Read manufacturer name and serial number from system properties.
Change-Id: I8d1ad79f38aaaa50fa8899e6b614096af95fdf39
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 17:59:46 -07:00
James Dong
d77d2a980c Remove hard-coded number of audio channels in AudioSource
Change-Id: I5f362252c25e2251bbfa9818b711ee23b4975248
2010-06-14 17:45:35 -07:00
James Dong
c52ced0726 This patch enables each omx instance to have a separate message dispatcher, and
thus eliminates the sharing of the message dispatches between omx instances.

If the omx audio and video encoders share the same dispatcher, when the audio read
blocks in the AudioSource, the message dispatcher thread gets blocked. As a result,
the message for the omx video encoder can not be dispatched, hence gets blocked too.
If the blocking time is long enough, the video frame rate decreases significantly.
This is the case when we read 2048 bytes by default each time. Reading smaller blocks
of audio data helps mitigate the above-mentioned problem, but it is not an ideal
solution for two reasons: a) it is not efficient, and thus can cause a lot of overhead
passing buffers between the frame work and the omx encoders; b) also, the audio record
thread can overflow as a result, which lead to the loss of recorded audio frames.

This patch affects both authoring engine and the playback engine.

Change-Id: I26dfde7ac46c8752cf1793ce1bfcc7be7724580e
2010-06-14 17:28:05 -07:00
James Dong
40287c8f11 am 814f430c: am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit '814f430cb5e313316600fd6694ed338edd5fff7d'

* commit '814f430cb5e313316600fd6694ed338edd5fff7d':
  Fixed a typo - maybe we should do comparison ignoring the case?
2010-06-14 14:43:57 -07:00
James Dong
dca66e1c3b Fixed a typo - maybe we should do comparison ignoring the case?
Change-Id: I498f8242e6ba3e3e8b8c7b714ed49bff51a3010b
2010-06-14 11:14:38 -07:00
Mike Lockwood
44cf0a0682 MTP: Fix uninitialized pointer bug.
Change-Id: Ia07ebd48aeb483e66957f5a174992d200494a744
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 09:13:11 -07:00
Eric Laurent
7f5ee3b58d am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'

* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:10:32 -07:00
Eric Laurent
e0219539c6 am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread

* commit '01f7ac64488027492b2909b99d70491e7a391015':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:04:33 -07:00
Eric Laurent
01f7ac6448 Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken 2010-06-14 09:02:13 -07:00
Mike Lockwood
70bd2f2099 CameraBrowser: Requery the device list when MTP devices are added and removed.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-12 21:35:30 -04:00
Mike Lockwood
74f094fe22 MTP: Add interface to MtpClient for receiving device added/removed events.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-12 21:35:27 -04:00
Andreas Huber
30d5ca398d am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
  Must hold lock here...
2010-06-11 16:01:34 -07:00
Andreas Huber
126ca6f9ec Merge "Must hold lock here..." into gingerbread 2010-06-11 15:58:19 -07:00
Mike Lockwood
5bd667a3a7 Merge "CameraBrowser: Support for deleting pictures." 2010-06-11 15:14:16 -07:00
Mike Lockwood
0cd0e797da Merge "MTP: Add host support for deleting objects." 2010-06-11 15:13:38 -07:00
Mike Lockwood
147717c267 CameraBrowser: Support for deleting pictures.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-11 17:47:38 -04:00
Mike Lockwood
e0a89f611d MTP: Add host support for deleting objects.
For example, deleting pictures on a digital camera.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-11 17:47:35 -04:00
James Dong
188c432c70 am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'

* commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3':
  Initial checkin for pause and resume control
2010-06-11 14:34:09 -07:00
James Dong
f62c57d684 Merge "Initial checkin for pause and resume control" into kraken 2010-06-11 14:28:55 -07:00
Andreas Huber
9e937269a6 Must hold lock here...
Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
2010-06-11 14:16:12 -07:00
James Dong
08c7473ce9 Initial checkin for pause and resume control
Change-Id: Ibdcf7bea5fb66baa81878704ba4091dfcfe382ee
2010-06-11 13:48:48 -07:00
Andreas Huber
4fee974adf am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'

* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
2010-06-11 11:00:44 -07:00
Andreas Huber
f5eafe40cd Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 2010-06-11 10:52:00 -07:00
Andreas Huber
20b35c7046 am b165719e: am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit 'b165719e93dd390b4f71f5d5e993880529cc841f'

* commit 'b165719e93dd390b4f71f5d5e993880529cc841f':
  Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
2010-06-11 10:16:39 -07:00
Andreas Huber
3a53dc5ad9 Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Change-Id: I506dc501faec60e974bf4968d8ba661df7a49aa8
2010-06-11 09:57:46 -07:00
Andreas Huber
e577e87a2d Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Change-Id: I963ad7074b830d553b67c8925efd5369d0b7a5b9
2010-06-11 09:22:48 -07:00
Eric Laurent
948235c06e Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations,
OpenSL ES effect interfaces and audio effect JNI.

Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class
to implement more specific JAVA classes to control audio effects from JAVA applications.

Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
2010-06-11 06:26:31 -07:00
Andreas Huber
2dabef2f4e am 627a0019: am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages. 2010-06-10 16:13:37 -07:00
Andreas Huber
422c5a1408 am 566e64af: am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 16:13:24 -07:00
Andreas Huber
6ee780de7f am 960a0ff1: am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 16:13:11 -07:00
Andreas Huber
4d61f602bf Switch stagefright's approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
Change-Id: If8185ba329ce8b6663b1ad39a4efb0ad3be81df2
2010-06-10 15:16:57 -07:00
Andreas Huber
fbdb5f1bb6 Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 15:15:43 -07:00
Andreas Huber
c81d2c12de Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 15:15:29 -07:00