OSDN Git Service

android-x86/frameworks-av.git
12 years agoRemove unnecessary drm handling logic in PreviewPlayerBase class
James Dong [Thu, 12 Jan 2012 03:11:31 +0000 (19:11 -0800)]
Remove unnecessary drm handling logic in PreviewPlayerBase class

Change-Id: I08b1e23ecf5775deb92a262fb9ed60a464fe60c0
related-to-bug: 5857208

12 years agoRename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Steve Block [Sun, 8 Jan 2012 10:14:44 +0000 (10:14 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I5c54a0185527f6ca3e746d625a007aa06f6f25f9

12 years agoRename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Steve Block [Thu, 5 Jan 2012 23:22:50 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I605079da4a7c01e6555e2aab6f16ccf8cc6ac694

12 years agoRename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Steve Block [Wed, 4 Jan 2012 20:06:05 +0000 (20:06 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: I261ad4d5348f4832488707edeb3cbdbb6dd12fca

12 years agoRename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Steve Block [Tue, 20 Dec 2011 16:24:14 +0000 (16:24 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I17166d9fb435c85c5fd9d5fba1a39d2661c61e10

12 years agoMerge "ditherAndClamp from libaudioutils not AudioMixer"
Glenn Kasten [Fri, 16 Dec 2011 22:58:14 +0000 (14:58 -0800)]
Merge "ditherAndClamp from libaudioutils not AudioMixer"

12 years agoditherAndClamp from libaudioutils not AudioMixer
Glenn Kasten [Fri, 16 Dec 2011 19:07:44 +0000 (11:07 -0800)]
ditherAndClamp from libaudioutils not AudioMixer

Change-Id: I1e8a00c81efefd956fe9e4d9b58557373320e322

12 years agoam 576bb4a6: Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 9 Dec 2011 22:57:40 +0000 (14:57 -0800)]
am 576bb4a6: Reconcile with ics-mr1-release

* commit '576bb4a63f925ef5862eedb6428ba890f0ad1054':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 8 Dec 2011 18:22:02 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release

Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 5 Dec 2011 16:53:37 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release

Change-Id: I50ea08700096cc77b6af3838bb4adbc21062de1c

12 years agoam 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handle the...
Hong Teng [Fri, 2 Dec 2011 21:44:09 +0000 (13:44 -0800)]
am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.

* commit '38ca8aaf3ad045d8623bce0be9b351ae9004abb3':
  Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 2 Dec 2011 18:25:17 +0000 (10:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFix for issue 5490443 Native crash while exporting a video
Hong Teng [Thu, 1 Dec 2011 00:42:56 +0000 (16:42 -0800)]
Fix for issue 5490443 Native crash while exporting a video
Handle the decoder error case, this modification is to fix the native crash.

Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 30 Nov 2011 20:56:01 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release

Change-Id: I49813a61d932c0d7b0562f8706292494c4c04e9b

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 28 Nov 2011 20:22:30 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs to 30...
Hong Teng [Tue, 22 Nov 2011 17:40:15 +0000 (09:40 -0800)]
am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs

* commit '8e61113210e4c3c1ce57ecef1dda327bea85c19c':
  Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs

12 years agoFix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
Hong Teng [Mon, 21 Nov 2011 23:09:49 +0000 (15:09 -0800)]
Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs

-Remove the additional transcoding for kenburn video in video editor saving phase.

Change-Id: Ia8721ba75d4b7923db0f483bf30209c6fa40e4bd

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Fri, 18 Nov 2011 23:43:26 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release

Change-Id: I90ea8a02a4bb9b357d7bddfa1a02602d3de839fa

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:46:25 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoresolved conflicts for merge of fbb122bf to master
Chih-Chung Chang [Wed, 16 Nov 2011 03:39:05 +0000 (11:39 +0800)]
resolved conflicts for merge of fbb122bf to master

Change-Id: I607e6b11e925ba858d2a0856117e2fcb68bed963

12 years agoMerge "Fix 5607624: Native crash in movie studio while previewing the movie" into...
Chih-Chung Chang [Wed, 16 Nov 2011 02:35:24 +0000 (18:35 -0800)]
Merge "Fix 5607624: Native crash in movie studio while previewing the movie" into ics-mr1

12 years agoam 811c53c5: Fix for issue 5309336 -add videoeditor maximum prefetch YUV...
Hong Teng [Tue, 15 Nov 2011 21:07:05 +0000 (13:07 -0800)]
am 811c53c5:     Fix for issue  5309336     -add videoeditor maximum prefetch YUV frames in media_profiles.xml to      limit the total memory usage.

* commit '811c53c58a870397f2864003dc21d5799a422b26':
  Fix for issue  5309336     -add videoeditor maximum prefetch YUV frames in media_profiles.xml to      limit the total memory usage.

12 years agoFix 5607624: Native crash in movie studio while previewing the movie
Chih-Chung Chang [Tue, 15 Nov 2011 11:47:25 +0000 (19:47 +0800)]
Fix 5607624: Native crash in movie studio while previewing the movie

Change-Id: I6bc123a3da4fb071a65fe776bcba0268fa58bf29

12 years ago Fix for issue 5309336
Hong Teng [Thu, 10 Nov 2011 23:01:09 +0000 (15:01 -0800)]
Fix for issue  5309336
    -add videoeditor maximum prefetch YUV frames in media_profiles.xml to
     limit the total memory usage.

Change-Id: I43c03fc626194d9ebbe8d914d9209a04bc085831

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 31 Oct 2011 20:19:21 +0000 (13:19 -0700)]
Reconcile with ics-mr1-release

Change-Id: I712537045ade8ec23936caddcdbf95fbba0ef9a8

12 years agoRename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
Steve Block [Thu, 20 Oct 2011 10:56:09 +0000 (11:56 +0100)]
Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531

12 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 20 Oct 2011 14:00:50 +0000 (07:00 -0700)]
merge in ics-release history after reset to master

12 years agoam f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the...
James Dong [Thu, 20 Oct 2011 07:19:00 +0000 (00:19 -0700)]
am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0

* commit 'f23f725773de1eb394655e657cd12f95f6250b3d':
  Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.

12 years agoMerge "Fix for 5477832 Movie Studio crash when trying to import the attached h263...
James Dong [Thu, 20 Oct 2011 07:17:28 +0000 (00:17 -0700)]
Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0

12 years agoam 52da22e1: Fix for 5234840 Corrupted frames in transition
Hong Teng [Thu, 20 Oct 2011 06:10:56 +0000 (23:10 -0700)]
am 52da22e1: Fix for 5234840 Corrupted frames in transition

* commit '52da22e185f4bd4c7778706d8651a2706cdffc5b':
  Fix for 5234840 Corrupted frames in transition

12 years agoFix for 5234840 Corrupted frames in transition
Hong Teng [Wed, 19 Oct 2011 23:36:12 +0000 (16:36 -0700)]
Fix for 5234840 Corrupted frames in transition

This is to solve the corrupt frame in transition clip generated
from mpeg4 input clip.
Compress domain trimming is disabled for mpeg4 since hardware
encdoer may use different time scale value than the input mpeg4
clip.

Change-Id: I19377a19840f599ba9cb24c89dc86aaa63fc229e

12 years agoFix for 5477832 Movie Studio crash when trying to import the attached h263 file.
Rajneesh Chowdury [Wed, 19 Oct 2011 19:49:08 +0000 (12:49 -0700)]
Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.

Add support for Audio Object type 5(SBR) and 29(PS) in
audio decoder node.

Change-Id: I9b631893f530d0c8550a0a7addfbdce226313693

12 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 19 Oct 2011 14:44:51 +0000 (07:44 -0700)]
merge in ics-release history after reset to master

12 years agoam 71184927: Fix for 5154138 Titles are not aligned properly in a exported movie...
Hong Teng [Wed, 19 Oct 2011 05:09:48 +0000 (22:09 -0700)]
am 71184927: Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done

* commit '711849272b603a88f751c1758b51a1dfbec315df':
  Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done

12 years agoFix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio
Hong Teng [Thu, 13 Oct 2011 02:57:19 +0000 (19:57 -0700)]
Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio
Apply frame effect(overlay) after rendering mode was done

Change-Id: I1ff9cc868117cc8dcdc735e6854ff429b74e8154

12 years agomerge in ics-release history after reset to master
The Android Automerger [Sun, 16 Oct 2011 14:00:16 +0000 (07:00 -0700)]
merge in ics-release history after reset to master

12 years agoRemove RTSP support from libvideoeditor's PreviewPlayer...
Andreas Huber [Wed, 12 Oct 2011 22:08:42 +0000 (15:08 -0700)]
Remove RTSP support from libvideoeditor's PreviewPlayer...

Change-Id: I2032772037c1130736081cb62bd6ce8d1270e1b9

12 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 6 Oct 2011 14:00:44 +0000 (07:00 -0700)]
merge in ics-release history after reset to master

12 years agoMerge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test."
Hong Teng [Thu, 6 Oct 2011 00:26:34 +0000 (17:26 -0700)]
Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test."

12 years agoFix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test.
Hong Teng [Thu, 29 Sep 2011 01:40:38 +0000 (18:40 -0700)]
Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test.

Change-Id: Icb8cadaff50a22588417c2c8f5c31415dd0cca9e

12 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 5 Oct 2011 13:58:58 +0000 (06:58 -0700)]
merge in ics-release history after reset to master

12 years agoVideo editor incorrectly rejects videos that could be supported by the HW decoder
James Dong [Tue, 4 Oct 2011 02:40:19 +0000 (19:40 -0700)]
Video editor incorrectly rejects videos that could be supported by the HW decoder

Change-Id: I831b32c7ab02fa110865c88bbb02f339889d97a5
related-to-bug: 5407761

12 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 27 Sep 2011 14:00:15 +0000 (07:00 -0700)]
merge in ics-release history after reset to master

12 years agoMerge "Fix for 5205420 compression domain trimming fallback mechanism"
Rajneesh Chowdury [Mon, 26 Sep 2011 16:30:04 +0000 (09:30 -0700)]
Merge "Fix for 5205420 compression domain trimming fallback mechanism"

12 years agomerge in ics-release history after reset to master
The Android Automerger [Sun, 25 Sep 2011 14:00:22 +0000 (07:00 -0700)]
merge in ics-release history after reset to master

12 years agoam 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settings are...
Rajneesh Chowdury [Fri, 23 Sep 2011 21:44:56 +0000 (14:44 -0700)]
am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set

* commit '996fb989eb4cbe80c91cfe3ef4d32f349dffa72d':
  DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set

12 years agoFix for 5205420 compression domain trimming fallback mechanism
Rajneesh Chowdury [Thu, 22 Sep 2011 20:00:36 +0000 (13:00 -0700)]
Fix for 5205420 compression domain trimming fallback mechanism

Transcode if clip's profile or level exceeds encoder's supported
profile or level.

Change-Id: Ib2f678828a58657b095ef6ef219fd0aa2bdccf91

12 years agoDO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
Rajneesh Chowdury [Wed, 14 Sep 2011 18:08:05 +0000 (11:08 -0700)]
DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set

Cherry picked from master.
Correct video bitrate value is set from 3gpReader node.
Also, bitrate is limited to max supported by encoder as
per profile and level.

This patch also fixes bug
 5309520 [Prime] Native crash while running CTS test testExportEffectOverlay.

Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e

12 years agoFix for 5274212 Transition clip contains more video frames from 1 video clip than...
Rajneesh Chowdury [Thu, 22 Sep 2011 17:51:02 +0000 (10:51 -0700)]
Fix for 5274212 Transition clip contains more video frames from 1 video clip than the other

Set the alpha blending value correctly.

Change-Id: I6aaed47144d09d182afb1c70d5bb72b7360fb51e

12 years agomerge in ics-release history after reset to master
The Android Automerger [Sun, 18 Sep 2011 14:00:26 +0000 (07:00 -0700)]
merge in ics-release history after reset to master

12 years agoam 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie...
Rajneesh Chowdury [Fri, 16 Sep 2011 00:38:26 +0000 (17:38 -0700)]
am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio

* commit '2e200ef75541ee0f494877a42ae0e870799cc35c':
  DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio

12 years agoDO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
Rajneesh Chowdury [Thu, 15 Sep 2011 23:24:55 +0000 (16:24 -0700)]
DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio

Ensure video encoder is not created and destroyed for every clip.

Change-Id: I9ce4db9312af801570dd51f4b075f262e27e3952

12 years agoMerge "Fix for 5247764 profile and level settings are not always correctly set"
Rajneesh Chowdury [Thu, 15 Sep 2011 17:03:21 +0000 (10:03 -0700)]
Merge "Fix for 5247764 profile and level settings are not always correctly set"

12 years agoFix for bug 5255159 Cannot play exported movie from Movie Studio
Rajneesh Chowdury [Wed, 14 Sep 2011 22:38:07 +0000 (15:38 -0700)]
Fix for bug 5255159 Cannot play exported movie from Movie Studio

Ensure video encoder is not created and destroyed for every clip.

Change-Id: I7a1d525e7bcdc839acc39d43e5046207c2d3b44f

12 years agoFix for 5247764 profile and level settings are not always correctly set
Rajneesh Chowdury [Wed, 14 Sep 2011 18:08:05 +0000 (11:08 -0700)]
Fix for 5247764 profile and level settings are not always correctly set

Correct video bitrate value is set from 3gpReader node.
Also, bitrate is limited to max supported by encoder as
per profile and level.

This patch also fixes bug
 5309520 [Prime] Native crash while running CTS test testExportEffectOverlay.

Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e

12 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 14 Sep 2011 13:34:16 +0000 (06:34 -0700)]
merge in ics-release history after reset to master

