2184 Commits

Author SHA1 Message Date
James Dong
d6fd133d18 am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
  Not all audio source has the drift time information
2010-09-03 15:45:01 -07:00
James Dong
9077f8ec93 Merge "Not all audio source has the drift time information" into gingerbread 2010-09-03 15:42:09 -07:00
Andreas Huber
8e11c82247 am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.
Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp

* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
  Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
2010-09-03 14:50:18 -07:00
Andreas Huber
9fee0b2a02 Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a
related-to-bug: 2974691
2010-09-03 14:31:50 -07:00
Andreas Huber
af7a7c34e0 am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp

* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
  Properly buffer a certain amount of data on streaming sources before finishing prepare().
2010-09-03 13:48:43 -07:00
Andreas Huber
cc4a38c60f Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread 2010-09-03 13:46:02 -07:00
Andreas Huber
87ab9cdd0f Properly buffer a certain amount of data on streaming sources before finishing prepare().
Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207
related-to-bug: 2875110
2010-09-03 13:44:42 -07:00
James Dong
3caa71483f Not all audio source has the drift time information
Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
2010-09-03 12:01:55 -07:00
James Dong
bc1452a307 am 7755cdd6: Remove unused/debugging code from MP4 file writer
Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp

* commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
  Remove unused/debugging code from MP4 file writer
2010-09-03 11:33:47 -07:00
James Dong
7755cdd696 Remove unused/debugging code from MP4 file writer
o also makes nal length in the recorded file modifiable at runtime

Change-Id: I731b4dde7070d8d9628b36b523a5b2c011c7c2cf
2010-09-03 10:13:19 -07:00
James Dong
3c3fc97e10 am 46e63b34: Merge "Better file size estimate" into gingerbread
Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp

* commit '46e63b346770efa14451b8e67b7f7636c4e5a76c':
  Better file size estimate
2010-09-03 09:55:38 -07:00
James Dong
cb7e65c6cb Better file size estimate
When the recorded file becomes large, the metadata size can
no longer be ignored. This makes it possible to save the
recorded file when the storage becomes almost full at the
end of the recording session.

Change-Id: Ief038080f825c9946ce550949c03e914aec1e31a
2010-09-02 20:10:00 -07:00
James Dong
bb64e554d9 am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit '7ed7668b30e70ca8e3f0f183364433326ed29f39' into gingerbread-plus-aosp

* commit '7ed7668b30e70ca8e3f0f183364433326ed29f39':
  Calculate audio media drift time from AudioSource
2010-09-02 18:41:49 -07:00
James Dong
4c23815c39 Calculate audio media drift time from AudioSource
The problem was that the time to receive an output buffer
from an audio encoder is different because the encoder does not
need to read from the source for all output buffers. This leads
to large fluctuation in terms of wall clock duration between two
neighboring audio sample outputs from the audio encoder. As a
result, the media time for the video track after adjustment using
the drifting changes wildly sometimes.

This patch addresses this issue by only updating the media drift
time when an audio source input buffer is read. the wall clock
for the audio track is also calculated at the same time when
the input audio buffer is read at AudioSource.

bug - 2959800

Change-Id: I3174aa182f744784b540f0a7198524d4eee8bd7b
2010-09-01 20:45:39 -07:00
Andreas Huber
fd0eed007d am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp

* commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
  Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
2010-09-01 15:56:31 -07:00
James Dong
3fd01c4da9 am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp

* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
  Make sure that if initialization fails, AudioSource still behaves well.
2010-09-01 15:56:25 -07:00
Andreas Huber
a2511da9d6 Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 2010-09-01 15:44:46 -07:00
James Dong
d3c1bae4eb Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 2010-09-01 15:41:10 -07:00
Andreas Huber
4d8f66bce3 Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
2010-09-01 15:05:28 -07:00
James Dong
a87544b35f Make sure that if initialization fails, AudioSource still behaves well.
Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
2010-09-01 14:11:28 -07:00
Andreas Huber
71c908c475 am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp

* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
  Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
2010-09-01 13:57:44 -07:00
Andreas Huber
6c33904ad9 Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread 2010-09-01 13:54:12 -07:00
Andreas Huber
47f2cf6207 am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp

* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
  Keep gtalk video chat specific code consistent with rtsp changes.
2010-09-01 13:42:46 -07:00
Andreas Huber
412fc7cdb6 Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread 2010-09-01 13:39:27 -07:00
Andreas Huber
8d7d413959 Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
2010-09-01 13:27:14 -07:00
Andreas Huber
021a822e76 am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
Merge commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp

* commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d':
  Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
