summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:James Dong2010-08-122-2/+2
|\ | | | | | | | | | | | | Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f' * commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f': Mainly fix two mistakes that I made:
| * am e95d192f: Mainly fix two mistakes that I made:James Dong2010-08-122-2/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp * commit 'e95d192fae5a80ed821c53bfea214a85ea395e90': Mainly fix two mistakes that I made:
| | * Mainly fix two mistakes that I made:James Dong2010-08-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized release it would lead to crash 2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs) Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
* | | am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in ↵Mike Dodd2010-08-121-21/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | URL for gtalk playback." into gingerbread Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d' * commit '2f02044944d5c526020d4e8cceaae7e77382d56d': Support getting codec, width, and height in URL for gtalk playback.
| * | am 5f96138b: Merge "Support getting codec, width, and height in URL for ↵Mike Dodd2010-08-121-21/+29
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gtalk playback." into gingerbread Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp * commit '5f96138ba65cecf38d0c752d87ad47d931db8775': Support getting codec, width, and height in URL for gtalk playback.
| | * Merge "Support getting codec, width, and height in URL for gtalk playback." ↵Mike Dodd2010-08-121-21/+29
| | |\ | | | | | | | | | | | | into gingerbread
| | | * Support getting codec, width, and height in URL for gtalk playback.Mike Dodd2010-08-121-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format is rtsp://gtalk/codec/width/height For example: rtsp://gtalk/H263-1998/320/200 Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
* | | | am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.Andreas Huber2010-08-121-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba' * commit '73af0a9211d0c4be663d287cefd9bf35746db1ba': Fix software avc encoder crash at EOS.
| * | | am 72ac1f26: Fix software avc encoder crash at EOS.Andreas Huber2010-08-121-2/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp * commit '72ac1f26d73bd8e7645365d8d8374fac7a511263': Fix software avc encoder crash at EOS.
| | * | Fix software avc encoder crash at EOS.Andreas Huber2010-08-121-2/+0
| | |/ | | | | | | | | | Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
* | | am b408f549: am d790c648: Add lost preview surface detection in the JNI ↵James Dong2010-08-121-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | layer Throws an IOException if this happens rather than crashes Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf' * commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf': Add lost preview surface detection in the JNI layer
| * | am d790c648: Add lost preview surface detection in the JNI layer Throws an ↵James Dong2010-08-121-0/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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
| | * Add lost preview surface detection in the JNI layerJames Dong2010-08-121-0/+9
| | | | | | | | | | | | | | | | | | Throws an IOException if this happens rather than crashes Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
* | | am 3bf8c342: am ae3a1f45: Merge "Fix the h.263 assembler to properly subset ↵Andreas Huber2010-08-122-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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.
| * | am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s ↵Andreas Huber2010-08-122-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| | * Merge "Fix the h.263 assembler to properly subset a buffer's range if it ↵Andreas Huber2010-08-122-2/+2
| | |\ | | | | | | | | | | | | already has a range applied." into gingerbread
| | | * Fix the h.263 assembler to properly subset a buffer's range if it already ↵Andreas Huber2010-08-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | has a range applied. Change-Id: I7cc468a3095537347d86803579001458b62fcadb
* | | | am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbreadAndreas Huber2010-08-121-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '53895c6a0e8ecb4e835aab7eca7480779c224356' * commit '53895c6a0e8ecb4e835aab7eca7480779c224356': APacketSource is too verbose.
| * | | am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbreadAndreas Huber2010-08-121-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp * commit '66aa0f3d950f7f842327b47592baa920e855925c': APacketSource is too verbose.
| | * | Merge "APacketSource is too verbose." into gingerbreadAndreas Huber2010-08-121-1/+1
| | |\ \ | | | |/
| | | * APacketSource is too verbose.Andreas Huber2010-08-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
* | | | am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for ↵James Dong2010-08-124-2/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoding Merge commit '8473db025423632d1145d895fe74af0e976efac4' * commit '8473db025423632d1145d895fe74af0e976efac4': Don't send late frames to software encoders for encoding
| * | | am 708ec39c: Don\'t send late frames to software encoders for encodingJames Dong2010-08-124-2/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp * commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad': Don't send late frames to software encoders for encoding
| | * | Don't send late frames to software encoders for encodingJames Dong2010-08-124-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | o Document on what frames will be rejected and what frames will be accepted Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
* | | | am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbreadJames Dong2010-08-121-9/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff' * commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff': Handle large audio lost
| * | | am 45cb3cfa: Merge "Handle large audio lost" into gingerbreadJames Dong2010-08-121-9/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp * commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261': Handle large audio lost
| | * | Merge "Handle large audio lost" into gingerbreadJames Dong2010-08-121-9/+17
| | |\ \
| | | * | Handle large audio lostJames Dong2010-08-101-9/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
* | | | | am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the ↵James Dong2010-08-121-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config ↵James Dong2010-08-121-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Merge "Fix a crash due to unnecessary check on the codec config data for ↵James Dong2010-08-121-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | H263 video track" into gingerbread
| | | * | | Fix a crash due to unnecessary check on the codec config data for H263 video ↵James Dong2010-08-111-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | track Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
* | | | | am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into ↵James Dong2010-08-122-5/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c' * commit '0386d04b19619b03b6bce830010e11d31d3f8a5c': Fix all fd leaks in authoring engine
| * | | | am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbreadJames Dong2010-08-122-5/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp * commit '581581fe1addfac8913c8d4d6c88eed6ded90de4': Fix all fd leaks in authoring engine
| | * | | Merge "Fix all fd leaks in authoring engine" into gingerbreadJames Dong2010-08-122-5/+7
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix all fd leaks in authoring engineJames Dong2010-08-112-5/+7
| | | |/ | | | | | | | | | | | | Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
* | | | Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true ↵Nipun Kwatra2010-08-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | case."
| * | | | Call startPreview after stopping for mUseStillCameraForTimeLapse=true case.Nipun Kwatra2010-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 136d8336: am 90d1d104: Merge "This code in CameraSource really should ↵Andreas Huber2010-08-111-0/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hold the lock." into gingerbread Merge commit '136d8336b6cb18067cd783185dacef34ae785519' * commit '136d8336b6cb18067cd783185dacef34ae785519': This code in CameraSource really should hold the lock.
| * | | | am 90d1d104: Merge "This code in CameraSource really should hold the lock." ↵Andreas Huber2010-08-111-0/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp * commit '90d1d104272954042d5440f248980e4348e97686': This code in CameraSource really should hold the lock.
| | * | | Merge "This code in CameraSource really should hold the lock." into gingerbreadAndreas Huber2010-08-111-0/+2
| | |\ \ \
| | | * | | This code in CameraSource really should hold the lock.Andreas Huber2010-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
* | | | | | am 1ded9f95: am fbb936bf: Merge "Add the a power test case which simply do ↵Yu Shan Emily Lau2010-08-103-0/+136
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | am fbb936bf: Merge "Add the a power test case which simply do the audio ↵Yu Shan Emily Lau2010-08-103-0/+136
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Add the a power test case which simply do the audio playback. The actual ↵Yu Shan Emily Lau2010-08-103-0/+136
| | | |/ | | |/| | | | | | | | | | | | | | | | | power measurement will be done by another application. Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
* | | | am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbreadAndreas Huber2010-08-101-12/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'd35498f6062410e777d6ad41a720db32336e2089' * commit 'd35498f6062410e777d6ad41a720db32336e2089': Remove some obsolete code.
| * | | am 1a140bf6: Merge "Remove some obsolete code." into gingerbreadAndreas Huber2010-08-101-12/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp * commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5': Remove some obsolete code.
| | * | Remove some obsolete code.Andreas Huber2010-08-101-12/+0
| | |/ | | | | | | | | | Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
* | | am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software ↵James Dong2010-08-102-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | video encoders" into gingerbread Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609' * commit 'b9ddd779ae547b020764b89a0cbd96d589717609': Add input buffer size check for software video encoders
| * | am 10ed3f74: Merge "Add input buffer size check for software video encoders" ↵James Dong2010-08-102-0/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp * commit '10ed3f7438f6ae797bac32476dc61465c6484c85': Add input buffer size check for software video encoders
generated by cgit v1.1 at 2025-08-08 03:10:36 +0000