12 years agoFix for
Hong Teng [Mon, 12 Sep 2011 21:10:59 +0000 (14:10 -0700)]
Fix for
-5234840 corrupted frames in transition.
-Green frames in image transition.

modified:   vss/mcs/src/M4MCS_API.c
modified:   vss/src/M4VSS3GPP_EditVideo.c

Change-Id: I2632d47c44f00bbc81e2b3e19b225178ab456810

12 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 6 Sep 2011 13:33:58 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

12 years agoEnable some logs to debug 5195693.
Chih-Chung Chang [Mon, 5 Sep 2011 06:49:35 +0000 (14:49 +0800)]
Enable some logs to debug 5195693.

Change-Id: I1c71b6fa6b8dbcbf2a6685be5f24afddab4afc5d

12 years agoFix 5240036: We didn't handle the 1920x1080 resolution.
Chih-Chung Chang [Fri, 2 Sep 2011 08:10:12 +0000 (16:10 +0800)]
Fix 5240036: We didn't handle the 1920x1080 resolution.

Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc

12 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 1 Sep 2011 13:33:59 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

12 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 20:42:48 +0000 (13:42 -0700)]
merge in ics-release history after reset to master

12 years agoFix for 5156702 Rotate video output for thumbnails and export
Rajneesh Chowdury [Tue, 30 Aug 2011 19:59:30 +0000 (12:59 -0700)]
Fix for 5156702 Rotate video output for thumbnails and export

