Commit Graph

3473 Commits

Author SHA1 Message Date
James Dong
b6ecd6c923 am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into gingerbread
Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff'

* commit '40d9f0105f0a8f484724619154b18c5d85589eff':
  Fixed the software AAC encoder
2010-06-24 09:50:11 -07:00
James Dong
7fd22aab45 Merge "Fixed the software AAC encoder" into gingerbread 2010-06-24 09:46:48 -07:00
Andreas Huber
15149f2ef8 am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd'

* commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
2010-06-24 09:08:21 -07:00
Andreas Huber
a2549bb644 Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread 2010-06-24 09:05:08 -07:00
James Dong
438e4f62ad Fixed the software AAC encoder
Make sure that each input frame contains at least 1024 samples, as
required by the AAC encoder, and fix the incorrect timestamp.

Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
2010-06-23 17:12:11 -07:00
Andreas Huber
8d65dd2653 Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
2010-06-23 16:40:57 -07:00
James Dong
7d77a0ac89 am 90ade3f2: am 9afc1b3e: Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719'

* commit '90ade3f25d16afe8fd64ec1fcc5fede466256719':
  Fixed some meta data issues in the recorded mp4 file
2010-06-23 15:18:45 -07:00
James Dong
9afc1b3ed3 Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread 2010-06-23 15:13:55 -07:00
James Dong
39a0b21c65 Fixed some meta data issues in the recorded mp4 file
- Mainly correcting the location of stbl box which should be a child of minf box.
  This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC.

- Enabled the the recorded tracks by setting the flags to 0x07 by default

- Allows for encoding either 32-bit or 64-bit offsets. By default encoding
  32-bit offsets to reduce the metadata overhead

- Fixed a edts box issue where an empty elst box was used at the end

Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
2010-06-23 14:09:18 -07:00
Andreas Huber
230f5c1cfb am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97'

* commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
2010-06-23 13:23:24 -07:00
Andreas Huber
58e9402b12 Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread 2010-06-23 13:14:16 -07:00
Andreas Huber
565879dc86 am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Merge commit '800af39038dcded12b66eccb8932a761e20b1976'

* commit '800af39038dcded12b66eccb8932a761e20b1976':
  Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
2010-06-23 13:12:16 -07:00
Eric Laurent
c6a2cb0b5a am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177'

* commit '845f541454d1fa9f328c0b0bf79acf2fba363177':
  Added support for audio sessions in MediaPlayer and AudioTrack.
2010-06-23 12:41:23 -07:00
Chia-chi Yeh
c19d494d48 am da9269af: am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
Merge commit 'da9269af5e94e25c142c519429aa77eb40f68e58'

* commit 'da9269af5e94e25c142c519429aa77eb40f68e58':
  media: add AudioRecord::getMinFrameCount().
2010-06-23 12:40:34 -07:00
Eric Laurent
79ec54789d am 7d329785: am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
Merge commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f'

* commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.
2010-06-23 12:40:28 -07:00
Andreas Huber
fb41d59595 Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d
related-to-bug: 2639116
2010-06-23 11:33:43 -07:00
Andreas Huber
b64af9a221 Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352
related-to-bug: 2667479
2010-06-23 11:11:58 -07:00
James Dong
84d000e3c4 am 9666d3c0: am 750600a1: Merge "Single track optimization" into gingerbread
Merge commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698'

* commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698':
  Single track optimization
2010-06-23 10:32:53 -07:00
Andreas Huber
9b1c2a50d2 am 6adf0c4d: am ef1c48d6: Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
Merge commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296'

* commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296':
  Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
2010-06-23 10:31:50 -07:00
James Dong
fc667dabcf am 06967683: am e5671bfe: Merge "Audio/video sync during recording (second part)" into gingerbread
Merge commit '0696768374567afa4fe58c2ef0af948b72e83e5d'

* commit '0696768374567afa4fe58c2ef0af948b72e83e5d':
  Audio/video sync during recording (second part)
