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

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: 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
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..a32841e7ff2efe65e94cecb6148ed3345fbccb71 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,
@@ -282,9 +281,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') | media/gpu/android_video_decode_accelerator.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698