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

Unified Diff: media/filters/decoder_selector.cc

Issue 2808093008: Fix disabling FFMpeg video decoders on non-Android platforms (Closed)
Patch Set: Created 3 years, 8 months 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 | « media/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_selector.cc
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index 3d6854f3c5149a08fd94319d31aa4c4be9f485ea..c4271060efc28567097de1866657f761c830bdb8 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -20,7 +20,7 @@
#include "media/filters/decoder_stream_traits.h"
#include "media/filters/decrypting_demuxer_stream.h"
-#if !defined(OS_ANDROID)
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
#include "media/filters/decrypting_audio_decoder.h"
#include "media/filters/decrypting_video_decoder.h"
#endif
@@ -96,7 +96,7 @@ void DecoderSelector<StreamType>::SelectDecoder(
// When there is a CDM attached, always try the decrypting decoder or
// demuxer-stream first.
if (cdm_context_) {
-#if !defined(OS_ANDROID)
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
InitializeDecryptingDecoder();
#else
InitializeDecryptingDemuxerStream();
@@ -112,7 +112,7 @@ void DecoderSelector<StreamType>::SelectDecoder(
InitializeDecoder();
}
-#if !defined(OS_ANDROID)
+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
template <DemuxerStream::Type StreamType>
void DecoderSelector<StreamType>::InitializeDecryptingDecoder() {
DVLOG(2) << __func__;
@@ -145,7 +145,7 @@ void DecoderSelector<StreamType>::DecryptingDecoderInitDone(bool success) {
// DecryptingDemuxerStream to do decrypt-only.
InitializeDecryptingDemuxerStream();
}
-#endif // !defined(OS_ANDROID)
+#endif // !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
template <DemuxerStream::Type StreamType>
void DecoderSelector<StreamType>::InitializeDecryptingDemuxerStream() {
« no previous file with comments | « media/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698