summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of ↵Andreas Huber2010-09-015-2/+77
|\ | | | | | | | | | | | | | | | | rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70' * commit 'fd0eed007d99178092ede56ec2c4799046615f70': 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.
| * am a2511da9: Merge "Better support for buffered streaming of rtsp content, ↵Andreas Huber2010-09-015-2/+77
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Merge "Better support for buffered streaming of rtsp content, if buffer ↵Andreas Huber2010-09-015-2/+77
| | |\ | | | | | | | | | | | | drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
| | | * Better support for buffered streaming of rtsp content, if buffer drops below ↵Andreas Huber2010-09-015-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a certain threshold we will temporarily pause playback until we have sufficient data. Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad related-to-bug: 2556656
* | | | am 3fd01c4d: am d3c1bae4: Merge "Make sure that if initialization fails, ↵James Dong2010-09-011-4/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSource still behaves well." into gingerbread Merge commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6' * commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6': Make sure that if initialization fails, AudioSource still behaves well.
| * | | am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource ↵James Dong2010-09-011-4/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | still behaves well." into gingerbread Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp * commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3': Make sure that if initialization fails, AudioSource still behaves well.
| | * | Merge "Make sure that if initialization fails, AudioSource still behaves ↵James Dong2010-09-011-4/+17
| | |\ \ | | | |/ | | |/| | | | | well." into gingerbread
| | | * Make sure that if initialization fails, AudioSource still behaves well.James Dong2010-09-011-4/+17
| | | | | | | | | | | | | | | | Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
* | | | Merge "Support for auxiliary video parameters."Nipun Kwatra2010-09-012-13/+90
|\ \ \ \
| * | | | Support for auxiliary video parameters.Nipun Kwatra2010-09-012-13/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for passing width, height and video bitrate for the auxiliary video. Also setting encoder level depending on the video size and bitrate. Change-Id: I4a90046853f67287c3e7e6babc75b4827f0c3e73
* | | | | Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""Jamie Gennis2010-09-017-238/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.
* | | | | Merge "Add the new Stagefright ANativeWindow OMX codec API."Jamie Gennis2010-09-017-4/+238
|\ \ \ \ \
| * | | | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-017-4/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines the two OMX_SetParameter calls that enable OMX codecs to interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and OMXNodeInstance classes to use these new APIs. Change-Id: Ibfbf893dc3513db0b3d3221bec5708c77287cddc
* | | | | | am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code ↵Andreas Huber2010-09-011-0/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent with rtsp changes." into gingerbread Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96' * commit '47f2cf620731226a9311db0f864a4e1404e54b96': Keep gtalk video chat specific code consistent with rtsp changes.
| * | | | | am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp ↵Andreas Huber2010-09-011-0/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes." into gingerbread Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp * commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942': Keep gtalk video chat specific code consistent with rtsp changes.
| | * | | | Merge "Keep gtalk video chat specific code consistent with rtsp changes." ↵Andreas Huber2010-09-011-0/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | Keep gtalk video chat specific code consistent with rtsp changes.Andreas Huber2010-09-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f3f46c2150e16b26674432e427f79c04a69cd8e
* | | | | | | am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from ↵Andreas Huber2010-09-012-5/+74
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an ADSP mpeg4 audio buffer." into gingerbread Merge commit '021a822e76ab34a6404486e23157db6b6c50ec3e' * commit '021a822e76ab34a6404486e23157db6b6c50ec3e': Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
| * | | | | | am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 ↵Andreas Huber2010-09-012-5/+74
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.Andreas Huber2010-09-012-5/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15e21eae50beb6057024ea42a7e9bf3b8d8a0603 related-to-bug: 2368598
* | | | | | | Merge "Remove setPreviewDisplay in CameraService::Client::~Client()."Wu-cheng Li2010-09-011-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove setPreviewDisplay in CameraService::Client::~Client().Wu-cheng Li2010-08-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mSurface is released in destructor and setPreviewWindow(0) is called in Client::disconnect(). setPreviewDisplay is not needed in destructor. bug:2964479 Change-Id: I329901659a2af407816c34e02f37143b28183a89
* | | | | | | | am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume ↵Eric Laurent2010-08-313-15/+54
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control." into gingerbread Merge commit '55e7937462d107b469a58651d3d51e15086f8e9e' * commit '55e7937462d107b469a58651d3d51e15086f8e9e': Audio Effects: fix problems in volume control.
| * | | | | | | am f560ceab: Merge "Audio Effects: fix problems in volume control." into ↵Eric Laurent2010-08-313-15/+54
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'f560ceabe11b4f541c568bead61a5ec8f527151c' into gingerbread-plus-aosp * commit 'f560ceabe11b4f541c568bead61a5ec8f527151c': Audio Effects: fix problems in volume control.
| | * | | | | | Audio Effects: fix problems in volume control.Eric Laurent2010-08-313-15/+54
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP ↵Andreas Huber2010-08-314-6/+345
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packet type, AAC-lbr and AAC-hbr." into gingerbread Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f' * commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f': Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
| * | | | | | am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, ↵Andreas Huber2010-08-314-6/+345
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and ↵Andreas Huber2010-08-314-6/+345
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | AAC-hbr." into gingerbread
| | | * | | | | Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.Andreas Huber2010-08-314-6/+345
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8 related-to-bug: 2556656
* | | | | | | am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - ↵Andreas Huber2010-08-312-43/+67
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread Merge commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf' * commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf': Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
| * | | | | | am 99fa510e: Merge "Better detection of connection problems - timeout if no ↵Andreas Huber2010-08-312-43/+67
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | Merge "Better detection of connection problems - timeout if no rtcp packets ↵Andreas Huber2010-08-312-43/+67
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arrive within a certain time, not a final frame (which may take longer)" into gingerbread
| | | * | | | | Better detection of connection problems - timeout if no rtcp packets arrive ↵Andreas Huber2010-08-312-43/+67
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | within a certain time, not a final frame (which may take longer) Change-Id: I3c1ae79bb9342770e959ebdcdc6b748549b76330 related-to-bug: 2556656
* | | | | | | Merge "MTP: Send an Intent after an MTP session that resulted in media ↵Mike Lockwood2010-08-312-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | database modifications"
| * | | | | | | MTP: Send an Intent after an MTP session that resulted in media database ↵Mike Lockwood2010-08-312-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modifications Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the ↵James Dong2010-08-311-1/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "record" utility" into gingerbread Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a' * commit 'aa40b834985023642b30fa2e0563c414a994bd3a': Add some encoding parameters for the "record" utility
| * | | | | | am 6aacad66: Merge "Add some encoding parameters for the "record" utility" ↵James Dong2010-08-311-1/+19
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp * commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca': Add some encoding parameters for the "record" utility
| | * | | | | Add some encoding parameters for the "record" utilityJames Dong2010-08-311-1/+19
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | - TODO: remove some of the hard coded values Change-Id: Ib58bbb8af45fd102176ac49da0a71613a12fa5fc
* | | | | | Added VideoSourceDownSamplerNipun Kwatra2010-08-313-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Added setAuxiliaryOutputFile to MediaRecorder and JNINipun Kwatra2010-08-317-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added setAuxiliaryOutputFile to allow setting of an auxiliary output file. Also added the JNI support. Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
* | | | | | Adding support for parallel recording sessions.Nipun Kwatra2010-08-313-36/+198
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | am 1577e629: am 12006013: fixedfft: Only includes cpu-features.h when ↵Chia-chi Yeh2010-08-311-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __arm__ is defined. Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1' * commit '1577e629866b2700e31c9467478e05ebffcc69a1': fixedfft: Only includes cpu-features.h when __arm__ is defined.
| * | | | am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.Chia-chi Yeh2010-08-301-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp * commit '12006013cc2cd0a076855ed068f5f782b24631c3': fixedfft: Only includes cpu-features.h when __arm__ is defined.
| | * | | fixedfft: Only includes cpu-features.h when __arm__ is defined.Chia-chi Yeh2010-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb6c03b38eff3c94a507ceb5043fcc48b364c25c
* | | | | Merge "Make sure we only reallocate buffers on a genuine port definition ↵Andreas Huber2010-08-311-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | change."
| * | | | | Make sure we only reallocate buffers on a genuine port definition change.Andreas Huber2010-08-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I434be98700e5d9333f75a3a9a8c78f1acc7e7247 related-to-bug: 2953523
* | | | | | am 03e83d4a: am 68ae91cb: Merge "Recent changes to the rtsp code require ↵Andreas Huber2010-08-301-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed ↵Andreas Huber2010-08-301-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Merge "Recent changes to the rtsp code require every buffer fed to the ↵Andreas Huber2010-08-301-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
| | | * | | | Recent changes to the rtsp code require every buffer fed to the packet ↵Andreas Huber2010-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder. Change-Id: Ib8615ce5a89a9a846ee2f9f96cdfb23462f72c7a
generated by cgit v1.1 at 2024-09-29 07:02:33 +0000