2576 Commits

Author SHA1 Message Date
Nipun Kwatra
06a1d619aa Added VideoSourceDownSampler
VideoSourceDownSampler takes in a real video source. The MediaSource
interface is then implemented by shortcircuiting calls to this real source,
except for the read() function. For read we first call read of the real
source, then downsample the frame to the desired size and return that.

Change-Id: I6e1b377e043e136a70a7b03792eb9165bbe26398
2010-08-31 10:38:49 -07:00
Nipun Kwatra
b33a5aea13 Added setAuxiliaryOutputFile to MediaRecorder and JNI
added setAuxiliaryOutputFile to allow setting of an auxiliary output file.
Also added the JNI support.

Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
2010-08-31 10:38:49 -07:00
Nipun Kwatra
d7e7a3f98f Adding support for parallel recording sessions.
- Added setOutputFileAuxiliary to pass the auxiliary file descriptor. The java
interface through JNI will be checked in next.

- renamed setupCameraSource to setupCamera as the function just sets the camera.
- Added setupCameraSource which sets up the camera source. This functionality
  was in setupVideoEncoder before.
- setupVideoEncoder now takes in a cameraSource instead of creating it on it
  own.

- Refactored startMPEG4Recording() to use setupMPEG4Recording,
  setupMPEG4MetaData.
    - setupMPEG4Recording() takes in file descriptor, bitrates to setup a mpeg4
      writer. This function can be called multiple times to setup multiple
      writers.
    - Added setupMPEG4MetaData() for setting up the meta data for mpeg4 writer.
  startMPEG4Recording() now calls setupMPEG4Recording, setupMPEG4MetaData for
  each recording session.

Change-Id: I07f5334a1ff8e12a36f58e94129fcfa6add2208b
2010-08-31 10:38:49 -07:00
Chia-chi Yeh
2deeff1156 am 1577e629: am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1'

* commit '1577e629866b2700e31c9467478e05ebffcc69a1':
  fixedfft: Only includes cpu-features.h when __arm__ is defined.
2010-08-31 10:10:20 -07:00
Andreas Huber
c855deba16 Merge "Make sure we only reallocate buffers on a genuine port definition change." 2010-08-31 09:09:27 -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
29c03c6e7d Make sure we only reallocate buffers on a genuine port definition change.
Change-Id: I434be98700e5d9333f75a3a9a8c78f1acc7e7247
related-to-bug: 2953523
2010-08-30 16:23:15 -07:00
Andreas Huber
47416bc4f9 am 03e83d4a: 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 '03e83d4ad909f5c07fb2011e03348a413453e909'

* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
  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:19:55 -07: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
6924563868 am 987556bc: 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 '987556bc9bc1a61415b6e65bd600b8daf5b24d30'

* commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30':
  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 16:02:26 -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
2527da00e2 am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'

* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:30:35 -07:00
Eric Laurent
9d01dcbdf2 am 5762dc19: am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
Merge commit '5762dc19836e332d3ac1906e5698088a128b362d'

* commit '5762dc19836e332d3ac1906e5698088a128b362d':
  LVM release 1.07 delivery.
2010-08-30 13:30:14 -07:00
Andreas Huber
3678668997 am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.
Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
  Finetune some rtsp timeout constants.
2010-08-30 13:30:05 -07:00
Andreas Huber
631025eec0 am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
  ALoopers can now be named (useful to distinguish threads).
