diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 00:49:20 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 00:49:20 +0000 |
| commit | f1b5451d5f01e91a0c8a55cd4c9ad5a55d98a4cf (patch) | |
| tree | 46304c749483295392255e6ba5dd23a032b6cef5 /media/base/android/media_source_player.h | |
| parent | 30b61feb671b9cb91e6868a9aadff59f9680992b (diff) | |
| download | chromium_src-f1b5451d5f01e91a0c8a55cd4c9ad5a55d98a4cf.zip chromium_src-f1b5451d5f01e91a0c8a55cd4c9ad5a55d98a4cf.tar.gz chromium_src-f1b5451d5f01e91a0c8a55cd4c9ad5a55d98a4cf.tar.bz2 | |
Reland r213926 "Not to queue the same input if DequeueOutputBuffe returns INFO_TRY_AGAIN_LATER"
This reverts commit f3b2b8d149f79bcbc3f6f89115654e69bf7818fe and disables the
flaky test. The test is making unrealistic assumption about the status of the
MediaSourcePlayer, which needs to be fixed later. See crbug.com/266041.
TBR=qinmin@chromium.org
BUG=266041,263612,266423
TEST=Flaky test disabled.
Review URL: https://chromiumcodereview.appspot.com/21058008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/android/media_source_player.h')
| -rw-r--r-- | media/base/android/media_source_player.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h index efab0a2..f493f33 100644 --- a/media/base/android/media_source_player.h +++ b/media/base/android/media_source_player.h @@ -40,7 +40,8 @@ class MediaDecoderJob { public: enum DecodeStatus { DECODE_SUCCEEDED, - DECODE_TRY_AGAIN_LATER, + DECODE_TRY_ENQUEUE_INPUT_AGAIN_LATER, + DECODE_TRY_DEQUEUE_OUTPUT_AGAIN_LATER, DECODE_FORMAT_CHANGED, DECODE_END_OF_STREAM, DECODE_FAILED, @@ -86,6 +87,9 @@ class MediaDecoderJob { const base::TimeDelta& presentation_timestamp, const MediaDecoderJob::DecoderCallback& callback, DecodeStatus status); + DecodeStatus QueueInputBuffer( + const MediaPlayerHostMsg_ReadFromDemuxerAck_Params::AccessUnit& unit); + // Helper function to decoder data on |thread_|. |unit| contains all the data // to be decoded. |start_time_ticks| and |start_presentation_timestamp| // represent the system time and the presentation timestamp when the first |