2010-06-23 10:31:36 -07:00
James Dong
6bab6cebdc am d076b590: am 875500b4: Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore\'s code" into gingerbread
Merge commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b'

* commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b':
  AmrInputStream refresh: eliminate the dependency upon OpenCore's code
2010-06-23 10:30:07 -07:00
Eric Laurent
2c2ce8e53f Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread 2010-06-22 18:29:57 -07:00
Chia-chi Yeh
3238302b18 Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread 2010-06-22 17:20:44 -07:00
Eric Laurent
619346f902 Added support for audio sessions in MediaPlayer and AudioTrack.
Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.

Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
2010-06-22 17:14:04 -07:00
Eric Laurent
d1559d6b2d Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread 2010-06-22 17:08:55 -07:00
Chia-chi Yeh
97d61f7518 media: add AudioRecord::getMinFrameCount().
Change-Id: I952071ab10aa49aa96b727d157b68470d69fff3d
2010-06-23 08:01:04 +08:00
Eric Laurent
3c652ca5a5 Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.
Use setParameters() API to indicate to audio HAL that we are restarting the media server after a crash.
The use made by audio HAL implementation of this indication is platform specific.

Change-Id: I085b174fa1474575da0e4d295921079b6b68efb8
2010-06-22 16:53:47 -07:00
Mike Lockwood
42dbfa51ae MTP: Use a fd instead of a file path in file transfer ioctls.
This restricts the driver to the client's permissions when copying files
to avoid potential security problems.

Change-Id: I9b3151168d334fe4374875804d4ba82bef44db3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 16:38:01 -04:00
Mike Lockwood
dff6e6e378 mtptest: Add option to specify storage path at the command line.
Change-Id: Iac8a34ffb8177018a9164b3f2f97b2e84c3d8f1c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 16:37:56 -04:00
James Dong
b54a917842 Single track optimization
We don't need to do interleave when the total number of tracks to be recorded is one.
Metadata-wise, we only need to have one chunk in chunk offset table, and a
single entry in the stsc table.

Change-Id: I46f0e4b3860620311e7a91b68a9067acaa137bb2
2010-06-22 11:27:37 -07:00
Andreas Huber
ef1c48d6a9 Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread 2010-06-22 10:11:15 -07:00
James Dong
e5671bfe51 Merge "Audio/video sync during recording (second part)" into gingerbread 2010-06-22 10:05:02 -07:00
Andreas Huber
a486754053 Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
Change-Id: I7d022ac494e1cecdd7f656806b7ed45979c02840
2010-06-22 09:54:58 -07:00
James Dong
875500b47a Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore's code" into gingerbread 2010-06-21 17:35:27 -07:00
James Dong
36e573bf7d Audio/video sync during recording (second part)
Change-Id: Iba0b35f57fdeac7ee1da16899406bf4b957a2c8c
2010-06-21 17:34:01 -07:00
Chia-chi Yeh
f23729a0e3 am d9e9132e: am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount().
Merge commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d'

* commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d':
  media: add AudioTrack::getMinFrameCount().
2010-06-21 10:16:45 -07:00
Chia-chi Yeh
2ce999fce7 am bd240c27: media: add AudioTrack::getMinFrameCount().
Merge commit 'bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread

* commit 'bd240c2737913d6ed1982788699f93bbc52330c0':
  media: add AudioTrack::getMinFrameCount().
2010-06-21 08:54:19 -07:00
Chia-chi Yeh
bd240c2737 media: add AudioTrack::getMinFrameCount().
Change-Id: If15162583d1d16d89f59be0793106afe77417f35
2010-06-21 09:51:18 +08:00
James Dong
49b6fbaebd AmrInputStream refresh: eliminate the dependency upon OpenCore's code
Change-Id: I0e66bc0a16fcdcf70136012ae1cd4138506cc94b
2010-06-18 18:56:54 -07:00
The Android Open Source Project
d398e7a493 merge from open-source master
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
2010-06-18 11:36:35 -07:00
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