summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* kernel + wifi update (gpu pvr DDK 1.8@276629)JP Abgrall2011-08-172-0/+0
| | | | | | dd3506c gpu: pvr: Update to DDK 1.8@276629 Change-Id: Ic7d4ecaf05410a731f73c49d7a0d8e0cbbc5a246
* Merge "config.xml: Use rndis0 instead of usb0 for USB tethering"Mike Lockwood2011-08-171-1/+1
|\
| * config.xml: Use rndis0 instead of usb0 for USB tetheringMike Lockwood2011-08-161-1/+1
| | | | | | | | | | Change-Id: I25503db219111694d874901efcb062713f4682ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Update wifi and kernel."Jaikumar Ganesh2011-08-172-0/+0
|\ \
| * | Update wifi and kernel.Jaikumar Ganesh2011-08-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Changes: 97a243e serial: samsung: Fix resume register restore. c6269b2 USB: gadget: android: Use "rndis%d" for RNDIS device name instead of "usb%d" Change-Id: I6e558b37e7069b69f31099b718359b7dcf455e9b
* | | Clean up unused Phone app resource overridesDavid Brown2011-08-161-9/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | - allow_back_key_to_reject_incoming_call is no longer used at all (see change https://android-git.corp.google.com/g/128602) - config_show_onscreen_dial_button isn't needed here since the default (from apps/Phone) is already "true". Bug: 5161286 Change-Id: Ia3bde3afd0e35c97750da67c3a79b63d37638d06
* | Merge "Advertise smaller input buffer size when metadata buffer mode is used ↵James Dong2011-08-162-0/+13
|\ \ | |/ |/| | | for video encoding"
| * Advertise smaller input buffer size when metadata buffer mode is used for ↵James Dong2011-08-152-0/+13
| | | | | | | | | | | | | | | | video encoding related-to-bug: 5161131 Change-Id: I891ea6d79fdaeab1b4e3e95e73326ebe6faacc3e
* | 5PC11X: CAMERA: Fix Issue 5143943(SceneMode Fail)kyoungho.yun2011-08-161-0/+17
| | | | | | | | | | | | | | | | | | Fix android.hardware.cts.CameraTest#testSceneMode fail Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com> bug:5143943 Change-Id: Ia91725ff154a6450fe36393878e7f3e7c49d9a1b
* | Update kernel and wifi driverArve Hjønnevåg2011-08-152-0/+0
|/ | | | | | 0ea9958 Revert "mtd: onenand: add ecclayout and subpage_sft for non-flex 4KiB page onenand" Change-Id: I6c37691081b52e998e768fed813ea9a70b2d0338
* Merge "audio HAL: new echo reference design"Eric Laurent2011-08-124-139/+225
|\
| * audio HAL: new echo reference designAndy Gough2011-08-124-139/+225
| | | | | | | | | | | | | | | | The echo reference discards or inserts (silent) frames according to underruns or overruns. It always returns an echo buffer which delay from current capture buffer is 0. Change-Id: Ifea06a47fe87f2b75d4d04737c495a9867d1c4bd
* | Merge "Fix for decode output align."James Dong2011-08-124-39/+64
|\ \
| * | Fix for decode output align.SeungBeom Kim2011-08-114-39/+64
| | | | | | | | | | | | | | | Change-Id: Ibe50472061f344aaf54876ec445936eb6fe15886 Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
* | | Update kernel and wifi driverArve Hjønnevåg2011-08-122-0/+0
| |/ |/| | | | | | | | | | | 5ba20f8 gpu: pvr: Update to DDK 1.8@275916 c31ff7a gpu: pvr: Update to DDK 1.8@275540 Change-Id: Iaf317ca16100a59d6a33dac616a5361d7be3733c
* | 3.0 kernel and wifi driverArve Hjønnevåg2011-08-112-0/+0
| | | | | | | | | | | | | | cf0dc24 Merge branch 'android-3.0' into android-samsung-3.0-wip b85f29e android: logger: bump up the logger buffer sizes Change-Id: I38759f63ece71e5cd70ff4c109b67d5e5a0f9dbc
* | Update kernel and wifi driverArve Hjønnevåg2011-08-112-0/+0
| | | | | | | | | | | | | | | | | | 41572bf Merge branch 'android-2.6.39' into android-samsung-2.6.39-wip 11430f1 android: logger: bump up the logger buffer sizes 1ce1538 herring_defconfig: enable CONFIG_TUN and CONFIG_INET_XFRM_MODE_TUNNEL. df61697 herring_defconfig: regenerate defconfig without changes. Change-Id: Iee93d205c84c6a31fe72eb9701aad3f6c2125b4c
* | Update touchscreen configuration.Jeff Brown2011-08-111-4/+3
| | | | | | | | Change-Id: I006290574a0caa249d5fb43dc1feab5c78024714
* | Update touch screen configuration.Jeff Brown2011-08-111-20/+6
| | | | | | | | | | | | Bug: 5064702 Change-Id: I543b147ec41a6bdfe2c8b83a09510947de6f2ce8
* | Merge "Fix mmap size for video editor stress test."James Dong2011-08-111-7/+1
|\ \ | |/
| * Fix mmap size for video editor stress test.SeungBeom Kim2011-08-111-7/+1
| | | | | | | | | | | | | | bug-AFTER_EACH_TESTRUN.1312600173242.txt Change-Id: I7c0aede86557a7727b0ca1bba03e4c7c3cb0079e Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
* | Merge "5PC11X: CAMERA: Fix issue 5032708 - Native crash"Wu-cheng Li2011-08-111-1/+1
|\ \ | |/ |/|
| * 5PC11X: CAMERA: Fix issue 5032708 - Native crashkyoungho.yun2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix Native crash observed in Camera app while taking pictures There are no need to make exif information in encode func. Because we make exif in getExif func. Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com> bug:5032708 Change-Id: I8e07dc6252a4a959a9319eda402f14ff892a5467
* | Merge "2.6.39 kernel and wifi driver"Arve Hjønnevåg2011-08-102-0/+0
|\ \
| * | 2.6.39 kernel and wifi driverArve Hjønnevåg2011-08-092-0/+0
| |/ | | | | | | | | | | | | 1c42b6d gpu: pvr: Update to DDK 1.8@275425 ... Change-Id: I80c6fd833773518acc61ea2b159b9de156bb6f45
* | Merge "Add support NV21 preview callback"James Dong2011-08-101-114/+45
|\ \ | |/ |/|
| * Add support NV21 preview callbackJames Dong2011-08-091-114/+45
| | | | | | | | | | | | | | | | o always force to use YV12 for gralloc buffer, regardless preview color format (NV21 or YV12) o for NV21 preview callback, a color conversion is performed before the preview frame is returned via the callback Change-Id: I7e5fb4de40e5f615585465f9b9c50eb3521c1c57 related-to-bug: 5121691,5122253
* | Merge "Kernel + wifi update: (gpu:pvr: DDK 1.8@275425)"JP Abgrall2011-08-092-0/+0
|\ \ | |/ |/|
| * Kernel + wifi update: (gpu:pvr: DDK 1.8@275425)JP Abgrall2011-08-092-0/+0
| | | | | | | | | | | | | | 32acd0c gpu: pvr: Update to DDK 1.8@275425 Change-Id: I53d4f07ee1c5bff40c4e0b765c7656f0c12ef379 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge "Fix a used-before-initialized compile warning"Jamie Gennis2011-08-081-4/+1
|\ \
| * | Fix a used-before-initialized compile warningJamie Gennis2011-08-041-4/+1
| | | | | | | | | | | | Change-Id: I8e11a98c17b325f88fab1b77e2d8c08baae64d77
* | | Merge "Reduce buffer count in Android native buffer mode"Jamie Gennis2011-08-082-0/+14
|\ \ \ | |/ /
| * | Reduce buffer count in Android native buffer modeJamie Gennis2011-08-042-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes nBufferCountMin and nBufferCountActual be 1 for the output port of video decoders that are in Android native buffer mode. Because the decode is done to internally allocated buffers, which are then copied to the Gralloc buffer only one buffer is needed. Change-Id: I157d0d6c6f66ee39f204c6c8871ef08e6d13f9d6 Bug: 5091988
* | | Remove color convert library.Chih-Chung Chang2011-08-083-104/+0
| | | | | | | | | | | | | | | | | | | | | It's not needed because both the decoder output and encoder input are already in I420 format. Change-Id: I64792ab240e63c9d49b7190ca7e9b783e51c965e
* | | Merge "Fix missing crop rect because of the incorrect state of OMX video ↵James Dong2011-08-071-1/+1
|\ \ \ | |_|/ |/| | | | | decoder"
| * | Fix missing crop rect because of the incorrect state of OMX video decoderJames Dong2011-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The crop event was sent from video decoder, but when SF uses getConfig to retrieve the crop info, the decoder reports an error because the state in the decoder was not properly set. Change-Id: I81b6ec53f221a4fd8b2c6a9f7324a776358cc3a5 related-to-bug: 5128788
* | | kernel + wifi update (gpu ddk 1.8@274836)JP Abgrall2011-08-062-0/+0
|/ / | | | | | | | | | | | | 9d4362e gpu: pvr: Update to DDK 1.8@274836 Change-Id: I895b681ab44cbbfd178adc14ebf5a5b0d7fc5ca9 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge "Add camcorder profiles for crespo"James Dong2011-08-041-0/+54
|\ \
| * | Add camcorder profiles for crespoJames Dong2011-08-041-0/+54
| |/ | | | | | | | | Change-Id: I3404b69fb4159e5fb00789bf385c66e707f701dc related-to-bug: 5113718
| |
| \
*-. \ Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project2011-08-040-0/+0
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I17f287f5fc313120faa56320e3c07d5284d0693c
| * kernel + wifi update: gpu onlyJP Abgrall2011-08-022-0/+0
| | | | | | | | | | | | | | 21fb4cb gpu: pvr: Update to DDK 1.6.16.4131.1.1 Change-Id: I9d728a27256486ba0d2e39211d06ef7f2ebeab6b Signed-off-by: JP Abgrall <jpa@google.com>
* | Fix the broken buildJames Dong2011-08-041-0/+3
| | | | | | | | | | | | - we need to have this lib built from different source Change-Id: I156796d86c302ef5e65c09c0468908a1b7a6af6e
* | SEC-OMX support YV12 for video editor.SeungBeom Kim2011-08-045-2/+104
| | | | | | | | | | Change-Id: Ia67d3aceb8cffa75be3ea373f87d2f20165ac831 Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
* | Video decode component support gralloc color format.SeungBeom Kim2011-08-046-481/+515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That returns the current color format is a 0x100. But, It is not the normal way In terms of omx. (It is spec out) OMX spec is OMX_COLOR_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ I think.... I hope the color format is the value 0x7F000100. stagefright use the value(0x7F000100) after masking. ex) err = native_window_set_buffers_geometry( mNativeWindow.get(), def.format.video.nFrameWidth, def.format.video.nFrameHeight, (def.format.video.eColorFormat & 0x1FF)); Change-Id: If0578eb35338ff9bd8d0cf8cd8f1435af92aba04 Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
* | kernel + wifi update (gpu)JP Abgrall2011-08-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | e1508e9 gpu: pvr: Update to DDK 1.8@274226 1962e03 gpu: pvr: Update to DDK 1.8@273945 893d3d8 gpu: pvr: Update to DDK 1.8.18.964 681bfe7 gpu: pvr: Update to DDK 1.8.18.945 6b8441b gpu: pvr: Update to DDK 1.8.18.943 69519a5 gpu: pvr: Update to DDK 1.8.18.927 Change-Id: I2361daf814b994b62ad3c8ebfc1471299bffdd71 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge "Disable marquee fading edges"Romain Guy2011-08-021-0/+2
|\ \
| * | Disable marquee fading edgesRomain Guy2011-08-021-0/+2
| | | | | | | | | | | | Change-Id: I27b8765ecb59ca9de306b581d03a84adb2ed704e
* | | am 7956311a: (-s ours) am 8f4dcdd3: am efece947: kernel + wifi update: gpu onlyJP Abgrall2011-08-020-0/+0
|\ \ \ | |/ / |/| | | | | | | | * commit '7956311aa485fe6bbce6e672aaded1f22df062fe': kernel + wifi update: gpu only
| * | am 8f4dcdd3: am efece947: kernel + wifi update: gpu onlyJP Abgrall2011-08-022-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '8f4dcdd349fd2a0dc8e9f89f40c9e0e0c08f3049': kernel + wifi update: gpu only
| | * \ am efece947: kernel + wifi update: gpu onlyJP Abgrall2011-08-022-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'efece9476ce2072df925015e261e16db7373c7d1': kernel + wifi update: gpu only