diff options
| author | Justin Yun <justinyun@google.com> | 2023-01-02 04:02:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-02 04:02:15 +0000 |
| commit | 94c31b507b4c2767eb6f313fb00a541974a4e784 (patch) | |
| tree | 97810fe34a164f502300235e2b274b4a5325e782 | |
| parent | 4e1e9635b887e4152dbba575457120e92b7cbf14 (diff) | |
| parent | b868ec09a9a6c8da5b7473115635aaccf7f52c8b (diff) | |
| download | v32-94c31b507b4c2767eb6f313fb00a541974a4e784.tar.gz | |
Update VNDK snapshot v32 to build 9372951. am: 48c6478942 am: ef0406d6f2 am: b868ec09a9
Original change: https://android-review.googlesource.com/c/platform/prebuilts/vndk/v32/+/2373428
Change-Id: I3097583c7939da9beaf49be1704f36ec6d9db2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 8 insertions, 0 deletions
diff --git a/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h b/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h index d17a480..52ea28b 100644 --- a/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h +++ b/arm/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h @@ -146,6 +146,7 @@ private: Vector<TrackInfo> mSelectedTracks; int64_t mTotalBitrate; // in bits/sec int64_t mDurationUs; + String8 mName; void setEntryPointToRemoteMediaExtractor(); @@ -165,6 +166,7 @@ private: bool getTotalBitrate(int64_t *bitRate) const; status_t updateDurationAndBitrate(); status_t appendVorbisNumPageSamples(MediaBufferBase *mbuf, const sp<ABuffer> &buffer); + status_t initMediaExtractor(const sp<DataSource>& dataSource); DISALLOW_EVIL_CONSTRUCTORS(NuMediaExtractor); }; diff --git a/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h b/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h index d17a480..52ea28b 100644 --- a/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h +++ b/arm64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h @@ -146,6 +146,7 @@ private: Vector<TrackInfo> mSelectedTracks; int64_t mTotalBitrate; // in bits/sec int64_t mDurationUs; + String8 mName; void setEntryPointToRemoteMediaExtractor(); @@ -165,6 +166,7 @@ private: bool getTotalBitrate(int64_t *bitRate) const; status_t updateDurationAndBitrate(); status_t appendVorbisNumPageSamples(MediaBufferBase *mbuf, const sp<ABuffer> &buffer); + status_t initMediaExtractor(const sp<DataSource>& dataSource); DISALLOW_EVIL_CONSTRUCTORS(NuMediaExtractor); }; diff --git a/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h b/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h index d17a480..52ea28b 100644 --- a/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h +++ b/x86/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h @@ -146,6 +146,7 @@ private: Vector<TrackInfo> mSelectedTracks; int64_t mTotalBitrate; // in bits/sec int64_t mDurationUs; + String8 mName; void setEntryPointToRemoteMediaExtractor(); @@ -165,6 +166,7 @@ private: bool getTotalBitrate(int64_t *bitRate) const; status_t updateDurationAndBitrate(); status_t appendVorbisNumPageSamples(MediaBufferBase *mbuf, const sp<ABuffer> &buffer); + status_t initMediaExtractor(const sp<DataSource>& dataSource); DISALLOW_EVIL_CONSTRUCTORS(NuMediaExtractor); }; diff --git a/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h b/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h index d17a480..52ea28b 100644 --- a/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h +++ b/x86_64/include/frameworks/av/media/libstagefright/include/media/stagefright/NuMediaExtractor.h @@ -146,6 +146,7 @@ private: Vector<TrackInfo> mSelectedTracks; int64_t mTotalBitrate; // in bits/sec int64_t mDurationUs; + String8 mName; void setEntryPointToRemoteMediaExtractor(); @@ -165,6 +166,7 @@ private: bool getTotalBitrate(int64_t *bitRate) const; status_t updateDurationAndBitrate(); status_t appendVorbisNumPageSamples(MediaBufferBase *mbuf, const sp<ABuffer> &buffer); + status_t initMediaExtractor(const sp<DataSource>& dataSource); DISALLOW_EVIL_CONSTRUCTORS(NuMediaExtractor); }; |