This is part of a multi project submit.
This is the native engine part.

Change-Id: Icde922194a123a90544942caa12430fc3c4ef10e

12 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 19:45:36 +0000 (12:45 -0700)]
merge in ics-release history after reset to master

12 years agoMerge "Fix 5200858: we need to pass timestamp to render correct frames."
Chih-Chung Chang [Tue, 30 Aug 2011 03:37:20 +0000 (20:37 -0700)]
Merge "Fix 5200858: we need to pass timestamp to render correct frames."

12 years agoFix 5200858: we need to pass timestamp to render correct frames.
Chih-Chung Chang [Mon, 29 Aug 2011 12:27:54 +0000 (20:27 +0800)]
Fix 5200858: we need to pass timestamp to render correct frames.

Change-Id: I262cefabea87f75883bcd074370deae054df3e88

12 years agoMerge "Fix 5123908: Native crash rewinding movie"
Chih-Chung Chang [Mon, 29 Aug 2011 04:57:59 +0000 (21:57 -0700)]
Merge "Fix 5123908: Native crash rewinding movie"

12 years agoFix 5212886: free the reader after freeing decoders.
Chih-Chung Chang [Fri, 26 Aug 2011 12:26:46 +0000 (20:26 +0800)]
Fix 5212886: free the reader after freeing decoders.

