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

Unified Diff: content/renderer/pepper/video_decoder_shim.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 | « build/common.gypi ('k') | media/base/media.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/video_decoder_shim.cc
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
index a529b747094a480ddc18da7a9dfb179923967d6e..9aaad76095e7a05c1c0e037ffb6e34312116cae6 100644
--- a/content/renderer/pepper/video_decoder_shim.cc
+++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -24,6 +24,7 @@
#include "media/base/cdm_context.h"
#include "media/base/decoder_buffer.h"
#include "media/base/limits.h"
+#include "media/base/media.h"
#include "media/base/media_util.h"
#include "media/base/video_decoder.h"
#include "media/filters/ffmpeg_video_decoder.h"
@@ -41,23 +42,6 @@ static const uint32_t kGrInvalidateState =
kView_GrGLBackendState | kVertex_GrGLBackendState |
kProgram_GrGLBackendState | kPixelStore_GrGLBackendState;
-namespace {
-
-bool IsCodecSupported(media::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
-
// YUV->RGB converter class using a shader and FBO.
class VideoDecoderShim::YUVConverter {
public:
@@ -887,7 +871,7 @@ bool VideoDecoderShim::Initialize(const Config& vda_config, Client* client) {
codec = media::kCodecVP9;
DCHECK_NE(codec, media::kUnknownVideoCodec);
- if (!IsCodecSupported(codec))
+ if (!media::IsVideoCodecSupported(codec))
return false;
if (!yuv_converter_->Initialize())
« no previous file with comments | « build/common.gypi ('k') | media/base/media.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698