2396 Commits

Author SHA1 Message Date
Andreas Huber
0e8e269d29 am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.
Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'

* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
  Fix software avc encoder crash at EOS.
2010-08-12 16:20:56 -07:00
Andreas Huber
73af0a9211 am 72ac1f26: Fix software avc encoder crash at EOS.
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp

* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
  Fix software avc encoder crash at EOS.
2010-08-12 16:18:19 -07:00
Andreas Huber
72ac1f26d7 Fix software avc encoder crash at EOS.
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
2010-08-12 16:14:29 -07:00
James Dong
465206940a am b408f549: am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes
Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf'

* commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf':
  Add lost preview surface detection in the JNI layer
2010-08-12 13:30:57 -07:00
Andreas Huber
08c96ec7f5 am 3bf8c342: am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread
Merge commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203'

* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
  Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
2010-08-12 13:28:39 -07:00
Andreas Huber
53fb14ff8e am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread
Merge commit '53895c6a0e8ecb4e835aab7eca7480779c224356'

* commit '53895c6a0e8ecb4e835aab7eca7480779c224356':
  APacketSource is too verbose.
2010-08-12 13:28:34 -07:00
James Dong
9e9cd8865b am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for encoding
Merge commit '8473db025423632d1145d895fe74af0e976efac4'

* commit '8473db025423632d1145d895fe74af0e976efac4':
  Don't send late frames to software encoders for encoding
2010-08-12 13:28:23 -07:00
James Dong
b408f5490b am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes
Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp

* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
  Add lost preview surface detection in the JNI layer
2010-08-12 13:16:56 -07:00
Andreas Huber
3bf8c3427f am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp

* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
  Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
2010-08-12 13:14:37 -07:00
Andreas Huber
53895c6a0e am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread
Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp

* commit '66aa0f3d950f7f842327b47592baa920e855925c':
  APacketSource is too verbose.
2010-08-12 13:14:33 -07:00
James Dong
8473db0254 am 708ec39c: Don\'t send late frames to software encoders for encoding
Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp

* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
  Don't send late frames to software encoders for encoding
2010-08-12 13:14:19 -07:00
James Dong
d790c6485a Add lost preview surface detection in the JNI layer
Throws an IOException if this happens rather than crashes

Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
2010-08-12 11:59:56 -07:00
Andreas Huber
ae3a1f4595 Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread 2010-08-12 11:02:17 -07:00
Andreas Huber
66aa0f3d95 Merge "APacketSource is too verbose." into gingerbread 2010-08-12 11:02:06 -07:00
Andreas Huber
00237b79a0 Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Change-Id: I7cc468a3095537347d86803579001458b62fcadb
2010-08-12 10:58:24 -07:00
James Dong
708ec39c21 Don't send late frames to software encoders for encoding
o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
2010-08-12 10:40:58 -07:00
James Dong
e63cccf006 am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'

* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
  Handle large audio lost
2010-08-12 10:22:58 -07:00
James Dong
387c9ff704 am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'

* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:22:48 -07:00
James Dong
8aa244eab7 am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp

* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
  Handle large audio lost
2010-08-12 10:12:28 -07:00
James Dong
f4e26da1af am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp

* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:12:21 -07:00
James Dong
45cb3cfacf Merge "Handle large audio lost" into gingerbread 2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8 Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 2010-08-12 10:07:38 -07:00
James Dong
aa56ede879 am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c'

* commit '0386d04b19619b03b6bce830010e11d31d3f8a5c':
  Fix all fd leaks in authoring engine
2010-08-12 09:32:18 -07:00
James Dong
0386d04b19 am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp

* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
  Fix all fd leaks in authoring engine