If we free the reader first, the decoder may still read from it
after the reader is freed. So we need to free the reader last.

Change-Id: Ib6c7d6991d544870f1b3892387d0db312d501755

12 years agoFix 5200962: Handle 0-length buffers from OMXCodec and drop it.
Chih-Chung Chang [Fri, 26 Aug 2011 03:29:14 +0000 (11:29 +0800)]
Fix 5200962: Handle 0-length buffers from OMXCodec and drop it.

Change-Id: I67c42c41f649f8e37055721efb67ab3ca4b02f0b

12 years agoFix 5180429: Initialize native window transform to 0.
Chih-Chung Chang [Thu, 25 Aug 2011 06:00:18 +0000 (14:00 +0800)]
Fix 5180429: Initialize native window transform to 0.

Change-Id: I2730895059d408fa731dc4ca8da3f7984fe196ae

12 years agoFix for 5151331 [CRESPO] testPerformanceExport failed
Rajneesh Chowdury [Fri, 19 Aug 2011 17:56:45 +0000 (10:56 -0700)]
Fix for 5151331 [CRESPO] testPerformanceExport failed

Ensure encoding width and height are multiple of 16.

Change-Id: Ia077a52a16273cb9f775ebe0f0c66a81a35b9e19

12 years agoFix 5123908: Native crash rewinding movie
Chih-Chung Chang [Thu, 18 Aug 2011 11:41:30 +0000 (19:41 +0800)]
Fix 5123908: Native crash rewinding movie

