OSDN Git Service
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
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>
Thomas Le Guevel [Fri, 6 May 2011 20:32:09 +0000 (13:32 -0700)]
Merge "Fix for issue
4035003 Support for 64 bit datatype a. M4OSA_64BITS_SUPPORTED removed b. M4OSA_64BITS_NOT_SUPPORTED removed c. M4OSA_UInt64 removed d. M4OSA_Int64 removed e. M4OSA_INT32_FROM_INT32 removed f. M4OSA_TIME_FROM_INT32_UINT32 removed g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h"
hongteng [Fri, 22 Apr 2011 22:23:37 +0000 (15:23 -0700)]
Fix for issue
4035003 Support for 64 bit datatype
a. M4OSA_64BITS_SUPPORTED removed
b. M4OSA_64BITS_NOT_SUPPORTED removed
c. M4OSA_UInt64 removed
d. M4OSA_Int64 removed
e. M4OSA_INT32_FROM_INT32 removed
f. M4OSA_TIME_FROM_INT32_UINT32 removed
g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h
Change-Id: I2b1751962945dcc668e995d05a57b66cd268642f
James Dong [Wed, 4 May 2011 06:31:23 +0000 (23:31 -0700)]
Clean up background audio processing code
Change-Id: I6184e71cb0ccfdb1fc5f250bd7ecd4555efad482
Iliyan Malchev [Tue, 3 May 2011 23:43:21 +0000 (16:43 -0700)]
Merge "android_native_buffer_t --> ANativeWindowBuffer"
Iliyan Malchev [Sun, 1 May 2011 18:38:07 +0000 (11:38 -0700)]
android_native_buffer_t --> ANativeWindowBuffer
Change-Id: Id43b27ed2d1b85488b731948d018da0c0fd0c50d
Signed-off-by: Iliyan Malchev <malchev@google.com>
James Dong [Tue, 3 May 2011 01:23:42 +0000 (18:23 -0700)]
Clean up VideoEditorSRC
o removed unused member variables
o removed pre-processor for FROYO, since we only made video editor available after HC.
o cleaned up the header includes
Change-Id: I101775cc384310d661a65485113ac1bc1f6cdf17
James Dong [Tue, 3 May 2011 01:12:22 +0000 (18:12 -0700)]
Cleaned up dummy audio and video sources
o remove unused member variables
o replace a full loop with a memset
Change-Id: Ib482525a321c2a17dd188fba47b642c63ab811c3
James Dong [Mon, 2 May 2011 23:36:48 +0000 (16:36 -0700)]
Fix a typo in filename "M4ChannelCoverter.c"
Change-Id: If7e3afa8ac10fc34e920a199fd31526ced0a2534
James Dong [Sun, 1 May 2011 19:36:22 +0000 (12:36 -0700)]
Separate preview player from AwesomePlayer and also video editor audio player from AudioPlayer
Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4
Gloria Wang [Tue, 26 Apr 2011 00:29:16 +0000 (17:29 -0700)]
Add setParameter/getParameter to MediaPlayer API
for bug
1982947
Change-Id: Ic32704367bdcf2ade3f035a164927e95c69af7fa
Dima Zavin [Tue, 5 Apr 2011 23:13:49 +0000 (16:13 -0700)]
libvideoeditor: convert to use new audio.h
Change-Id: I39726f6f6cd5aabbd91629f329876660b3d3cec2
Signed-off-by: Dima Zavin <dima@android.com>
hongteng [Fri, 22 Apr 2011 20:48:46 +0000 (13:48 -0700)]
Fix for issue
3385135 "source code cleanup" engine part
- Removed below unused functions
a. M4PTO3GPP_RegisterExternalVideoEncoder
b. M4VSS3GPP_editRegisterExternalVideoDecoder
c. M4VSS3GPP_editRegisterExternalVideoEncoder
d. M4VSS3GPP_extractPictureRegisterExternalVideoDecoder
e. M4VSS3GPP_editRegisterExternalCodec
f. M4VSS3GPP_editSubscribeExternalCodecs
g. M4VSS3GPP_intSubscribeExternalCodecs
h. M4VSS3GPP_intClipRegisterExternalVideoDecoder
i. M4xVSS_RegisterExternalVideoDecoder
j. M4xVSS_RegisterExternalVideoEncoder
k. M4MCS_registerExternalVideoDecoder
l. M4MCS_registerExternalVideoEncoder
m. M4MCS_registerExternalAudioDecoder
n. M4MCS_registerExternalAudioEncoder
o. M4DECODER_EXTERNAL_getInterface
- Also remove small code associated with these functions and Remove below unsused src + header files
a. M4CLOCK.h
b. M4MDP_API.h
c. M4VD_EXTERNAL_Internal.h
d. M4VD_HW_API.h
e. M4VE_API.h
f. M4_Logo.h
g. M4VD_EXTERNAL_Interface.c
h. LV_Types.h
i. M4OSA_FileAccess.h
j. M4OSA_FileCache.h
k. M4OSA_FileExtra.h
l. M4OSA_FileReaderRam.h
m. M4OSA_FileWriterRam.h
n. M4OSA_String.h
o. M4OSA_String_priv.h
p. M4OSA_FileCache.c
q. M4OSA_FileExtra.c
r. M4OSA_FileReader_RAM.c
s. M4OSA_FileWriter_RAM.c
t. M4OSA_String.c
u. M4OSA_String_priv.c
Change-Id: I7271cbe92168e665a8e5b7afe7c7fe1c331eaa1e
hongteng [Fri, 22 Apr 2011 06:01:07 +0000 (23:01 -0700)]
Fix for issue
3385135 "source code cleanup" engine part
- remove commented code
- remove code under #if 0
- remove macro FILE_LOWER_CASE as it is not used
- remove macro #if 1
- remove TIMESCALE_BUG macro, and all code under this macro as it is not used
- remove following unused functions:
* M4MCS_getExifInfo
* M4MCS_registerAudioEncoderExtended
* M4MCS_registerVideoDecoderExtended
* M4MCS_registerAudioDecoderExtended
* M4MCS_registerVideoEncoderExtended
Change-Id: I8e2916d956af6d381ae1962fedc61a8b48f60ce2
Shyam Pallapothu [Thu, 21 Apr 2011 16:48:41 +0000 (09:48 -0700)]
Fix for issue
4133431 "Remove OSAL layer" in engine part
Change-Id: I98f98691048a5afc6f691b0cc3cec92e458e8f44
Shyam Pallapothu [Thu, 21 Apr 2011 04:00:48 +0000 (21:00 -0700)]
Fix for issue
4133431 "Remove OSAL layer" in engine part
Change-Id: I9e2e142bcdf3153c529b790e368caea4fdb65ac8
Dheeraj Sharma [Tue, 12 Apr 2011 21:45:11 +0000 (14:45 -0700)]
Fix for issue
4133431 "Remove OSAL layer" in engine part
Change-Id: I79efc956aa0d23fb333d12c8947b48455b7524d1
Mathias Agopian [Wed, 6 Apr 2011 19:22:15 +0000 (12:22 -0700)]
Merge "remove unused references to ISurface"
Mathias Agopian [Tue, 5 Apr 2011 22:38:24 +0000 (15:38 -0700)]
remove unused references to ISurface
Change-Id: Ia11c5f46f38c0b00ca63d19d3484bf4024cdb75d
Andreas Huber [Mon, 4 Apr 2011 18:38:25 +0000 (11:38 -0700)]
Bring videoeditor copies of internal code in sync with recent changes to the originals
Change-Id: Ie534360f9f1f7757c57cffabb0fa4b4903422ecb
related-to-bug:
4193552
Mathias Agopian [Sat, 26 Mar 2011 01:56:28 +0000 (18:56 -0700)]
replace libsurfaceflinger_client by libgui
Change-Id: I50b43cd8a75b8a013ad5f778708dfbc09c1d76d6
Raghavender Palla [Tue, 22 Mar 2011 18:43:14 +0000 (11:43 -0700)]
am
2d449791: Fix for the issue: TestPreviewWithTransition fails (
4133108)
* commit '
2d44979102ca85d5c4ee68d0388ee2fe37c4ec1a':
Fix for the issue: TestPreviewWithTransition fails (
4133108)
Raghavender Palla [Sat, 19 Mar 2011 05:32:51 +0000 (22:32 -0700)]
Fix for the issue: TestPreviewWithTransition fails (
4133108)
Change-Id: I53eb798f4f86e83f8a4668c7256241367c1ccbe4
Raghavender Palla [Wed, 16 Mar 2011 06:50:19 +0000 (23:50 -0700)]
am
fb4d3b2d: Fix for the issue:
4099068 For long duration files, after end of the preview the progress bar is moved to the middle
* commit '
fb4d3b2d94f3f72b7ba13b6dfc17ba215dda2c03':
Fix for the issue:
4099068 For long duration files, after end of the preview the progress bar is moved to the middle
Raghavender Palla [Tue, 15 Mar 2011 03:15:12 +0000 (20:15 -0700)]
Fix for the issue:
4099068 For long duration files, after end of the preview the progress bar is moved to the middle
Change-Id: I3463581138e20e1a00f51183d3be013d6b2cd43f
Iliyan Malchev [Mon, 14 Mar 2011 21:02:15 +0000 (14:02 -0700)]
frameworks/media/libvideoeditor: remove LOCAL_PRELINK_MODULE
Change-Id: Ib3ecb46e1ecc192edae2d5634798efffccbb6c94
Signed-off-by: Iliyan Malchev <malchev@google.com>
Rajneesh Chowdury [Mon, 14 Mar 2011 19:04:31 +0000 (12:04 -0700)]
am
a60cb935: Fix for
4084134 End transition applied on image does not show up in previewer when playback
* commit '
a60cb935edd049ecf4c7ee985d562fff6c703372':
Fix for
4084134 End transition applied on image does not show up in previewer when playback
Rajneesh Chowdury [Fri, 11 Mar 2011 22:02:47 +0000 (14:02 -0800)]
Fix for
4084134 End transition applied on image does not show up in previewer when playback
Change-Id: I72ee9fe95f038c07b6ccfe3305aa6436e882eedf
Ying Wang [Fri, 11 Mar 2011 23:59:11 +0000 (15:59 -0800)]
Remove unused LOCAL_LDFLAGS
LOCAL_LDFLAGS is never used when building static library.
Change-Id: I55c093b1ab1c58081bcbc4d9d91f45025115536c
Santosh Madhava [Fri, 4 Mar 2011 22:55:56 +0000 (14:55 -0800)]
Fix for issue
3453519: do not allow editing of DRM protected contents
Change-Id: I19f56cbdaab0ddb3d1ab0aec8dcf625a3ff3ead2
James Dong [Mon, 7 Mar 2011 22:51:06 +0000 (14:51 -0800)]
Merge "Change trace labels" into honeycomb-mr1
Basavapatna Dattaguru [Fri, 4 Mar 2011 17:48:24 +0000 (09:48 -0800)]
Fix for issue
3371667: fix source code compilation warnings(Moved from master)
Change-Id: Ife1fc3f89beae498a49970ab5d2a080a112ce7c2
James Dong [Fri, 4 Mar 2011 22:43:31 +0000 (14:43 -0800)]
Change trace labels
bug -
3385135
Change-Id: Iad66e122a9e2ce7cce26779f679cbf04dd1a5434
Rajneesh Chowdury [Wed, 2 Mar 2011 22:23:24 +0000 (14:23 -0800)]
Merge "Fix for issue
3427268 Crash when stopping playback"
Rajneesh Chowdury [Wed, 2 Mar 2011 05:15:25 +0000 (21:15 -0800)]
Fix for issue
3427268 Crash when stopping playback
Change-Id: I4cd615ffa8c5db39ec34dc14f6b09fad55cae263
Rajneesh Chowdury [Wed, 2 Mar 2011 20:53:10 +0000 (12:53 -0800)]
am
2a373979: (-s ours) Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
* commit '
2a373979d85649bcb2c67f3751836a2ced6bf1ec':
Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
Santosh Madhava [Wed, 2 Mar 2011 05:31:04 +0000 (21:31 -0800)]
Fix for issue
3495914: (In Preview) Video clip switches between start and end
Change-Id: Ib11c069127b3e81cfc741fab5a4f05a21d382c6b
Rajneesh Chowdury [Mon, 28 Feb 2011 01:56:58 +0000 (17:56 -0800)]
Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
Bug -
3497783
Change-Id: I26eee1538d1f2f86476b115c9e7df85fadd796dd
Rajneesh Chowdury [Mon, 28 Feb 2011 01:56:58 +0000 (17:56 -0800)]
Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
Bug -
3497783
Change-Id: I26eee1538d1f2f86476b115c9e7df85fadd796dd
Andreas Huber [Fri, 25 Feb 2011 17:15:05 +0000 (09:15 -0800)]
DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
Change-Id: Iae0c63e936b2042473def8839f663605e68b6066
Basavapatna Dattaguru [Mon, 28 Feb 2011 05:04:57 +0000 (21:04 -0800)]
FIX for Issue Fix for issue
3371667: fix source code compilation warnings(3)
Change-Id: I15e8572cbce7443fba9afcd494a92038a5a0bd43
Basavapatna Dattaguru [Mon, 28 Feb 2011 20:25:56 +0000 (12:25 -0800)]
Merge "Fix for issue
3371667: fix source code compilation warnings"
Rajneesh Chowdury [Mon, 28 Feb 2011 17:09:15 +0000 (09:09 -0800)]
Merge "Fix for memory leak with single audio player instance"
Rajneesh Chowdury [Sat, 26 Feb 2011 06:59:46 +0000 (22:59 -0800)]
Fix for memory leak with single audio player instance
Change-Id: Idb0d24ac1a4fbe21c5f63871a4c7da2beb90e516
Basavapatna Dattaguru [Sat, 26 Feb 2011 04:25:04 +0000 (20:25 -0800)]
Fix for issue
3371667: fix source code compilation warnings
Change-Id: I6cb6950af55effe0da6d421eaa5feb179be68158
Andreas Huber [Fri, 25 Feb 2011 23:43:02 +0000 (15:43 -0800)]
am
aabc3e13: (-s ours) DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
* commit '
aabc3e13ddf230dd0c9ad5edc0c3eb2687d671cb':
DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
Andreas Huber [Fri, 25 Feb 2011 17:15:05 +0000 (09:15 -0800)]
DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
Change-Id: Iae0c63e936b2042473def8839f663605e68b6066
Andreas Huber [Thu, 24 Feb 2011 23:25:21 +0000 (15:25 -0800)]
And again keep this copy of our internal sources in sync, so much fun...
Change-Id: I4b588f14ba2d06d3163615557fd97fc2a5f6ca47
related-to-bug:
3375737
Glenn Kasten [Mon, 14 Feb 2011 19:56:16 +0000 (11:56 -0800)]
Bug
3438258 surface textures
This is sufficient to build, but is not a full implementation.
See bug
3467199 for the real implementation.
Change-Id: Ifc3325fa9b019669bffddfd7bfd10bce57d0a136
Basavapatna Dattaguru [Thu, 24 Feb 2011 04:25:47 +0000 (20:25 -0800)]
VideoEditor: Issue ID:
3371667: Fix Set1
Change-Id: I728bc27b86e0c8720a2d05e6cff8a76f820bf016
Rajneesh Chowdury [Wed, 23 Feb 2011 00:34:00 +0000 (16:34 -0800)]
Merge "Fix for
3369917 Audio skips at clip edit points"