2010-09-01 13:03:27 -07:00
Andreas Huber
4dcc6a1020 Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
Change-Id: I15e21eae50beb6057024ea42a7e9bf3b8d8a0603
related-to-bug: 2368598
2010-09-01 12:25:36 -07:00
Andreas Huber
27b9c8ec16 Keep gtalk video chat specific code consistent with rtsp changes.
Change-Id: I5f3f46c2150e16b26674432e427f79c04a69cd8e
2010-09-01 09:27:47 -07:00
Eric Laurent
55e7937462 am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread
Merge commit 'f560ceabe11b4f541c568bead61a5ec8f527151c' into gingerbread-plus-aosp

* commit 'f560ceabe11b4f541c568bead61a5ec8f527151c':
  Audio Effects: fix problems in volume control.
2010-08-31 15:46:41 -07:00
Eric Laurent
a92ebfa1cd Audio Effects: fix problems in volume control.
- Fixed click when re-enabling effect during the turn off phase:
make sure the effect states where effect is processed are the same
where volume control is delegated to effect.
- Fixed click when effect is deleted while still active: do not apply
volume ramp if an effect having volume control was just removed from the
effect chain.

Also fixed a crash when PCM dump is enabled in effect bundle wrapper.

Change-Id: Ib562f5cf75c69af75df0e862536262e2514493e4
2010-08-31 15:26:23 -07:00
Andreas Huber
6b52911cc7 am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
Merge commit '48ac68e1b117b6b55f06daced7d9d5d550853306' into gingerbread-plus-aosp

* commit '48ac68e1b117b6b55f06daced7d9d5d550853306':
  Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
2010-08-31 14:57:56 -07:00
Andreas Huber
48ac68e1b1 Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread 2010-08-31 14:54:37 -07:00
Andreas Huber
e1a3cddd94 am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread
Merge commit '99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp

* commit '99fa510e67cb973b45fc216c75bdc817421e14ae':
  Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
2010-08-31 14:45:07 -07:00
Andreas Huber
e536f800c6 Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8
related-to-bug: 2556656
2010-08-31 14:25:36 -07:00
Andreas Huber
3a48d4d726 Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
Change-Id: I3c1ae79bb9342770e959ebdcdc6b748549b76330
related-to-bug: 2556656
2010-08-31 11:13:51 -07:00
Chia-chi Yeh
1577e62986 am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp

* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
  fixedfft: Only includes cpu-features.h when __arm__ is defined.
2010-08-30 22:06:39 -07:00
Chia-chi Yeh
12006013cc fixedfft: Only includes cpu-features.h when __arm__ is defined.
Change-Id: Ifb6c03b38eff3c94a507ceb5043fcc48b364c25c
2010-08-31 12:56:01 +08:00
Andreas Huber
03e83d4ad9 am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Merge commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp

* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
  Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
2010-08-30 16:16:03 -07:00
Andreas Huber
68ae91cbd2 Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread 2010-08-30 16:12:46 -07:00
Andreas Huber
0ddf8c09f9 Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
Change-Id: Ib8615ce5a89a9a846ee2f9f96cdfb23462f72c7a
2010-08-30 16:08:03 -07:00
Andreas Huber
987556bc9b am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
Merge commit 'abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp

* commit 'abb8398e5ab40a3078902c5333126a0743ba2458':
  Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
2010-08-30 15:46:58 -07:00
Andreas Huber
f88ca7a033 Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
Change-Id: Ie8d6a3865a0477e28d4b76bb9038e468451287b1
related-to-bug: 2556656
2010-08-30 15:25:35 -07:00
Andreas Huber
9aa05ec2cd am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:06:55 -07:00
Andreas Huber
681c5ff208 Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 2010-08-30 13:04:21 -07:00
Andreas Huber
30cfa20dfc Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3
related-to-bug: 2370115
2010-08-30 12:46:12 -07:00
Eric Laurent
5762dc1983 am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
  LVM release 1.07 delivery.
2010-08-30 12:33:56 -07:00
Andreas Huber
7ed9104c3a am f6639c46: Finetune some rtsp timeout constants.
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
  Finetune some rtsp timeout constants.
2010-08-30 12:33:25 -07:00
Andreas Huber
6df6d60681 am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
  ALoopers can now be named (useful to distinguish threads).
2010-08-30 12:33:08 -07:00
Eric Laurent
858bb4f66e Merge "LVM release 1.07 delivery." into gingerbread 2010-08-30 11:39:34 -07:00
Andreas Huber
f6639c46e8 Finetune some rtsp timeout constants.
Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
2010-08-30 10:35:56 -07:00