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

Unified Diff: media/base/media.cc

Issue 1684853003: WIP: allow to play Youtube if use_proprieraty_codecs=1 and ffmpeg_branding=Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/base/media.h ('k') | media/base/mime_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media.cc
diff --git a/media/base/media.cc b/media/base/media.cc
index f55d1c437a5bf6e3baee3b23a10355ce635153de..d8c622d9512c746585a3133c6786636730866816 100644
--- a/media/base/media.cc
+++ b/media/base/media.cc
@@ -15,6 +15,8 @@
#if !defined(MEDIA_DISABLE_FFMPEG)
#include "media/ffmpeg/ffmpeg_common.h"
+#include "media/filters/ffmpeg_audio_decoder.h"
+#include "media/filters/ffmpeg_video_decoder.h"
#endif
namespace media {
@@ -61,4 +63,30 @@ void InitializeMediaLibrary() {
g_media_library.Get();
}
+bool IsAudioCodecSupported(AudioCodec codec) {
+ // Opus is always enabled.
+ if (codec == media::kCodecOpus)
+ return true;
+
+#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_AUDIO_DECODERS)
+ return media::FFmpegAudioDecoder::IsCodecSupported(codec,
+ kUnknownSampleFormat);
+#else
+ return false;
+#endif
+}
+
+bool IsVideoCodecSupported(VideoCodec codec) {
+#if !defined(MEDIA_DISABLE_LIBVPX)
+ if (codec == media::kCodecVP9)
+ return true;
+#endif
+
+#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
+ return media::FFmpegVideoDecoder::IsCodecSupported(codec);
+#else
+ return false;
+#endif
+}
+
} // namespace media
« no previous file with comments | « media/base/media.h ('k') | media/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698