diff options
| author | Robert Shih <robertshih@google.com> | 2014-09-02 16:51:37 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2014-09-15 16:51:33 -0700 |
| commit | 666c96d37203fd91ec319b8b499442696f70fd53 (patch) | |
| tree | 4e3b3b44c47a5b216b02d535a1dc884f78926dc3 /media/libstagefright/mpeg2ts/ESQueue.h | |
| parent | b72726bad6c9253c26c82fea76bdf99e18b8ba6d (diff) | |
| download | frameworks_av-666c96d37203fd91ec319b8b499442696f70fd53.zip frameworks_av-666c96d37203fd91ec319b8b499442696f70fd53.tar.gz frameworks_av-666c96d37203fd91ec319b8b499442696f70fd53.tar.bz2 | |
ESQueue: do not merge aac packets
Bug: 17310061
Change-Id: Ie0fb0702b0af1c4094415190fdfdf132d5fcd511
Diffstat (limited to 'media/libstagefright/mpeg2ts/ESQueue.h')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.h b/media/libstagefright/mpeg2ts/ESQueue.h index a2cca77..7c81ff0 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.h +++ b/media/libstagefright/mpeg2ts/ESQueue.h @@ -77,6 +77,7 @@ private: // consume a logical (compressed) access unit of size "size", // returns its timestamp in us (or -1 if no time information). int64_t fetchTimestamp(size_t size); + int64_t fetchTimestampAAC(size_t size); DISALLOW_EVIL_CONSTRUCTORS(ElementaryStreamQueue); }; |