OSDN Git Service
Ed Heyl [Wed, 26 Oct 2011 18:50:21 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history
Steve Block [Wed, 26 Oct 2011 11:48:15 +0000 (04:48 -0700)]
am
b3bc653e: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
* commit '
b3bc653e3cad72a4841cab90fbb7346e938735e3':
Rename 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
James Dong [Thu, 20 Oct 2011 07:20:12 +0000 (00:20 -0700)]
am
518f2a51: am
f23f7257: Merge "Fix for
5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
* commit '
518f2a5132d9526b79f4a278f621ae3342434aa8':
Fix for
5477832 Movie Studio crash when trying to import the attached h263 file.
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.
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
Hong Teng [Thu, 20 Oct 2011 06:12:59 +0000 (23:12 -0700)]
am
17887cd0: am
52da22e1: Fix for
5234840 Corrupted frames in transition
* commit '
17887cd0623d1cc8f225505ecc5b5bec78e75b32':
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
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
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
Hong Teng [Wed, 19 Oct 2011 05:11:41 +0000 (22:11 -0700)]
am
d41d94e2: 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 '
d41d94e217507ecf9217bebd950b83390e7ffaf6':
Fix for
5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done
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
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
Andreas Huber [Thu, 13 Oct 2011 18:53:13 +0000 (11:53 -0700)]
am
3e79eec7: Remove RTSP support from libvideoeditor\'s PreviewPlayer...
* commit '
3e79eec74bc253c1b8e27cb9a815ae43b4849e68':
Remove 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
Hong Teng [Thu, 6 Oct 2011 00:27:50 +0000 (17:27 -0700)]
am
7911553d: Merge "Fix for
5369981 Native crash : testPreviewWithEndAudioTrack functional test."
* commit '
7911553d968b6269cedb814f32e45c07fa4068f6':
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."
Hong Teng [Thu, 29 Sep 2011 01:40:38 +0000 (18:40 -0700)]
Fix for
5369981 Native crash : testPreviewWithEndAudioTrack functional test.
Change-Id: Icb8cadaff50a22588417c2c8f5c31415dd0cca9e
James Dong [Tue, 4 Oct 2011 15:33:54 +0000 (08:33 -0700)]
am
4783a631: Video editor incorrectly rejects videos that could be supported by the HW decoder
* commit '
4783a631d2ed6f589c6ee25502200af5dd7a476a':
Video 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
Rajneesh Chowdury [Mon, 26 Sep 2011 16:31:35 +0000 (09:31 -0700)]
am
c02ee953: Merge "Fix for
5205420 compression domain trimming fallback mechanism"
* commit '
c02ee953e7f726fd3337f2a7a876a4f45c3e4aff':
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"
Rajneesh Chowdury [Fri, 23 Sep 2011 21:46:39 +0000 (14:46 -0700)]
am
42bfeb04: (-s ours) am
996fb989: (-s ours) DO NOT MERGE. Fix for
5247764 profile and level settings are not always correctly set
* commit '
42bfeb04478b32d6c62c4e4fd8d137732affdfc7':
DO NOT MERGE. Fix for
5247764 profile and level settings are not always correctly set
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
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
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
Rajneesh Chowdury [Thu, 22 Sep 2011 21:16:27 +0000 (14:16 -0700)]
am
79c9d7c2: Fix for
5274212 Transition clip contains more video frames from 1 video clip than the other
* commit '
79c9d7c2b76fb995dbcc0502699009c8667ef1d9':
Fix for
5274212 Transition clip contains more video frames from 1 video clip than the other
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
Rajneesh Chowdury [Fri, 16 Sep 2011 00:40:21 +0000 (17:40 -0700)]
am
85026dc3: (-s ours) am
2e200ef7: (-s ours) DO NOT MERGE - Fix for bug
5255159 Cannot play exported movie from Movie Studio
* commit '
85026dc3996259c20277ba473c074de82335b9c5':
DO NOT MERGE - Fix for bug
5255159 Cannot play exported movie from Movie Studio
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
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
Rajneesh Chowdury [Thu, 15 Sep 2011 17:05:43 +0000 (10:05 -0700)]
am
4eb35d17: Merge "Fix for
5247764 profile and level settings are not always correctly set"
* commit '
4eb35d178beedb6a952664ddfd514e8eed79e663':
Fix for
5247764 profile and level settings are not always correctly set
Rajneesh Chowdury [Thu, 15 Sep 2011 17:03:57 +0000 (10:03 -0700)]
am
1d971477: Fix for bug
5255159 Cannot play exported movie from Movie Studio
* commit '
1d9714779c78297afccca96fa93f652991a14097':
Fix for bug
5255159 Cannot play exported movie from Movie Studio
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"
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
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
Hong Teng [Tue, 13 Sep 2011 17:14:17 +0000 (10:14 -0700)]
am
c5cb77e4: Fix for -
5234840 corrupted frames in transition. -Green frames in image transition.
* commit '
c5cb77e4ee0b21b5ecb235ec86b31f3fed828693':
Fix for -
5234840 corrupted frames in transition. -Green frames in image transition.
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
Chih-Chung Chang [Tue, 6 Sep 2011 03:59:18 +0000 (20:59 -0700)]
am
5694fb4b: Enable some logs to debug
5195693.
* commit '
5694fb4b48eef9364473c34f0e013dc4baf576e6':
Enable some logs to debug
5195693.
Chih-Chung Chang [Tue, 6 Sep 2011 03:59:17 +0000 (20:59 -0700)]
am
4a5d8c67: Fix
5240036: We didn\'t handle the 1920x1080 resolution.
* commit '
4a5d8c671172fbafe9964d2d71137e7f69a26df9':
Fix
5240036: We didn't handle the 1920x1080 resolution.
Chih-Chung Chang [Mon, 5 Sep 2011 06:49:35 +0000 (14:49 +0800)]
Enable some logs to debug
5195693.
Change-Id: I1c71b6fa6b8dbcbf2a6685be5f24afddab4afc5d
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
Rajneesh Chowdury [Thu, 1 Sep 2011 00:18:16 +0000 (17:18 -0700)]
am
16757d25: Fix for
5156702 Rotate video output for thumbnails and export
* commit '
16757d256453f0c765c13ca9d97ca89fc5565420':
Fix 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
Chih-Chung Chang [Tue, 30 Aug 2011 03:39:19 +0000 (20:39 -0700)]
am
3dfb1013: Merge "Fix
5200858: we need to pass timestamp to render correct frames."
* commit '
3dfb1013e98178bace7a4437288018780141f556':
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."
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
Chih-Chung Chang [Mon, 29 Aug 2011 07:42:04 +0000 (15:42 +0800)]
resolved conflicts for merge of
fc3d6b6b to ics-aah
Change-Id: I63d2f5cc45de5be7fe5ce54bb36194067410180f
Chih-Chung Chang [Mon, 29 Aug 2011 04:57:59 +0000 (21:57 -0700)]
Merge "Fix
5123908: Native crash rewinding movie"
Mike J. Chen [Mon, 15 Aug 2011 19:06:45 +0000 (12:06 -0700)]
Incorporate aah changes to AudioBufferProvider into VideoEditor
This is a squashed merge from master-tungsten of the following change:
commit
e1bec6e10c8d7462a0970568153a2d9db1463e6e
Author: Jason Simmons <jsimmons@google.com>
Date: Thu Jun 16 14:22:57 2011 -0700
Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp
Change-Id: I565b48450f98089767bf92b435826c9f4baeb01c
Change-Id: I76021f5de9aad92381678e299c8e8b5a77d577bf
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
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
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
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
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
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
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
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
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
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
Rajneesh Chowdury [Tue, 9 Aug 2011 17:14:21 +0000 (10:14 -0700)]
Merge "Fix 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
Chih-Chung Chang [Fri, 5 Aug 2011 09:52:45 +0000 (17:52 +0800)]
Rename YV12 to I420.
Change-Id: I453b7044bf46950ef67091f3417ed3e6a65086a0
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
James Dong [Thu, 4 Aug 2011 18:40:51 +0000 (11:40 -0700)]
Merge "Remove excessive logging"
Chih-Chung Chang [Mon, 1 Aug 2011 08:34:05 +0000 (16:34 +0800)]
Remove unused mLastVideoBuffer and bAppliedVideoEffect.
Change-Id: I29511aaa714494a1a6caa4ed95bbc26370b37246
James Dong [Tue, 2 Aug 2011 17:35:09 +0000 (10:35 -0700)]
Remove excessive logging
Change-Id: Ie0b37da59ad326184c983626c45ea78908e7c2b7
related-to-bug:
5109084
Chih-Chung Chang [Mon, 1 Aug 2011 04:15:59 +0000 (12:15 +0800)]
Remove PreviewLocalRenderer (simplify the code).
Change-Id: I1f04e591cd0a33eb70bd93d5600aba12e727386e
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
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
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
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
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
Chih-Chung Chang [Thu, 21 Jul 2011 21:03:25 +0000 (14:03 -0700)]
Merge "Remove hard-coded requirement for number of buffers."
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."
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
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"
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
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
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
Mathias Agopian [Fri, 15 Jul 2011 01:04:25 +0000 (18:04 -0700)]
Merge "Use 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
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
Jeff Brown [Tue, 12 Jul 2011 19:15:30 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Jeff Brown [Tue, 12 Jul 2011 05:12:22 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: Ida75833739d363061c2e688a6c7f7d7b3f3edd1e
Chih-Chung Chang [Mon, 11 Jul 2011 18:24:49 +0000 (02:24 +0800)]
Fix
4973565: implement getFormat() like Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe.
Change-Id: I9c684fa971d5ef3f975017cbaaf06ba789a6c41f
Rajneesh Chowdury [Sat, 2 Jul 2011 01:06:15 +0000 (18:06 -0700)]
Fix of issue
4973565 Cannot export movie.
Also fixes
4441452 Native Crash after applying transition
Change-Id: Ic48c44bc2c5d07e57edb8f63393cea424d3275f4
James Dong [Fri, 1 Jul 2011 15:36:21 +0000 (08:36 -0700)]
Merge "add private copy constructor and assignment operator to four media source classes"
James Dong [Wed, 29 Jun 2011 06:36:52 +0000 (23:36 -0700)]
add private copy constructor and assignment operator to four media source classes
o this patch addresses the encoder and decoder sources for audio and video
Change-Id: I918784ca22138267c270836c91312540eedebc7f
Chih-Chung Chang [Thu, 30 Jun 2011 07:13:39 +0000 (15:13 +0800)]
Remove curtain effects (they are unused).
Change-Id: I8e1ccad3e9ddf4c272e85e7ca04582b4863c242d
Chih-Chung Chang [Thu, 30 Jun 2011 06:21:38 +0000 (14:21 +0800)]
Make line-ending consistent (unix style).
Change-Id: Id837b042952ff5d97907591f337b2222cff2c8a9
James Dong [Wed, 29 Jun 2011 01:46:46 +0000 (18:46 -0700)]
Simplified regulBitRate() method and fixed a copy and paste error in stop() method
Change-Id: I589aea9471130e690594f91598853a1f08dca081
Rajneesh Chowdury [Tue, 28 Jun 2011 00:47:22 +0000 (17:47 -0700)]
Merge "Fix for issue
4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, &lastBufferTimeUs) fails"
Rajneesh Chowdury [Mon, 27 Jun 2011 21:26:58 +0000 (14:26 -0700)]
Fix for issue
4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, &lastBufferTimeUs) fails
Change-Id: I353bd9e8aa1eceb9c14040a9953777967500fb1d
Rajneesh Chowdury [Mon, 27 Jun 2011 21:16:59 +0000 (14:16 -0700)]
Fix for issue
4949999 getFormat() returns NULL
Change-Id: Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe
James Dong [Mon, 27 Jun 2011 16:49:12 +0000 (09:49 -0700)]
Fix copy and paste errors for mime type strings in the 3GP reader
Change-Id: Ia91b06f4dba9e4265260b28aabeeffeceff6d157
Thomas Le Guevel [Thu, 23 Jun 2011 17:06:33 +0000 (10:06 -0700)]
Fix for:
4676350 Do not use dual copyright declaration for video editor code
Change-Id: I2856be051fa3b3ddfe67e096e45fb0b34beb92be
Glenn Kasten [Wed, 1 Jun 2011 22:20:41 +0000 (15:20 -0700)]
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit
dd51bdc4cf4b7c9f09e7dc4116651c6681d5287c
Glenn Kasten [Wed, 4 May 2011 22:37:39 +0000 (15:37 -0700)]
Use AudioTrack::event_type not int in callback
Change-Id: I09ff321f9457c0a9ee58e59bee38ed53799e494b
The Android Open Source Project [Fri, 20 May 2011 20:51:17 +0000 (13:51 -0700)]
Reconcile with honeycomb-release
Change-Id: Ibbe91b2c58ef41c449cb4b125b4b6e4034a71ed5
Dima Zavin [Wed, 11 May 2011 21:15:37 +0000 (14:15 -0700)]
update for new audio.h header location
Change-Id: I593b91a84a603d8c7f51a83232cced5af4980baf
Signed-off-by: Dima Zavin <dima@android.com>