summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-07-21 00:25:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-21 00:25:16 +0000
commit17d0efd17fbb2573adcde8dcbe77726f622817da (patch)
treebc5c6a82e3353752c4693bd5742463bea9b7937a /include
parent7c77f9ca649f321374118937bcdaca14a7e5684b (diff)
parent82a633b602a7ffe1efd9886744393f52a093a2f3 (diff)
downloadframeworks_av-17d0efd17fbb2573adcde8dcbe77726f622817da.zip
frameworks_av-17d0efd17fbb2573adcde8dcbe77726f622817da.tar.gz
frameworks_av-17d0efd17fbb2573adcde8dcbe77726f622817da.tar.bz2
Merge "stagefright: remove workaround for BQ not reporting dropped frames" into mnc-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MediaSync.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/media/stagefright/MediaSync.h b/include/media/stagefright/MediaSync.h
index 4b5cd05..ef8cb23 100644
--- a/include/media/stagefright/MediaSync.h
+++ b/include/media/stagefright/MediaSync.h
@@ -135,8 +135,7 @@ protected:
private:
enum {
- kWhatDrainVideo = 'dVid',
- kWhatCheckFrameAvailable = 'cFrA',
+ kWhatDrainVideo = 'dVid',
};
// This is a thin wrapper class that lets us listen to
@@ -248,9 +247,8 @@ private:
// onBufferReleasedByOutput releases a buffer back to the input.
void onFrameAvailableFromInput();
- // Send |bufferItem| to the output for rendering. If this is not the only
- // buffer sent for rendering, check for any dropped frames in |checkInUs| us.
- void renderOneBufferItem_l(const BufferItem &bufferItem, int64_t checkInUs);
+ // Send |bufferItem| to the output for rendering.
+ void renderOneBufferItem_l(const BufferItem &bufferItem);
// This implements the onBufferReleased callback from IProducerListener.
// It gets called from an OutputListener.