Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(749)

Unified Diff: media/gpu/android_video_decode_accelerator.h

Issue 2563533002: media: AVDA now doesn't queue EOS for a flush if the codec is empty (Closed)
Patch Set: braces Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/gpu/android_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/android_video_decode_accelerator.h
diff --git a/media/gpu/android_video_decode_accelerator.h b/media/gpu/android_video_decode_accelerator.h
index 335b3676a5ba8b97f75d7b782dfb9ac43827342d..71fe528e1a2bc903372e343dc6e2914ee7154095 100644
--- a/media/gpu/android_video_decode_accelerator.h
+++ b/media/gpu/android_video_decode_accelerator.h
@@ -94,7 +94,6 @@ class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator
};
enum DrainType {
- DRAIN_TYPE_NONE,
DRAIN_FOR_FLUSH,
DRAIN_FOR_RESET,
DRAIN_FOR_DESTROY,
@@ -138,9 +137,8 @@ class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator
// used.
void DoIOTask(bool start_timer);
- // Feeds input data to |media_codec_|. This checks
- // |pending_bitstream_buffers_| and queues a buffer to |media_codec_|.
- // Returns true if any input was processed.
+ // Feeds buffers in |pending_bitstream_records_| to |media_codec_|. Returns
+ // true if one was queued.
bool QueueInput();
// Dequeues output from |media_codec_| and feeds the decoded frame to the
@@ -282,9 +280,8 @@ class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator
// Time at which we last did useful work on io_timer_.
base::TimeTicks most_recent_work_;
- // Type of a drain request. We need to distinguish between DRAIN_FOR_FLUSH
- // and other types, see IsDrainingForResetOrDestroy().
- DrainType drain_type_;
+ // The ongoing drain operation, if any.
+ base::Optional<DrainType> drain_type_;
// Holds a ref-count to the CDM to avoid using the CDM after it's destroyed.
scoped_refptr<MediaKeys> cdm_for_reference_holding_only_;
« no previous file with comments | « no previous file | media/gpu/android_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698