2010-08-30 13:29:51 -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
Mike Lockwood
5367ab6aab MTP: Move all MTP protocol constants for Java to a central location.
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 13:35:03 -04:00
Andreas Huber
df992ac9cc Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 2010-08-30 10:28:24 -07:00
Mike Lockwood
daeeddc5ed MTP: Fix build break due to misuse of "git add -i" command
Change-Id: I85528a43a56942dde921603a353383e2c8f8d93d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 12:26:08 -04:00
Mike Lockwood
af2ba835f5 Merge "MTP: Add try/finally handling to finalize overrides" 2010-08-30 08:59:21 -07:00
Mike Lockwood
dbead321da MTP: Add try/finally handling to finalize overrides
Change-Id: I23c481d6214ed5f045f903845632c07c11bb42a3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 09:27:55 -04:00
Nipun Kwatra
453f2ef14a Merge "client_id->clientId, bugfix for signaling of read abort on stop." 2010-08-27 18:21:30 -07:00
Nipun Kwatra
ea434daf19 client_id->clientId, bugfix for signaling of read abort on stop.
- changed client_id->clientId, mClient_id->mClientId
- there was a bug in the condition for calling
  signalReadComplete_lock() in stop. We should call it only when
  !mLastReadCompleted and also if the current client has not already
  completed its read (this second check was missing before).

Change-Id: I9a57cf6b5c6f3260883a6c74d0c7b22f675c422e
2010-08-27 18:19:22 -07:00
James Dong
206bf9df48 am a5fe77d0: am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread
Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc'

* commit 'a5fe77d004091bd9521d087c2572f587191afbfc':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
2010-08-27 18:10:01 -07:00
James Dong
c6ff7a9189 am 7d3ff384: am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
Merge commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7'

* commit '7d3ff3849c830f0136c692b6074f1ba5da288fe7':
  Suppress the video recording start signal
2010-08-27 18:09:37 -07:00
Andreas Huber
8abd4256f3 am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread
Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'

* commit '05c1cadaeaf272a70acc889bfccd607648058470':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
2010-08-27 18:09:31 -07:00
Andreas Huber
84ecebb922 am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'

* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
  We accidentally always aborted after 10 secs, even if the connection was fine.
2010-08-27 18:09:21 -07:00
Andreas Huber
c4e0b70a21 ALoopers can now be named (useful to distinguish threads).
Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
2010-08-27 15:21:07 -07:00
James Dong
a5fe77d004 am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread
Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp

* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
2010-08-27 14:36:02 -07:00
James Dong
90862e2a8b Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
is occasionally too small.

bug - 2882917

Change-Id: Id59d8529084c5689a26f272e0cd3b1e955fd8a30
2010-08-27 13:59:26 -07:00
James Dong
7d3ff3849c am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp

* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
  Suppress the video recording start signal
2010-08-27 13:48:48 -07:00
Nipun Kwatra
cf66e47ddd Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
James Dong
b86365ad74 Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 2010-08-27 13:47:06 -07:00
Nipun Kwatra
f83cba77b6 Added MediaSourceSplitter to split single source to multiple ones.
MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.

Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
2010-08-27 13:46:41 -07:00
Andreas Huber
05c1cadaea am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread
Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp

* commit '577615c98e390f8417e07844d04304eac5b0e911':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
2010-08-27 13:46:19 -07:00
Andreas Huber
e25e03612e am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.
2010-08-27 13:46:14 -07:00
Andreas Huber
eeb97d91b9 Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
Change-Id: Id491541a6ae501604cda815f8e961a3bfe26db7d
related-to-bug: 2556656
2010-08-27 13:29:08 -07:00
Eric Laurent
adecf1c1a9 LVM release 1.07 delivery.
- Virtualizer now uses the correct control parameter, instead of reverberation
- Volume smoothing for first frame has been added
- Equalizer_setParameter now returns correct error code
- Correcting Non-Linear compressor gain step noise during transitions and effect level changes
- Removed SVN header blocks
- Memory and MIPS values have been added to the API
- Reverb uses a more efficient malloc for input PCM
- Reverb DecayHFRatio now ranges up to 2000
- Logging has been removed for most volume functions

Change-Id: Ib59e7e331263c3811559231b4ae90c82e34a8421
2010-08-27 11:54:39 -07:00
Andreas Huber
d6a4004741 We accidentally always aborted after 10 secs, even if the connection was fine.
Change-Id: I3f2ae2f46ae62b84b1e253658d7182c04ee3dfae
2010-08-27 10:11:04 -07:00