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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/ffmpeg/ffmpeg_common.h

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a couple comments 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
« media/base/encryption_scheme.cc ('K') | « media/base/video_decoder_config_unittest.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | media/formats/mp2t/es_parser_mpeg1audio.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.h
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index b66de897a49245b19d7aea82255974f0f6eefcd6..d5ad132d3be86a276a3f927f53613e5242be7254 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -52,6 +52,7 @@ MSVC_POP_WARNING();
namespace media {
class AudioDecoderConfig;
+class EncryptionScheme;
class VideoDecoderConfig;
// The following implement the deleters declared in ffmpeg_deleters.h (which
@@ -113,7 +114,7 @@ void VideoDecoderConfigToAVCodecContext(
// is not modified.
MEDIA_EXPORT bool AVCodecContextToAudioDecoderConfig(
const AVCodecContext* codec_context,
- bool is_encrypted,
+ const EncryptionScheme& encryption_scheme,
AudioDecoderConfig* config);
// Converts FFmpeg's channel layout to chrome's ChannelLayout. |channels| can
« media/base/encryption_scheme.cc ('K') | « media/base/video_decoder_config_unittest.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | media/formats/mp2t/es_parser_mpeg1audio.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698