| bc1713d3b85d7ce656e032da6e4b6b342f14db03 |
|
14-Feb-2017 |
Mathias Agopian <mathias@google.com> |
fallout of splitting rect.h out of libandroid.
A lot of media makefiles didn’t specify libui or
libgui but included headers from these libraries
directly.
It works because these headers are on the global
include path. With this change, though, rect.h
is not anymore (albeit exported from libui).
Test: built and booted device
Bug: 35164655
Change-Id: I72e8f0b7bd25c6a67eedc17afe52c4c484a147fe
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| e80b15a63fa23f8d81c3d8e35b4502fb2e5a299c |
|
16-Feb-2017 |
Wonsik Kim <wonsik@google.com> |
codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4
am: 2430ff6610
Change-Id: I4099ab29c596f5ad2f03e0c018b0c2fddb078ed7
|
| a5e72ec7993f37d6282c847ca13044326bbc5727 |
|
16-Feb-2017 |
Wonsik Kim <wonsik@google.com> |
codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046
am: 4f428b7c02
Change-Id: Ia3e7fe8b1f39448f865508da3d5836b3159273cb
|
| 89f501d046c9a3ca61201e187a0d3655d59e521c |
|
16-Feb-2017 |
Wonsik Kim <wonsik@google.com> |
codecs: handle onReset() for a few encoders
am: 5443b57cc5
Change-Id: Ifd851c8840abc615eecf0da1f6b32f30cfb4e0b2
|
| 5443b57cc54f2e46b35246637be26a69e9f493e1 |
|
10-Feb-2017 |
Wonsik Kim <wonsik@google.com> |
codecs: handle onReset() for a few encoders
Test: Run PoC binaries
Bug: 34749392
Bug: 34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 9d84fed5412124881e2ae463c7e1ab26b5363a6d |
|
19-Aug-2016 |
Pawin Vongmasa <pawin@google.com> |
SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950 am: af39271e11 am: 3efed2f14c am: 1cfd97c331 am: 792a43273e am: 8c0f6d6ad4 am: f4e8d14499
am: f28464e0e1
Change-Id: Ie3b3d459fae620b3dea055e1638970d0abb92fd7
|
| 3efed2f14c5e556b3a14e25a0a83d0bf9492d3ab |
|
19-Aug-2016 |
Pawin Vongmasa <pawin@google.com> |
SoftMPEG4: Check the buffer size before writing the reference frame. am: 6951231950
am: af39271e11
Change-Id: I2d263d12fecf7dc3974b665ca568d3db5dcd76b3
|
| 180185da195c42d366a16d9c087413dd8c07d58b |
|
19-Jul-2016 |
Pawin Vongmasa <pawin@google.com> |
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 695123195034402ca76169b195069c28c30342d3 |
|
19-Jul-2016 |
Pawin Vongmasa <pawin@google.com> |
SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| d72e751fa185f053773603222fd220ab77c92b2f |
|
15-Jul-2016 |
Lajos Molnar <lajos@google.com> |
SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings
- use key-frame interval in MPEG4 encoder
- use updated definition of nBFrames and nPFrames in AVC encoder
Bug: 30096321
Bug: 28027692
Change-Id: I68d0d5182b462cad567c329a07fdafea55d19ff7
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 995d39cc23949569ea3a689985812ee923da5d4f |
|
23-Apr-2016 |
Marco Nelissen <marcone@google.com> |
Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into lmp-mr1-dev am: 0822864
am: c90ba30
* commit 'c90ba3056712a9c0ef6383fb00dc3b9c9b0edbc7':
DO NOT MERGE Verify OMX buffer sizes prior to access
Change-Id: I42551c5f62380f422257f80a933ccd301674a041
|
| dfb280d3975afdce4da87602577d2814cb9eb30d |
|
22-Apr-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE More OMX struct checking
These were lost due to bad merges.
Bug: 27207275
Change-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 67ef30185837950144d30e5a73d852eb9a7a0a89 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 423766ca07beb7e3e9cd301385708ca13fcce3e1 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 2720c8b094cfa58de314daa8e5e4fb4fa81fe3b2 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 2c59cc083d471fe55abc61870d05952bd242b738 |
|
10-Dec-2015 |
Wei Jia <wjia@google.com> |
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2
am: 1856f1fe34
* commit '1856f1fe348e25c7080c9c8cbd75da21409c179c':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
|
| 50270d98e26fa18b20ca88216c3526667b724ba7 |
|
20-Nov-2015 |
Wei Jia <wjia@google.com> |
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
(cherry picked from commit 0462975291796e414891e04bcec9da993914e458)
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 0462975291796e414891e04bcec9da993914e458 |
|
20-Nov-2015 |
Wei Jia <wjia@google.com> |
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 87f8cbb223ee516803dbb99699320c2484cbf3ba |
|
20-Nov-2015 |
Wei Jia <wjia@google.com> |
libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 |
|
11-Dec-2014 |
Lajos Molnar <lajos@google.com> |
resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp
Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
|
| a0940a569f2bc24b00dc10ce0fa7658b1dc3a3a5 |
|
24-Sep-2014 |
Lajos Molnar <lajos@google.com> |
stagefright: misc fixes to software video encoders (and decoders)
- move logic to set encoder parameters to common encoder class
(similarly to what was done for decoders)
- set compressed buffer size based on frame size and compression ratio,
and codec-specific minimum size
- set raw buffer size based on frame size and metadata mode
- do not set stride and slice height on compressed ports
- advertise only QCIF support for google H263 encoder
- set large-enough input size for video decoders to support adaptive
playback
- do not change input buffer size on output port reconfiguration, as
no input buffer reallocation takes place
- do not return empty buffers with EOS after EOS has been signaled
Bug: 18513091
Bug: 18639027
Change-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| bc83643295f034ed518a1da4320b48157e1dece5 |
|
28-Oct-2014 |
Lajos Molnar <lajos@google.com> |
Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev automerge: 701b964
automerge: 294c7f3
* commit '294c7f36e6a92419017e7fe2a204fba1284cdc08':
libstagefright: set actual stride info for SW encoder input port
|
| a32d5435d9585794b72dd12546054f13adb845f2 |
|
25-Oct-2014 |
Lajos Molnar <lajos@google.com> |
libstagefright: set actual stride info for SW encoder input port
This fixes encoding flexible YUV content using SW encoders.
Also skip setting input color format if it is flexible YUV, as it
has already been translated to a color format supported by the codec.
Bug: 18124320
Change-Id: I423782936986f4d6cf65ea9ef89ae77a92e30140
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| d7050b75c2ef33d1aabf71cf902f734c44c24639 |
|
15-Oct-2014 |
Lajos Molnar <lajos@google.com> |
resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aosp
Change-Id: I3b66673012989ab3707852b257844f2c3851f753
|
| 2edda09a2ad1d112c52acd37d323f63f0a492d67 |
|
11-Oct-2014 |
Lajos Molnar <lajos@google.com> |
stagefright: fix surface input handling of software encoders
- added SoftVideoEncoder for common color conversion and
extension handling logic
- fix YUV420 SemiPlanar handling that should be NV12 not NV21
Bug: 17935149
Change-Id: I9b8d05678b1862dd37bf349ea83d67bdf1bb5560
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| c24dd75a6baf9448f8a54a671519557fc19d84bd |
|
09-Jul-2014 |
Narayan Kamath <narayan@google.com> |
am 782be1ec: am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"
* commit '782be1ecf1022d4e2da714b5aebe51ab616e9975':
m4v_h263_enc: Use uint32_t for ULong
|
| 2426d11f795a99de85999b3ff0a26cc070a99a59 |
|
16-Jun-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
m4v_h263_enc: Use uint32_t for ULong
ULong is used in the encoder code as 32-bit unsigned integer type.
But it has been defined as an unsigned long, which will be 64-bit
on 64-bit platforms. This causes many problems including output
mismatch between 32-bit and 64-bit code and crash in certain cases.
This patch defines ULong as uint32_t. In addition, it uses uintptr_t
at places where an address is cast to an integer to check for alignment.
Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6 |
|
15-Apr-2014 |
Colin Cross <ccross@google.com> |
libstagefright: fix 64-bit warnings
%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.
(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| d411b4ca2945cd8974a3a78199fce94646950128 |
|
11-Apr-2014 |
Andreas Huber <andih@google.com> |
warnings be gone.
(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.
Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 619fd4d6d4d815065becbdf360422ee40dfa7690 |
|
03-Apr-2014 |
Glenn Kasten <gkasten@google.com> |
Merge commit '52a23bd3' into manualmerge
Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
|
| 66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051 |
|
02-Apr-2014 |
Glenn Kasten <gkasten@google.com> |
64-bit: Correction to OMX_U32 and OMX_S32
Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81 |
|
20-Mar-2014 |
Colin Cross <ccross@android.com> |
libstagefright: fix 64-bit warnings
%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.
Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 442cc6dc48f8188e097617f7f804c314a9dacd0e |
|
12-Feb-2014 |
Andreas Huber <andih@google.com> |
Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).
Change-Id: Ib4a5ab1a9e50fe9e7747a907f8b4a8c207099fdb
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 84333e0475bc911adc16417f4ca327c975cf6c36 |
|
08-Feb-2014 |
Andreas Huber <andih@google.com> |
warnings be gone.
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| b483a82f02e86710fade1f581e9255f8f4afb246 |
|
22-Apr-2013 |
Jun Tian <jun.j.tian@intel.com> |
Fixed the wrong timestamps issue about camera recording
On emulator, the camera video recording crashes randomly.
It's caused by wrong timestamp when encoding the video frame.
The element of the vector is erased before accessing it.
Therefore, when reading the timestamp from the element,
the memory of the element has been changed.
Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 6e5b6ef15bb39cc0aa3d8fb7d4f75d44e5aadd92 |
|
22-Apr-2013 |
Jun Tian <jun.j.tian@intel.com> |
Fixed the wrong timestamps issue about camera recording
On emulator, the camera video recording crashes randomly.
It's caused by wrong timestamp when encoding the video frame.
The element of the vector is erased before accessing it.
Therefore, when reading the timestamp from the element,
the memory of the element has been changed.
Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| bf5bea96f236adb5eef78c2f414ef82b3602a0f7 |
|
19-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Codecs: Add MetaDataMode support to software video encoders.
This support is needed to enable efficient video recording with
emulator and camera HAL 2.
- Update SoftAVCEncoder and SoftMPEG4Encoder to support MetaDataMode
extension.
- Allow CameraSource to handle opaque pixel formats, so that
MetaDataMode can be used.
- Remove hardware codec restriction for MetaDataMode
Bug: 6243944
Change-Id: I970eb3d55542a413b6d75a78f76d3a8583155601
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|
| 1700744ae0ce2fcf722816453ae0af2cd5646458 |
|
24-Apr-2012 |
James Dong <jdong@google.com> |
Software MPEG4/H263 video encoder is now OMX-based
o related-to-bug: 6401068
Change-Id: If8eccea060f38e42ad31eb6e91aaa832e67c5559
/frameworks/av/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
|