summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge "Add input buffer size check for software video encoders" into gingerbreadJames Dong2010-08-102-0/+20
| | |\
| | | * Add input buffer size check for software video encodersJames Dong2010-08-102-0/+20
| | | | | | | | | | | | | | | | Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
* | | | am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps ↵Andreas Huber2010-08-107-39/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | am 18f0174f: Merge "We\'re now going to ignore timestamps completely in ↵Andreas Huber2010-08-107-39/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Merge "We're now going to ignore timestamps completely in gtalk video ↵Andreas Huber2010-08-107-39/+61
| | |\ \ | | | | | | | | | | | | | | | 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
| | | * | We're now going to ignore timestamps completely in gtalk video conferencing, ↵Andreas Huber2010-08-107-39/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
* | | | | Merge "use usleep instead of sleep."Nipun Kwatra2010-08-101-2/+2
|\ \ \ \ \
| * | | | | use usleep instead of sleep.Nipun Kwatra2010-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor bugfix. sleep doesn't take fractional value for seconds, so use usleep instead of sleep for sleeping small times. Change-Id: I40e45c30cc595a54c18601117b9a1a3637652f60
* | | | | | Merge "MTP: Fix wrong delete operator from previous change."Mike Lockwood2010-08-101-1/+1
|\ \ \ \ \ \
| * | | | | | MTP: Fix wrong delete operator from previous change.Mike Lockwood2010-08-101-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64e8fdc610495f21060727b6bed42d1584833405 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 193985ff: am 235be391: Merge "Many, many developers misread or don\'t ↵Andreas Huber2010-08-101-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into ginger Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5' * commit '193985ffd553c139e8c1094d7798edbe5b0797c5': Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
| * | | | | am 235be391: Merge "Many, many developers misread or don\'t read the http ↵Andreas Huber2010-08-101-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp * commit '235be391f3b9cd79e525de87757e361ae044940d': Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
| | * | | | Merge "Many, many developers misread or don't read the http specs and ↵Andreas Huber2010-08-101-2/+2
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
| | | * | | Many, many developers misread or don't read the http specs and terminate ↵Andreas Huber2010-08-101-2/+2
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs. Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
* | | | | am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the ↵James Dong2010-08-102-92/+28
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990' * commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990': Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
| * | | am 532d2ac5: Merge "Only check the codec specific data when the output ↵James Dong2010-08-102-92/+28
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp * commit '532d2ac5d5c06c3938c4999238d1051207bfe53c': Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
| | * | Only check the codec specific data when the output buffer contains ↵James Dong2010-08-102-92/+28
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kKeyIsCodecConfig in MP4 writer o Assume there is only a single output buffer containing such information. This simplifies the logic in MP4 file writer o Output SPS and PPS in the very first buffer for software AVC encoder This is to make AVC encoder work with the MP4 file writer o Add timestamp value for codec config data Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
* | | MTP: Push queries for supported formats and properties up to Java.Mike Lockwood2010-08-107-46/+165
| | | | | | | | | | | | | | | Change-Id: I4f117090340e3916afda3d194521a6092a672ddc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | MTP: turn off verbose loggingMike Lockwood2010-08-101-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifd449c4e8c4aec6e5623869e86f8cbedd303972c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 2f5f154d: am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media ↵Jean-Michel Trivi2010-08-091-3/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | button event from the phone app is the phone is ringing, even in silent mode." into gingerbread Merge commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54' * commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54': Fix bug 2684341 Don't steal the media button event from the phone
| * | am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from ↵Jean-Michel Trivi2010-08-091-3/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | the phone app is the phone is ringing, even in silent mode." into gingerbread Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp * commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b': Fix bug 2684341 Don't steal the media button event from the phone
| | * Merge "Fix bug 2684341 Don't steal the media button event from the phone app ↵Jean-Michel Trivi2010-08-091-3/+19
| | |\ | | | | | | | | | | | | is the phone is ringing, even in silent mode." into gingerbread
| | | * Fix bug 2684341 Don't steal the media button event from the phoneJean-Michel Trivi2010-08-091-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app is the phone is ringing, even in silent mode. Use the PhoneStateListener to know whether the phone is ringing, as the mode is not MODE_RINGTONE when ringing in silent mode. Change-Id: Iede350cecde0b663d50f9b4a57f9a9ef08066c0d
* | | | am fa4f57fe: am 959909ef: Merge "Support multiple PPS and SPS in avcC box" ↵James Dong2010-08-091-27/+236
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e' * commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e': Support multiple PPS and SPS in avcC box
| * | | am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbreadJames Dong2010-08-091-27/+236
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp * commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f': Support multiple PPS and SPS in avcC box
| | * | Merge "Support multiple PPS and SPS in avcC box" into gingerbreadJames Dong2010-08-091-27/+236
| | |\ \
| | | * | Support multiple PPS and SPS in avcC boxJames Dong2010-08-091-27/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also o do not use the hard-coded profile and levels. Instead, we are using the profile and level found in the codec config data o we are not supporting FRExt profile and levels for now, which requires additional seq parameter set extension for instance. Change-Id: If695b4c996d073d8e48aa45fdd7001e9f016f375
* | | | | am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and ↵Andreas Huber2010-08-099-40/+371
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mu-law audio from WAV files and a corresponding software decoder." into gingerbread Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29' * commit 'e14923b0c80b2e73e69b7917c1f170b356592d29': Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
| * | | | am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from ↵Andreas Huber2010-08-099-40/+371
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WAV files and a corresponding software decoder." into gingerbread Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp * commit '4edf85abc919b7d0e8db71c0c6166c7994269830': Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
| | * | | Merge "Support for extracting G.711 a-law and mu-law audio from WAV files ↵Andreas Huber2010-08-099-40/+371
| | |\ \ \ | | | | | | | | | | | | | | | | | | and a corresponding software decoder." into gingerbread
| | | * | | Support for extracting G.711 a-law and mu-law audio from WAV files and a ↵Andreas Huber2010-08-099-40/+371
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | corresponding software decoder. Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6 related-to-bug: 2900021
* | | | | am 18afcee7: am 67400d49: Merge "Added tests for audio effects in ↵Eric Laurent2010-08-097-0/+3078
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaFrameworkTest" into gingerbread Merge commit '18afcee767694fd1dce1a371769dc898102143ff' * commit '18afcee767694fd1dce1a371769dc898102143ff': Added tests for audio effects in MediaFrameworkTest
| * | | | am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" ↵Eric Laurent2010-08-097-0/+3078
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp * commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0': Added tests for audio effects in MediaFrameworkTest
| | * | | Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbreadEric Laurent2010-08-097-0/+3078
| | |\ \ \
| | | * | | Added tests for audio effects in MediaFrameworkTestEric Laurent2010-08-097-0/+3078
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds a set of automated functional tests for the AudioEffect class and the following derived classes: BassBoost, Equalizer, Virtualizer and Visualizer. These tests require the following file on the SD card: /sdcard/media_api/music/sine_200+1000Hz_44K_mo.wav Change-Id: I6ec3ec6f9ede10ccf2dd3b1e9ee4b08396740dee
* | | | | am 1ece7d68: am 2a6b80bc: Fixed several audio effects problems.Eric Laurent2010-08-092-10/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1ece7d6873027068a3e7b055597045e9387b217c' * commit '1ece7d6873027068a3e7b055597045e9387b217c': Fixed several audio effects problems.
| * | | | am 2a6b80bc: Fixed several audio effects problems.Eric Laurent2010-08-092-10/+28
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp * commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee': Fixed several audio effects problems.
| | * | | Fixed several audio effects problems.Eric Laurent2010-08-092-10/+28
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed constant inversions in AudioEffect.java - Do not return error when enabling an already enabled effect - Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method - Remove click when restarting effect during disable sequence - Fixed problem in master mute management when volume control is delegated to effect. Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
* | | | MTP: Fix reading and writing property descriptorsMike Lockwood2010-08-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing support for the group code, resulting in an off by 4 bytes problem. Change-Id: I4a640c67b8d36e1bd658b6185178a71966d4b0b6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | MTP: Add debug code for printing names of MTP format and property codes.Mike Lockwood2010-08-092-7/+321
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia95ff014cec8720d01091fa30764011089076fe8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | MTP: Fix some typosMike Lockwood2010-08-093-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am c143ae7e: am ad98d383: Support for communicating if a buffer read from ↵Andreas Huber2010-08-068-33/+65
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | the _extractor_ is a sync sample or not. Merge commit 'c143ae7eb74205eb2b71e63479988b9913956687' * commit 'c143ae7eb74205eb2b71e63479988b9913956687': Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
| * | | am ad98d383: Support for communicating if a buffer read from the _extractor_ ↵Andreas Huber2010-08-068-33/+65
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a sync sample or not. Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp * commit 'ad98d383a04fce08a147b200e23b12f12b2681a3': Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
| | * | Support for communicating if a buffer read from the _extractor_ is a sync ↵Andreas Huber2010-08-068-33/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sample or not. Change-Id: Ie71506224d937cfff1fa1273bfac31c47db8845f related-to-bug: 2900534
* | | | am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 ↵Andreas Huber2010-08-061-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | files." into gingerbread Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55' * commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55': Properly skip the 'skip' chunk in mpeg4 files.
| * | | am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into ↵Andreas Huber2010-08-061-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp * commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba': Properly skip the 'skip' chunk in mpeg4 files.
| | * | Properly skip the 'skip' chunk in mpeg4 files.Andreas Huber2010-08-061-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c related-to-bug: 2901311
* | | | When using still camera for time lapse capture, don't set preview.Nipun Kwatra2010-08-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since HD resolution may not be supported by the video camera, don't set preivew using the HD size. The app should have set the preview already, just use that. Change-Id: I2f8e89bf2c7440f7bc8db7e4a228f4c8250d92b4
* | | | am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera ↵James Dong2010-08-051-4/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | source if possible" into gingerbread Merge commit '9c09a60513faf39901bb8e4681d39812204b3f73' * commit '9c09a60513faf39901bb8e4681d39812204b3f73': Use the target color format from the camera source if possible
| * | | am 1441bdfc: Merge "Use the target color format from the camera source if ↵James Dong2010-08-051-4/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible" into gingerbread Merge commit '1441bdfc19d6998607adf1347ed8dafc102908c9' into gingerbread-plus-aosp * commit '1441bdfc19d6998607adf1347ed8dafc102908c9': Use the target color format from the camera source if possible
generated by cgit v1.1 at 2025-01-14 12:07:52 +0000