Simplify the VideoEditorSRC code and fix some bugs.

Change-Id: I6bcf3a5cea21a2eec4b51f167560c4b0d3a04a29

12 years agoFix for 4142219 Don't hard code platform-specific limitations.
Rajneesh Chowdury [Fri, 12 Aug 2011 23:35:23 +0000 (16:35 -0700)]
Fix for 4142219 Don't hard code platform-specific limitations.

Also fixes 5118207 add other video codec support for video editor export.

For importing video clips, Video Editor engine will query StageFright codecs
for supported codecs, profiles and levels.
For Export, the profile and level are configured in media_profiles.xml

Change-Id: I85c8bb8b87cfcf0f1351ecb8c4f369a8902e7a09

12 years agoFix 5115581: Native crash while importing audio track
Chih-Chung Chang [Thu, 18 Aug 2011 08:42:54 +0000 (16:42 +0800)]
Fix 5115581: Native crash while importing audio track

Add locking in storeBuffer and read.
Use the Vector class to simplify the code.

Change-Id: If36ddda432df2b6d6d728b27fa196d2a655e0ba4

12 years agoSpeed up thumbnail generation.
Chih-Chung Chang [Tue, 9 Aug 2011 12:53:22 +0000 (20:53 +0800)]
Speed up thumbnail generation.

We accept a tolerance parameter while decoding. We also tell the
stagefright decoder to jump so we can move to the new frame faster.

Change-Id: Iede3c1f909f1c42b2d5a53c782083367b00f62fb

12 years agoAdd connect calls for SurfaceTexture. Clean PreviewRenderer.
Chih-Chung Chang [Thu, 11 Aug 2011 10:36:45 +0000 (18:36 +0800)]
Add connect calls for SurfaceTexture. Clean PreviewRenderer.

Now connect() is necessary for SurfaceTexture.
Also cleaned unused code in PreviewRenderer.

Change-Id: Ic49df01e79f38a48a8c2cf194d13ee575660c834

12 years agoMerge "Fix for 4132872 inefficient export logic."
Rajneesh Chowdury [Tue, 9 Aug 2011 17:14:21 +0000 (10:14 -0700)]
Merge "Fix for 4132872 inefficient export logic."