2010-08-12 09:22:17 -07:00
James Dong
581581fe1a Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Andreas Huber
3f55576e04 APacketSource is too verbose.
Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
2010-08-12 09:07:20 -07:00
James Dong
c6280bce51 Fix all fd leaks in authoring engine
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
2010-08-11 17:18:30 -07:00
James Dong
7ae08a6d79 Fix a crash due to unnecessary check on the codec config data for H263 video track
Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
2010-08-11 15:58:59 -07:00
Nipun Kwatra
196fc9279d Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true case." 2010-08-11 14:17:19 -07:00
Andreas Huber
6b63dce8c9 am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '136d8336b6cb18067cd783185dacef34ae785519'

* commit '136d8336b6cb18067cd783185dacef34ae785519':
  This code in CameraSource really should hold the lock.
2010-08-11 13:32:36 -07:00
Andreas Huber
136d8336b6 am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
  This code in CameraSource really should hold the lock.
2010-08-11 13:28:51 -07:00
Andreas Huber
90d1d10427 Merge "This code in CameraSource really should hold the lock." into gingerbread 2010-08-11 13:20:59 -07:00
Andreas Huber
22bd242478 This code in CameraSource really should hold the lock.
Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
2010-08-11 12:34:32 -07:00
Yu Shan Emily Lau
e381c4bc39 am 1ded9f95: am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit '1ded9f95636a83298658bfcd840ae8e51127c714'

* commit '1ded9f95636a83298658bfcd840ae8e51127c714':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
2010-08-10 21:53:54 -07:00
Yu Shan Emily Lau
1ded9f9563 am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp

* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
2010-08-10 20:09:24 -07:00
Yu Shan Emily Lau
fd4a7c83b2 Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
2010-08-10 20:02:07 -07:00
James Dong
afe5305855 Handle large audio lost
Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
2010-08-10 19:59:04 -07:00
Nipun Kwatra
c44cf62703 Call startPreview after stopping for mUseStillCameraForTimeLapse=true case.
In the case when stop is pressed after takePicture has been called
but the CAMERA_MSG_COMPRESSED_IMAGE message from camera has not yet
been received, preview was not getting restarted. The reason was that
CameraSource::stop sets the camera listener to NULL and hence the
dataCallback() function which handles the CAMERA_MSG_COMPRESSED_IMAGE
message and restarts preview never got called.

Change-Id: Ib8f3bb77d9eab1ed5a67798569025ea0d63d7fd4
2010-08-10 18:57:09 -07:00
Andreas Huber
a774765686 am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread
Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'

* commit 'd35498f6062410e777d6ad41a720db32336e2089':
  Remove some obsolete code.
2010-08-10 14:21:32 -07:00
Andreas Huber
d35498f606 am 1a140bf6: Merge "Remove some obsolete code." into gingerbread
Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp

* commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
  Remove some obsolete code.
2010-08-10 14:15:11 -07:00
Andreas Huber
6fa131105d Remove some obsolete code.
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
2010-08-10 13:48:53 -07:00
James Dong
c3f20251eb am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609'

* commit 'b9ddd779ae547b020764b89a0cbd96d589717609':
  Add input buffer size check for software video encoders
2010-08-10 13:32:40 -07:00
James Dong
b9ddd779ae am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp

* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
  Add input buffer size check for software video encoders
2010-08-10 13:28:56 -07:00
James Dong
10ed3f7438 Merge "Add input buffer size check for software video encoders" into gingerbread 2010-08-10 13:27:09 -07:00
Andreas Huber
3965148396 am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea
Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'

* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:04:42 -07:00
Andreas Huber
4dc41bb445 am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp

* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:01:58 -07:00
Andreas Huber
18f0174ff4 Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread 2010-08-10 12:59:27 -07:00
Nipun Kwatra
f5e9018b80 Merge "use usleep instead of sleep." 2010-08-10 12:22:13 -07:00
Mike Lockwood
e75504d2c7 Merge "MTP: Fix wrong delete operator from previous change." 2010-08-10 12:13:23 -07:00
Mike Lockwood
33ea5a4e86 MTP: Fix wrong delete operator from previous change.
Change-Id: I64e8fdc610495f21060727b6bed42d1584833405
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 15:11:32 -04:00