OSDN Git Service
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:22 +0000 (09:45 -0700)]
am
2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
* commit '
2aa37a7d15f5e2246b8996d2600269684904c581':
recordvideo: Add an option for choosing software encoders
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:45:22 +0000 (09:45 -0700)]
am
9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
* commit '
9ce74352d23d833f9627b7be58be964206e6ff6d':
recordvideo: Sleep while waiting for the encoding to finish
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:26 +0000 (09:07 -0700)]
Merge "recordvideo: Add an option for choosing software encoders"
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:07:19 +0000 (09:07 -0700)]
Merge "recordvideo: Sleep while waiting for the encoding to finish"
Martin Storsjo [Wed, 29 Aug 2012 10:41:01 +0000 (13:41 +0300)]
recordvideo: Sleep while waiting for the encoding to finish
This avoids busy looping while e.g. waiting for the software encoder
to finish.
This is similar to what the 'record' and 'stagefright' test apps
do.
Change-Id: Idce55b15396ce78b621a521229603bec1e799f33
Martin Storsjo [Wed, 29 Aug 2012 10:28:33 +0000 (13:28 +0300)]
recordvideo: Add an option for choosing software encoders
This is similar to the same option in the 'stagefright' test
application.
Change-Id: I2a2e5201bd93460df0911ef12865c9030c0183e5
Jean-Baptiste Queru [Thu, 23 Aug 2012 20:01:44 +0000 (13:01 -0700)]
am
4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '
4b60ac04a878eaf8344b56189509ccd6925855c2':
Fixed redefinition of 'i' with a different type error
Jean-Baptiste Queru [Thu, 23 Aug 2012 20:01:43 +0000 (13:01 -0700)]
am
6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '
6e55a0f71eef07c6041077e6e9e7fad8c973a752':
Fixed member access into incomplete type build error
Jean-Baptiste Queru [Thu, 23 Aug 2012 19:42:48 +0000 (12:42 -0700)]
Merge "Fixed redefinition of 'i' with a different type error"
Jean-Baptiste Queru [Thu, 23 Aug 2012 19:42:24 +0000 (12:42 -0700)]
Merge "Fixed member access into incomplete type build error"
Tareq A. Siraj [Thu, 26 Jul 2012 20:53:14 +0000 (16:53 -0400)]
Fixed redefinition of 'i' with a different type error
Renamed the redefinition of 'i' to 'k'.
Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Tareq A. Siraj [Fri, 27 Jul 2012 15:49:32 +0000 (11:49 -0400)]
Fixed member access into incomplete type build error
Included the ARTPAssembler.h file to fix the 'member access into
incomplete type "android::ARTPAssembler"' error reported by clang.
Change-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane<edwin.vane@intel.com>
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:15:00 +0000 (10:15 -0700)]
am
1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '
1e75e9721254ae5df05c3d88b30ed7f778406261':
avcenc: Update a comment about the inline assembly
Jean-Baptiste Queru [Tue, 21 Aug 2012 17:14:59 +0000 (10:14 -0700)]
am
aa411adf: Merge "h264 streaming: make profile-level-id optional"
* commit '
aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3':
h264 streaming: make profile-level-id optional
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:49:26 +0000 (09:49 -0700)]
Merge "avcenc: Update a comment about the inline assembly"
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:18:31 +0000 (09:18 -0700)]
Merge "h264 streaming: make profile-level-id optional"
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:08:38 +0000 (09:08 -0700)]
am
5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"
* commit '
5ebce52c46360b349daa8c944ca81e3c74accec0':
avcenc: Fix the gcc inline assembly constraints
Jean-Baptiste Queru [Tue, 21 Aug 2012 16:08:37 +0000 (09:08 -0700)]
am
9e13e927: Merge "avcenc: Properly indent assembly blocks"
* commit '
9e13e927206b7c7c15359af2b0ccc8f525e78a7d':
avcenc: Properly indent assembly blocks
Jean-Baptiste Queru [Tue, 21 Aug 2012 15:37:26 +0000 (08:37 -0700)]
Merge "avcenc: Fix the gcc inline assembly constraints"
Jean-Baptiste Queru [Tue, 21 Aug 2012 15:36:58 +0000 (08:36 -0700)]
Merge "avcenc: Properly indent assembly blocks"
Martin Storsjo [Tue, 21 Aug 2012 11:28:45 +0000 (12:28 +0100)]
avcenc: Update a comment about the inline assembly
Since the inline assembly was fixed in commit
3fdb405597f the
comment was no longer accurate.
Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
Martin Storsjo [Fri, 13 Apr 2012 11:17:30 +0000 (14:17 +0300)]
avcenc: Fix the gcc inline assembly constraints
Use +r for registers whose value is used as input to the block.
Also switch input registers to output registers with +r, for
registers that are modified by the assembly block (SUB_SAD in
sad_inline.h).
Without this, the inline assembly fails on modern gcc versions
(tested on gcc 4.6), where the intended input value never is
loaded into the registers, causing segfaults at runtime.
Currently this assembly isn't used, but this change makes it
work properly if enabled.
Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
Martin Storsjo [Fri, 13 Apr 2012 11:16:54 +0000 (14:16 +0300)]
avcenc: Properly indent assembly blocks
Also line break multiline assembly blocks - previously they were
virtually unreadable.
Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
Nick Kralevich [Mon, 20 Aug 2012 19:53:43 +0000 (12:53 -0700)]
am
46b7eeb8: Merge "hardening: eliminate text relocations from h264"
* commit '
46b7eeb8be7449515082ecb1a61700affb44115f':
hardening: eliminate text relocations from h264
Nick Kralevich [Mon, 20 Aug 2012 18:55:17 +0000 (11:55 -0700)]
Merge "hardening: eliminate text relocations from h264"
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:13 +0000 (09:40 -0700)]
am
cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit '
cd622346235829f60246a061560adf5921ba129c':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:12 +0000 (09:40 -0700)]
am
02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '
02a4ec216cf5ca903e1765ca3e7ff2985436b236':
avcenc: Remove a leftover define
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:54:11 +0000 (08:54 -0700)]
Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:53:54 +0000 (08:53 -0700)]
Merge "avcenc: Remove a leftover define"
Martin Storsjo [Mon, 20 Aug 2012 13:34:14 +0000 (14:34 +0100)]
MPEG2TSWriter: Fix an off-by-one in the condition for padding
This makes a remuxed file play without any decoding warnings,
while there still were some occasional warnings with the previous
version.
Change-Id: I31d73446ded1eeb3da10783c5ef841270563ca12
Patrik2 Carlsson [Mon, 20 Aug 2012 07:53:09 +0000 (09:53 +0200)]
h264 streaming: make profile-level-id optional
profile-level-id is made optional according to rfc3984:
"If no profile-level-id is present, the Baseline Profile without
additional constraints at Level 1 MUST be implied."
Change-Id: If868468a48917ceccb963b8ac15767583da29723
Martin Storsjo [Fri, 17 Aug 2012 08:28:09 +0000 (11:28 +0300)]
avcenc: Remove a leftover define
This should have been removed as part of
f5af6314db, but
the second __arm__ define was introduced after the original commit
was written, and not removing the second one was an oversight in
rebasing the patch on top of the new code.
Change-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:37:44 +0000 (17:37 -0700)]
am
64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"
* commit '
64b3fe55f7edd16be32e07c28c2c90f84f3b9b80':
stagefright amrnb: Remove unused leftover source files
Jean-Baptiste Queru [Fri, 17 Aug 2012 00:37:43 +0000 (17:37 -0700)]
am
c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit '
c1d2777c8004a9491e1381cca33a6768faed50c3':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Jean-Baptiste Queru [Thu, 16 Aug 2012 23:42:06 +0000 (16:42 -0700)]
Merge "stagefright amrnb: Remove unused leftover source files"
Jean-Baptiste Queru [Thu, 16 Aug 2012 23:40:19 +0000 (16:40 -0700)]
Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:28 +0000 (15:29 -0700)]
am
dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '
dde79acfb97083d690e3cceabff78931b10d1539':
hardening: eliminate text relocations from mp3
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:26 +0000 (15:29 -0700)]
am
b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit '
b7ca7dc9652456181080bf28ec376bc5a36cf6a2':
avcenc: Clarify the ifdefs surrounding inline assembly
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:25 +0000 (15:29 -0700)]
am
4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '
4f981882da8080e1d41d000bfbad92df61adcfba':
hardening: eliminate text relocations from amrwb
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:24 +0000 (15:29 -0700)]
am
c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '
c3bfa0260a530af3e9c091c1c9d90d1283021dd6':
aacenc/amrwbenc: Remove the now unused LINUX define
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:23 +0000 (15:29 -0700)]
am
3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '
3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49':
aacenc/amrwbenc: Remove unused and dubious typedefs
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:45:30 +0000 (14:45 -0700)]
Merge "hardening: eliminate text relocations from mp3"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:44:54 +0000 (14:44 -0700)]
Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:44:39 +0000 (14:44 -0700)]
Merge "hardening: eliminate text relocations from amrwb"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:42:35 +0000 (14:42 -0700)]
Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:42:16 +0000 (14:42 -0700)]
Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
Martin Storsjo [Wed, 7 Mar 2012 11:17:52 +0000 (13:17 +0200)]
aacenc/amrwbenc: Remove the now unused LINUX define
This is no longer used by the codec code (except for the
amrwbenc sample).
Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
Martin Storsjo [Thu, 23 Jun 2011 07:53:55 +0000 (10:53 +0300)]
aacenc/amrwbenc: Remove unused and dubious typedefs
These typedefs aren't used anywhere, and their description
doesn't really match their actual definition. The VO_TCHAR
type is even defined as pointer for one configuration and
as non-pointer for another configuration.
This gets rid of the last use of the LINUX define in the
VO codecs (except for the amrwbenc sample application).
Within the codecs, the use of this define is unclear - does it
indicate code specific to android but not normal linux, linux
but not other unixes, unix but not windows, or gcc but not
other compilers, etc.
Originally, prior to cleanup, the define has meant many
different of these - these uses has now been cleaned up to
use the proper feature detection macros (e.g. looking for
defines automatically set by the compiler, instead of
relying on manually setting this define).
Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
Jean-Baptiste Queru [Wed, 15 Aug 2012 18:24:36 +0000 (11:24 -0700)]
am
2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
* commit '
2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
MPEG2TSWriter: Correctly add padding using the adaptation field
Jean-Baptiste Queru [Wed, 15 Aug 2012 17:14:29 +0000 (10:14 -0700)]
Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
Paul Fariello [Mon, 23 Jan 2012 16:32:06 +0000 (17:32 +0100)]
MPEG2TSWriter: Correctly add padding using the adaptation field
Change-Id: I268cce36ada910ba168c4c9dcedab0b20f6e6ebb
Jean-Baptiste Queru [Mon, 13 Aug 2012 22:19:13 +0000 (15:19 -0700)]
am
98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '
98159acd68307bf0fcec40ae0fffc1a715517d1d':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
Jean-Baptiste Queru [Mon, 13 Aug 2012 21:37:57 +0000 (14:37 -0700)]
Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
Ard Biesheuvel [Mon, 13 Aug 2012 20:55:51 +0000 (22:55 +0200)]
hardening: eliminate text relocations from h264
Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
Ard Biesheuvel [Mon, 13 Aug 2012 20:47:33 +0000 (22:47 +0200)]
hardening: eliminate text relocations from mp3
Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
Ard Biesheuvel [Mon, 13 Aug 2012 20:44:43 +0000 (22:44 +0200)]
hardening: eliminate text relocations from amrwb
Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:53:51 +0000 (10:53 -0700)]
am
5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '
5efa7bf945f53c419501b0a4f9718962f24f0df5':
amrnb: Fix audio distortion in an AMR-NB clip
Jean-Baptiste Queru [Mon, 13 Aug 2012 17:37:03 +0000 (10:37 -0700)]
Merge "amrnb: Fix audio distortion in an AMR-NB clip"
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:32:40 +0000 (15:32 -0700)]
am
24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
* commit '
24893fef8e0f816a8a21749fa3eb9eed9173a0fd':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 22:26:43 +0000 (15:26 -0700)]
Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:26:41 +0000 (09:26 -0700)]
am
2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
* commit '
2001d2ac01e36c13c1abda5f73b6404cba2648e1':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:26:40 +0000 (09:26 -0700)]
am
c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."
* commit '
c64a178711bf7bb9b71d65a47156b34083311392':
Fix initialization of audio mixer track resources for MIPS.
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:54 +0000 (09:03 -0700)]
Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:03:15 +0000 (09:03 -0700)]
Merge "Fix initialization of audio mixer track resources for MIPS."
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:18 +0000 (14:04 -0700)]
am
e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit '
e28df5b996af3480b457c7a9908dbb9d52ad8d7c':
Store correct time stamps in recorded mp4 files
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:40:33 +0000 (13:40 -0700)]
Merge "Store correct time stamps in recorded mp4 files"
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:17 +0000 (13:08 -0700)]
am
efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit '
efee009528f446542d51f1ce50e2189e8a2f71dd':
Correct ID3::StringSize calculation for UCS-2 data.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:16 +0000 (13:08 -0700)]
am
a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"
* commit '
a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f':
avcenc: Remove redundant zero-initialization of allocated memory
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:15 +0000 (13:08 -0700)]
am
b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
* commit '
b71298eeeb16d942dd5144e550731e6e29b6436e':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:14 +0000 (13:08 -0700)]
am
0ab18f85: Merge "avcenc: Remove useless casts"
* commit '
0ab18f853571149de700930fbb783ecd6b2c5582':
avcenc: Remove useless casts
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:13 +0000 (13:08 -0700)]
am
67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '
67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9':
Initialize pool's buffer pointers to null.
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:12 +0000 (13:08 -0700)]
am
0822156c: Merge "avcenc: Fix indentation"
* commit '
0822156cfd25c111cd33932ee9a89b3100d0350c':
avcenc: Fix indentation
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:11 +0000 (13:08 -0700)]
am
874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
* commit '
874a074ad88117d9fabf178b5b4a1c885dc512f5':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:08:10 +0000 (13:08 -0700)]
am
b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
* commit '
b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92':
mediacodec: Return an error on getOutputFormat if there is no output format yet
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:58:42 +0000 (12:58 -0700)]
Merge "Correct ID3::StringSize calculation for UCS-2 data."
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:09:01 +0000 (12:09 -0700)]
Merge "avcenc: Remove redundant zero-initialization of allocated memory"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:44 +0000 (12:08 -0700)]
Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:19 +0000 (12:08 -0700)]
Merge "avcenc: Remove useless casts"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:08:04 +0000 (12:08 -0700)]
Merge "Initialize pool's buffer pointers to null."
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:07:47 +0000 (12:07 -0700)]
Merge "avcenc: Fix indentation"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:07:27 +0000 (12:07 -0700)]
Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:06:48 +0000 (12:06 -0700)]
Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
Paul Lind [Thu, 2 Aug 2012 01:49:49 +0000 (18:49 -0700)]
Fix initialization of audio mixer track resources for MIPS.
The value 1 << 32 (maxNumTracks defaults to 32) is surprisingly not defined
in C, and differs on MIPS than the other arch.
Therefore the track resources were not initialized properly, resulting
in failure to play any audio.
The fix allows the mConfiguredNames bitmask to be correctly set to all
1's in the 32-track case, for all arch.
Change-Id: Ied3e1305952e9567602e2cd76c5ef3acb0809ee0
Signed-off-by: Paul Lind <plind@mips.com>
Eino-Ville Talvala [Thu, 2 Aug 2012 00:22:34 +0000 (17:22 -0700)]
am
ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"
* commit '
ffd99cb795c92caee7f4bd0b26af9ae37b100fc3':
Shutter sound is heard at the end of the recorded video
Eino-Ville Talvala [Wed, 1 Aug 2012 23:13:50 +0000 (16:13 -0700)]
Merge "Shutter sound is heard at the end of the recorded video"
Johannes Carlsson [Thu, 8 Mar 2012 10:06:13 +0000 (11:06 +0100)]
Store correct time stamps in recorded mp4 files
According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and
21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time"
which is not the same as Unix epoch time. This is already correctly
handled in MPEG4Extractor.cpp when reading files.
The specification also supports 64 bit timestamps which would make
it a bit more future proof, but unfortunately it seems like support
for this in players are poor (tested both Windows media player and
Quicktime player).
Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
The Android Open Source Project [Fri, 27 Jul 2012 21:51:43 +0000 (14:51 -0700)]
Reconcile with jb-release
Change-Id: Iab9b19384ab6706f1dfca89f21ffc142f47225a3
The Android Automerger [Wed, 25 Jul 2012 03:23:10 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Thu, 19 Jul 2012 15:37:02 +0000 (08:37 -0700)]
Reconcile with jb-mr0-release
Change-Id: I783dd9fbd723bb284932123dfa9e06fb7c7ab879
The Android Automerger [Thu, 19 Jul 2012 06:04:41 +0000 (23:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 17 Jul 2012 19:30:26 +0000 (12:30 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Edwin Wong [Fri, 13 Jul 2012 22:12:24 +0000 (15:12 -0700)]
am
65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '
65e8d62a5b243518795cdafa498df4a49baf6940':
Fixed sample video corrupted in MediaCodec mode.
Edwin Wong [Fri, 13 Jul 2012 22:11:07 +0000 (15:11 -0700)]
Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
Edwin Wong [Wed, 11 Jul 2012 03:01:13 +0000 (20:01 -0700)]
Fixed sample video corrupted in MediaCodec mode.
Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a
related-to-bug:
6732061
Martin Storsjo [Fri, 13 Jul 2012 09:48:19 +0000 (12:48 +0300)]
mediacodec: Return an error on getOutputFormat if there is no output format yet
This avoids crashing if calling the public java method
MediaCodec.getOutputFormat immediately after MediaCodec.start
(as the documentation example shows that one should do!).
Change-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58
Martin Storsjo [Mon, 16 Apr 2012 17:51:34 +0000 (20:51 +0300)]
avcenc: Remove redundant zero-initialization of allocated memory
The allocation callback is now supposed to always return initialized
memory.
Change-Id: I7a4d036e498c9f87c730dda3aab5057eb764a1e7
Martin Storsjo [Mon, 16 Apr 2012 17:50:37 +0000 (20:50 +0300)]
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
Valgrind reported use of uninitialized memory in AVCEncodeSlice,
which this fixes.
Change-Id: Ia09ad3e50d05b2b0487a4d588d9b00fc0828c816
Truls Bengtsson [Wed, 11 Jul 2012 13:50:44 +0000 (15:50 +0200)]
Initialize pool's buffer pointers to null.
If these pointers are not properly initialized to null and
allocation of one of the buffers subsequently fail, the freePool
mechanism might erroneously free uninitialized pointers.
Change-Id: I2101bdb2cc576e5f50b5a1440e6fc0c54dc4e81b
Jesper Tragardh [Wed, 11 Jul 2012 12:13:47 +0000 (14:13 +0200)]
Correct ID3::StringSize calculation for UCS-2 data.
Album art was not displayed when albums were transferred via MediaGo
because the length of the description in the APIC tag was not
correctly calculated.
The method StringSize used to calculate the length of the tag
does not add the size of the null termination in UCS-2 case.
Change-Id: I5409d42f5e87d315e6e03c4d7e6cbd8a378a160d
Martin Storsjo [Fri, 13 Apr 2012 11:17:14 +0000 (14:17 +0300)]
avcenc: Fix indentation
Change-Id: I4fcdf619e3b75387a7909272f3164b8d608b6cc2