12 years agoFix for 4132872 inefficient export logic.
Rajneesh Chowdury [Wed, 3 Aug 2011 23:32:40 +0000 (16:32 -0700)]
Fix for 4132872 inefficient export logic.

Also fixes 3371103 Transitions between images takes a long time
to generate.

Redundant transcoding is removed. Decode encode will be done only
once per clip.
For images, conversion to 3gp clip is removed (except for generating
Kenburn image clip).

Change-Id: Id722cd0296641bd643eb5c63f4d8028716259c01

12 years agoRename YV12 to I420.
Chih-Chung Chang [Fri, 5 Aug 2011 09:52:45 +0000 (17:52 +0800)]
Rename YV12 to I420.

Change-Id: I453b7044bf46950ef67091f3417ed3e6a65086a0

12 years agoUse GL to render preview.
Chih-Chung Chang [Tue, 2 Aug 2011 08:17:39 +0000 (16:17 +0800)]
Use GL to render preview.

To speed up the preview, we direct the decoder output to a
SurfaceTexture, then draw the texture to a surface. The media
rendering parameters (crop, black-border) are implemented
using different vertex coordinates. The color effects are
implemented using fragment shaders. Currently only three color
effects are implemented, but that's all the appplication uses.

Change-Id: If84439fee572ed37ea077749ef9f2bd4f78703e1

13 years agoMerge "Remove excessive logging"
James Dong [Thu, 4 Aug 2011 18:40:51 +0000 (11:40 -0700)]
Merge "Remove excessive logging"

13 years agoRemove unused mLastVideoBuffer and bAppliedVideoEffect.
Chih-Chung Chang [Mon, 1 Aug 2011 08:34:05 +0000 (16:34 +0800)]
Remove unused mLastVideoBuffer and bAppliedVideoEffect.

Change-Id: I29511aaa714494a1a6caa4ed95bbc26370b37246

13 years agoRemove excessive logging
James Dong [Tue, 2 Aug 2011 17:35:09 +0000 (10:35 -0700)]
Remove excessive logging

Change-Id: Ie0b37da59ad326184c983626c45ea78908e7c2b7
related-to-bug: 5109084

13 years agoRemove PreviewLocalRenderer (simplify the code).
Chih-Chung Chang [Mon, 1 Aug 2011 04:15:59 +0000 (12:15 +0800)]
Remove PreviewLocalRenderer (simplify the code).

Change-Id: I1f04e591cd0a33eb70bd93d5600aba12e727386e

13 years agoFix for 5083973 M4VSS3GPP_editCleanUp called twice problem.
Rajneesh Chowdury [Thu, 28 Jul 2011 21:16:45 +0000 (14:16 -0700)]
Fix for 5083973 M4VSS3GPP_editCleanUp called twice problem.

Set VSS context to NULL after cleanup.

Change-Id: I1086fbe60a7777b00e80f0ea504f58a183fd3241

13 years agoRemove unnecessary encoder input format check.
Chih-Chung Chang [Wed, 27 Jul 2011 12:03:59 +0000 (20:03 +0800)]
Remove unnecessary encoder input format check.

This was preventing the export function from working because the
encoder may accept a format other than YV12. As we always
convert frames to what the encoder accepts, the check is
unnecessary.

Change-Id: I2056f560b4737d33956b277fb39ebe85278464ae

13 years agoAdd YV12 color converter interface for VideoEditor.
Chih-Chung Chang [Fri, 22 Jul 2011 01:01:36 +0000 (09:01 +0800)]
Add YV12 color converter interface for VideoEditor.

The original assumption in VideoEditor is that the decoder output
and encoder input are in YV12 format. However on different
hardware platform the actual formats may be different. So now we
load a platform-specific YV12 color conversion module which
knows the actual format and can convert to/from YV12, which is
the format used in VideoEditor internally for processing.

Bug: 5061733
Change-Id: I852f85efd30c05cf6c42810059ee4d2ef37ee3da

