commit f74535d093113a58d2330e24e5b8584610c05246
author Kris Alder <kalder@google.com> Fri Jun 05 19:31:43 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 05 19:31:43 2020 +0000
tree efaeb34aa75bcb91d9e3e65eb37459223daa4b24
parent 1f88b099d484f23081d6cd5faaf5f16a2d3a5972
parent 57b9ef9b03603eba260bb1419abd05b4bfc1ec7a

Merge changes I8097e8e0,I07e1dd05,If5059c6c

* changes:
  mp4_extractor_fuzzer: Add host support
  libmp4extractor: Add host support
  extractor-defaults: Updated library list

media/libstagefright/HevcUtils.cpp

diff --git a/media/libstagefright/HevcUtils.cpp b/media/libstagefright/HevcUtils.cpp
index 482a1a7..d92a174 100644
--- a/media/libstagefright/HevcUtils.cpp
+++ b/media/libstagefright/HevcUtils.cpp
@@ -30,6 +30,8 @@
 #include <media/stagefright/MediaErrors.h>
 #include <media/stagefright/Utils.h>
 
+#define UNUSED_PARAM __attribute__((unused))
+
 namespace android {
 
 static const uint8_t kHevcNalUnitTypes[5] = {
@@ -375,7 +377,7 @@
 }
 
 status_t HevcParameterSets::parsePps(
-        const uint8_t* data __unused, size_t size __unused) {
+        const uint8_t* data UNUSED_PARAM, size_t size UNUSED_PARAM) {
     return OK;
 }
 

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 02e8ab5..13510d8 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -1073,7 +1073,7 @@
         // assertion, let's be lenient for now...
         // CHECK((ptr[4] >> 2) == 0x3f);  // reserved
 
-        size_t lengthSize __unused = 1 + (ptr[4] & 3);
+        // we can get lengthSize value from 1 + (ptr[4] & 3)
 
         // commented out check below as H264_QVGA_500_NO_AUDIO.3gp
         // violates it...