7da13e3f85
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev am: 3afa6a5f86 am: 42e55ea1b4
...
am: 8ba9ffd54b
7 years ago
8ba9ffd54b
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev am: 3afa6a5f86
...
am: 42e55ea1b4
7 years ago
42e55ea1b4
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev
...
am: 3afa6a5f86
7 years ago
ee9ddeff46
Have the Surface class track the buffer age.
...
This change corresponds to a change between the Surface and
BufferQueueProducer classes.
Have the Surface class track the buffer age, so that Surface::query()
can return the buffer age without having to use a binder call to
BufferQueueProducer::query(). The idea is for
BufferQueueProducer::dequeueBuffer() to return the value, which the
Surface class will cache for later use by Surface::query().
Bug: b/27903668
Test: Use systrace to no ensure query binder call after dequeueBuffer.
Change-Id: I78ff3d2d639111705c25a92f3672b7e6d0fac19f
7 years ago
77f4d8b90c
Merge "Organize header dependencies" into oc-mr1-dev am: 1ec73bea63
...
am: 4b8ef498cc
7 years ago
1ec73bea63
Merge "Organize header dependencies" into oc-mr1-dev
7 years ago
212335cbc6
Fix the UAF bug caused by a dead stack variable
...
The original code attempts to copy data from a location pointed to by a
local variable that has gone out of scope. This CL moves the copy
operation into the scope.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 63773604
Change-Id: I980630b6ac30875c2df65664668d4d6b7414f3a7
7 years ago
0fbeb4d09d
Merge "Revert "Have the Surface class track the buffer age.""
7 years ago
cd5a09d650
Revert "Have the Surface class track the buffer age."
...
This reverts commit e0ecc35b14
7 years ago
0892aeaa49
Merge "Have the Surface class track the buffer age."
7 years ago
820d516c80
Merge "codec2: switch to Android.bp"
7 years ago
6b5b6fdd33
codec2: switch to Android.bp
...
Test: builds
Change-Id: Id9cde46377182ea297962ef8cef89799548e6a77
7 years ago
e0ecc35b14
Have the Surface class track the buffer age.
...
This change corresponds to a change between the Surface and
BufferQueueProducer classes.
Have the Surface class track the buffer age, so that Surface::query()
can return the buffer age without having to use a binder call to
BufferQueueProducer::query(). The idea is for
BufferQueueProducer::dequeueBuffer() to return the value, which the
Surface class will cache for later use by Surface::query().
Bug: b/27903668
Test: Use systrace to no ensure query binder call after dequeueBuffer.
Change-Id: Iee7e7a3f92dcc88db70f460186a63450a6f18e31
7 years ago
255735a38b
Organize header dependencies
...
Header files that are exported are moved to a specific place for
exporting.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 63821829
Change-Id: Ia578e3c0dd1ff157335b3a49af896acb922586e8
7 years ago
ed31e32afc
fix output nFilledLen when prepareForAdaptivePlayback is true
...
Bug:63560919
Bug:62894603
Change-Id: If1fbd17ebc63743f88c3cbaf2b47a6ee726e06e8
7 years ago
9fc83c5c30
Merge "Move xmlparser to under libstagefright"
7 years ago
2be091cebb
Move xmlparser to under libstagefright
...
Test: make cts -j123 && cts-tradefed run cts-dev --module \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 37657124
Change-Id: Ib78f983635586558b99850b2fd54143b0a418d1d
7 years ago
8e1f4be045
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b am: 24145427ed am: 8a4f540bdf am: f62d2cf89a am: 719e24e823
...
am: c039e42534
7 years ago
c039e42534
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b am: 24145427ed am: 8a4f540bdf am: f62d2cf89a
...
am: 719e24e823
7 years ago
719e24e823
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b am: 24145427ed am: 8a4f540bdf
...
am: f62d2cf89a
7 years ago
f62d2cf89a
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b am: 24145427ed
...
am: 8a4f540bdf
7 years ago
ad42ef74eb
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709 am: d7c144c545 am: 3fd727d787 am: 33e76e05a3 am: dfd2808073 am: db22689ffa am: 9ada6f85bf
...
am: 865b5dc8ad
7 years ago
8a4f540bdf
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b
...
am: 24145427ed
7 years ago
865b5dc8ad
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709 am: d7c144c545 am: 3fd727d787 am: 33e76e05a3 am: dfd2808073 am: db22689ffa
...
am: 9ada6f85bf
7 years ago
a06a77509b
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65
...
am: 0ac0157213
7 years ago
0ac0157213
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d
...
am: 8486817a65
7 years ago
9ada6f85bf
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709 am: d7c144c545 am: 3fd727d787 am: 33e76e05a3 am: dfd2808073
...
am: db22689ffa
7 years ago
db22689ffa
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709 am: d7c144c545 am: 3fd727d787 am: 33e76e05a3
...
am: dfd2808073
7 years ago
8486817a65
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db am: fb7c6d9173
...
am: ee1f46846d
7 years ago
ee1f46846d
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a am: b38111a0db
...
am: fb7c6d9173
7 years ago
dfd2808073
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709 am: d7c144c545 am: 3fd727d787
...
am: 33e76e05a3
7 years ago
fb7c6d9173
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97 am: 2b1df0008a
...
am: b38111a0db
7 years ago
b38111a0db
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820 am: 8d579abf97
...
am: 2b1df0008a
7 years ago
2b1df0008a
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820
...
am: 8d579abf97
7 years ago
3fd727d787
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19 am: a29bd6a709
...
am: d7c144c545
7 years ago
d7c144c545
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789 am: e1e8ea6a19
...
am: a29bd6a709
7 years ago
a29bd6a709
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789
...
am: e1e8ea6a19
7 years ago
b226bba820
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d
...
am: aafbda5a18
7 years ago
e1e8ea6a19
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a
...
am: 0b542a3789
7 years ago
aafbda5a18
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88
...
am: 5f3ac3898d
7 years ago
0b542a3789
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
...
am: 998521559a
7 years ago
5f3ac3898d
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
...
am: 98248c3f88
7 years ago
998521559a
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
...
am: 7da8bef65e
7 years ago
7da8bef65e
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
7 years ago
d371d08bcc
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
7 years ago
d6352a6931
Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev am: 1a0af2f643
...
am: b98aa771dc
7 years ago
b98aa771dc
Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev
...
am: 1a0af2f643
7 years ago
1a0af2f643
Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev
7 years ago
447c686405
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am: 02772b134e am: 2aa463e371 am: 4fa11b6cdf
...
am: ae73886c4d
7 years ago
9583ca702a
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am: 80059d44c4 am: 72840f2216
...
am: 9e9987c46d
7 years ago
Pawin Vongmasa
Ian Elliott
TreeHugger Robot
Wonsik Kim
Ram Mohan
Chong Zhang
Hangyu Kuang
Wei Jia