13 years agoClear buffer lists in stop() so we won't free the buffers again.
Chih-Chung Chang [Tue, 26 Jul 2011 06:54:53 +0000 (14:54 +0800)]
Clear buffer lists in stop() so we won't free the buffers again.
Bug: 5073626

Change-Id: Ia41fc089568b48de005235d66c9b5b1a5f72b5ca

13 years agoFix for issue 5055001 Movie studio is unusable after importing music
Rajneesh Chowdury [Thu, 21 Jul 2011 23:34:09 +0000 (16:34 -0700)]
Fix for issue 5055001 Movie studio is unusable after importing music

Change-Id: I9b3da1122e807c034cf44dd51b5e1d92dd84d73f

13 years agoMerge "Remove hard-coded requirement for number of buffers."
Chih-Chung Chang [Thu, 21 Jul 2011 21:03:25 +0000 (14:03 -0700)]
Merge "Remove hard-coded requirement for number of buffers."

13 years agoMerge "fix for issue 4142219 Don't hard code platform-specific limitations engine...
Hong Teng [Thu, 21 Jul 2011 18:14:03 +0000 (11:14 -0700)]
Merge "fix for issue 4142219 Don't hard code platform-specific limitations engine part."

13 years agofix for issue 4142219
Hong Teng [Thu, 7 Jul 2011 01:29:28 +0000 (18:29 -0700)]
fix for issue 4142219
Don't hard code platform-specific limitations
engine part.

Change-Id: Ibc8a539e5bbac738f60ef935670a333b7017e20e

13 years agoMerge "Fix for issue 4988956 No audio can be heard during preview"
Rajneesh Chowdury [Wed, 20 Jul 2011 23:25:03 +0000 (16:25 -0700)]
Merge "Fix for issue 4988956 No audio can be heard during preview"

13 years agoFix for issue 4988956 No audio can be heard during preview
Rajneesh Chowdury [Wed, 20 Jul 2011 20:47:34 +0000 (13:47 -0700)]
Fix for issue 4988956 No audio can be heard during preview

Change-Id: I61fc9086f2c00259e4f54535a5938b161d95b144

13 years agoRemove hard-coded requirement for number of buffers.
Chih-Chung Chang [Tue, 19 Jul 2011 00:11:47 +0000 (08:11 +0800)]
Remove hard-coded requirement for number of buffers.

This change use two threads to read and return buffers from/to the
encoder, so we won't block on read even if there are not enough
input buffers.

Bug: 4972572
Change-Id: Iab07da5b55ef384e1d2723b4f5d3164e5a509ebd

13 years agocall the new setScaling method in the appropriate places
Mathias Agopian [Tue, 19 Jul 2011 19:37:05 +0000 (12:37 -0700)]
call the new setScaling method in the appropriate places

Change-Id: Iabd738b195d326b6bdf04fdfee75e1dd9d411cbd

13 years agoMerge "Use the ANativeWindow APIs instead of the Surface APIs"
Mathias Agopian [Fri, 15 Jul 2011 01:04:25 +0000 (18:04 -0700)]
Merge "Use the ANativeWindow APIs instead of the Surface APIs"

13 years agoUse the ANativeWindow APIs instead of the Surface APIs
Mathias Agopian [Thu, 14 Jul 2011 21:45:08 +0000 (14:45 -0700)]
Use the ANativeWindow APIs instead of the Surface APIs

Surface inherits from ANativeWindow, the APIs on the later
are the only public APIs.

Change-Id: Ibddebfe535e026d872cc13287a102660c004385f

13 years agoRemove redundant include, now that NuHTTPDataSource.h is no more.
Andreas Huber [Wed, 13 Jul 2011 22:55:33 +0000 (15:55 -0700)]
Remove redundant include, now that NuHTTPDataSource.h is no more.

Change-Id: I7bed503ba341b5ea3b7a3cac7aa2a1f349c8ed03

13 years agoMerge "Remove the simulator target from all makefiles. Bug: 5010576"
Jeff Brown [Tue, 12 Jul 2011 19:15:30 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug: 5010576"