diff options
author | alexmos <alexmos@chromium.org> | 2016-03-11 13:18:02 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 21:18:50 +0000 |
commit | c0fa874e9858c85895a8266ae53c53efa280e85a (patch) | |
tree | 7f26b44cee3b721e885d82ac7c2f03b1e5a27dd9 /media/base/video_decoder_config.h | |
parent | 2ceccae6337cab6b6d5be02413c2b56ebaebca1b (diff) | |
download | chromium_src-c0fa874e9858c85895a8266ae53c53efa280e85a.zip chromium_src-c0fa874e9858c85895a8266ae53c53efa280e85a.tar.gz chromium_src-c0fa874e9858c85895a8266ae53c53efa280e85a.tar.bz2 |
Revert of media config: expand is_encrypted to a struct. (patchset #23 id:440001 of https://codereview.chromium.org/1490613005/ )
Reason for revert:
Appears to be breaking compile on Win x64 GN (dbg): https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/19428
Output:
media_type_converters.obj : error LNK2019: unresolved external symbol "public: __cdecl media::EncryptionScheme::Pattern::Pattern(unsigned int,unsigned int)" (??0Pattern@EncryptionScheme@media@@QEAA@II@Z) referenced in function "public: static class media::EncryptionScheme::Pattern __cdecl mojo::TypeConverter<class media::EncryptionScheme::Pattern,class mojo::InlinedStructPtr<class media::interfaces::Pattern> >::Convert(class mojo::InlinedStructPtr<class media::interfaces::Pattern> const &)" (?Convert@?$TypeConverter@VPattern@EncryptionScheme@media@@V?$InlinedStructPtr@VPattern@interfaces@media@@@mojo@@@mojo@@SA?AVPattern@EncryptionScheme@media@@AEBV?$InlinedStructPtr@VPattern@interfaces@media@@@2@@Z)
media_type_converters.obj : error LNK2019: unresolved external symbol "public: __cdecl media::EncryptionScheme::Pattern::~Pattern(void)" (??1Pattern@EncryptionScheme@media@@QEAA@XZ) referenced in function "public: static class media::EncryptionScheme __cdecl mojo::TypeConverter<class media::EncryptionScheme,class mojo::StructPtr<class media::interfaces::EncryptionScheme> >::Convert(class mojo::StructPtr<class media::interfaces::EncryptionScheme> const &)" (?Convert@?$TypeConverter@VEncryptionScheme@media@@V?$StructPtr@VEncryptionScheme@interfaces@media@@@mojo@@@mojo@@SA?AVEncryptionScheme@media@@AEBV?$StructPtr@VEncryptionScheme@interfaces@media@@@2@@Z)
./media_library.dll : fatal error LNK1120: 2 unresolved externals
Original issue's description:
> media config: expand is_encrypted to a struct.
>
> Provide more complete encryption metadata, rather than
> just a bool. EncryptionScheme also allows specification
> of the mode and the pattern, as will be allowed by
> CENC (ISO's Common Encryption standard), 3rd Edition.
>
> BUG=568326
>
> Committed: https://crrev.com/c9d2206c62f65e29b141e08df2b2dcb88f54162f
> Cr-Commit-Position: refs/heads/master@{#380710}
TBR=dalecurtis@chromium.org,ddorwin@chromium.org,halliwell@chromium.org,lcwu@chromium.org,raymes@chromium.org,xhwang@chromium.org,yucliu@chromium.org,dougsteed@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=568326
Review URL: https://codereview.chromium.org/1786733004
Cr-Commit-Position: refs/heads/master@{#380732}
Diffstat (limited to 'media/base/video_decoder_config.h')
-rw-r--r-- | media/base/video_decoder_config.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 50dee06..4a192d6 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -11,7 +11,6 @@ #include <vector> #include "base/macros.h" -#include "media/base/encryption_scheme.h" #include "media/base/media_export.h" #include "media/base/video_codecs.h" #include "media/base/video_types.h" @@ -39,7 +38,7 @@ class MEDIA_EXPORT VideoDecoderConfig { const gfx::Rect& visible_rect, const gfx::Size& natural_size, const std::vector<uint8_t>& extra_data, - const EncryptionScheme& encryption_scheme); + bool is_encrypted); VideoDecoderConfig(const VideoDecoderConfig& other); @@ -54,7 +53,7 @@ class MEDIA_EXPORT VideoDecoderConfig { const gfx::Rect& visible_rect, const gfx::Size& natural_size, const std::vector<uint8_t>& extra_data, - const EncryptionScheme& encryption_scheme); + bool is_encrypted); // Returns true if this object has appropriate configuration values, false // otherwise. @@ -101,12 +100,7 @@ class MEDIA_EXPORT VideoDecoderConfig { // Whether the video stream is potentially encrypted. // Note that in a potentially encrypted video stream, individual buffers // can be encrypted or not encrypted. - bool is_encrypted() const { return encryption_scheme_.is_encrypted(); } - - // Encryption scheme used for encrypted buffers. - const EncryptionScheme& encryption_scheme() const { - return encryption_scheme_; - } + bool is_encrypted() const { return is_encrypted_; } private: VideoCodec codec_; @@ -121,7 +115,7 @@ class MEDIA_EXPORT VideoDecoderConfig { std::vector<uint8_t> extra_data_; - EncryptionScheme encryption_scheme_; + bool is_encrypted_; // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler // generated copy constructor and assignment operator. Since the extra data is |