|
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
Committed: https://crrev.com/c0fa874e9858c85895a8266ae53c53efa280e85a
Cr-Commit-Position: refs/heads/master@{#380732}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+260 lines, -790 lines) |
Patch |
|
M |
chromecast/common/media/cma_param_traits.h
|
View
|
|
2 chunks |
+0 lines, -10 lines |
0 comments
|
Download
|
|
M |
chromecast/common/media/cma_param_traits.cc
|
View
|
|
7 chunks |
+8 lines, -63 lines |
0 comments
|
Download
|
|
M |
chromecast/common/media/cma_param_traits_macros.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
chromecast/media/audio/cast_audio_output_stream.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chromecast/media/audio/cast_audio_output_stream_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc
|
View
|
|
3 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/base/decoder_config_adapter.cc
|
View
|
|
5 chunks |
+4 lines, -63 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/base/demuxer_stream_for_test.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chromecast/media/cma/ipc_streamer/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/ipc_streamer/audio_decoder_config_marshaller.cc
|
View
|
|
4 chunks |
+4 lines, -5 lines |
0 comments
|
Download
|
|
D |
chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.h
|
View
|
|
1 chunk |
+0 lines, -27 lines |
0 comments
|
Download
|
|
D |
chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.cc
|
View
|
|
1 chunk |
+0 lines, -54 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc
|
View
|
|
5 chunks |
+4 lines, -5 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/pipeline/audio_decoder_software_wrapper.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chromecast/media/cma/test/mock_frame_provider.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chromecast/media/media.gyp
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
chromecast/public/media/decoder_config.h
|
View
|
|
5 chunks |
+9 lines, -74 lines |
0 comments
|
Download
|
|
M |
content/common/gpu/media/video_encode_accelerator_unittest.cc
|
View
|
|
1 chunk |
+2 lines, -4 lines |
0 comments
|
Download
|
|
M |
content/renderer/pepper/video_decoder_shim.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
media/base/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
media/base/audio_decoder_config.h
|
View
|
|
5 chunks |
+4 lines, -10 lines |
0 comments
|
Download
|
|
M |
media/base/audio_decoder_config.cc
|
View
|
|
4 chunks |
+13 lines, -12 lines |
0 comments
|
Download
|
|
D |
media/base/encryption_scheme.h
|
View
|
|
1 chunk |
+0 lines, -79 lines |
0 comments
|
Download
|
|
D |
media/base/encryption_scheme.cc
|
View
|
|
1 chunk |
+0 lines, -37 lines |
0 comments
|
Download
|
|
M |
media/base/fake_demuxer_stream.cc
|
View
|
|
1 chunk |
+5 lines, -5 lines |
0 comments
|
Download
|
|
M |
media/base/media_util.h
|
View
|
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
|
M |
media/base/media_util.cc
|
View
|
|
1 chunk |
+0 lines, -9 lines |
0 comments
|
Download
|
|
M |
media/base/test_helpers.cc
|
View
|
|
1 chunk |
+4 lines, -5 lines |
0 comments
|
Download
|
|
M |
media/base/video_decoder_config.h
|
View
|
|
5 chunks |
+4 lines, -10 lines |
0 comments
|
Download
|
|
M |
media/base/video_decoder_config.cc
|
View
|
|
4 chunks |
+17 lines, -16 lines |
0 comments
|
Download
|
|
M |
media/base/video_decoder_config_unittest.cc
|
View
|
|
7 chunks |
+7 lines, -7 lines |
0 comments
|
Download
|
|
M |
media/ffmpeg/ffmpeg_common.h
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
media/ffmpeg/ffmpeg_common.cc
|
View
|
|
6 chunks |
+24 lines, -23 lines |
0 comments
|
Download
|
|
M |
media/ffmpeg/ffmpeg_common_unittest.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
media/filters/audio_decoder_selector_unittest.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
media/filters/audio_decoder_unittest.cc
|
View
|
|
3 chunks |
+16 lines, -6 lines |
0 comments
|
Download
|
|
M |
media/filters/decrypting_audio_decoder_unittest.cc
|
View
|
|
6 chunks |
+6 lines, -7 lines |
0 comments
|
Download
|
|
M |
media/filters/decrypting_demuxer_stream.cc
|
View
|
|
3 chunks |
+9 lines, -8 lines |
0 comments
|
Download
|
|
M |
media/filters/decrypting_demuxer_stream_unittest.cc
|
View
|
|
4 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
media/filters/ffmpeg_video_decoder_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
media/filters/frame_processor_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
media/filters/opus_audio_decoder.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
media/filters/source_buffer_stream.cc
|
View
|
|
2 chunks |
+2 lines, -4 lines |
0 comments
|
Download
|
|
M |
media/filters/source_buffer_stream_unittest.cc
|
View
|
|
5 chunks |
+13 lines, -8 lines |
0 comments
|
Download
|
|
M |
media/formats/mp2t/es_adapter_video_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
media/formats/mp2t/es_parser_adts.cc
|
View
|
|
2 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
|
M |
media/formats/mp2t/es_parser_h264.h
|
View
|
|
3 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
|
M |
media/formats/mp2t/es_parser_h264.cc
|
View
|
|
4 chunks |
+3 lines, -6 lines |
0 comments
|
Download
|
|
M |
media/formats/mp2t/es_parser_mpeg1audio.cc
|
View
|
|
2 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
|
M |
media/formats/mp4/mp4_stream_parser.cc
|
View
|
|
3 chunks |
+4 lines, -7 lines |
0 comments
|
Download
|
|
M |
media/formats/mpeg/mpeg_audio_stream_parser_base.cc
|
View
|
|
2 chunks |
+8 lines, -4 lines |
0 comments
|
Download
|
|
M |
media/formats/webm/webm_audio_client.h
|
View
|
|
3 chunks |
+3 lines, -4 lines |
0 comments
|
Download
|
|
M |
media/formats/webm/webm_audio_client.cc
|
View
|
|
2 chunks |
+11 lines, -6 lines |
0 comments
|
Download
|
|
M |
media/formats/webm/webm_tracks_parser.cc
|
View
|
|
4 chunks |
+4 lines, -8 lines |
0 comments
|
Download
|
|
M |
media/formats/webm/webm_video_client.h
|
View
|
|
2 chunks |
+3 lines, -4 lines |
0 comments
|
Download
|
|
M |
media/formats/webm/webm_video_client.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
media/media.gyp
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
media/mojo/common/media_type_converters.h
|
View
|
|
2 chunks |
+0 lines, -14 lines |
0 comments
|
Download
|
|
M |
media/mojo/common/media_type_converters.cc
|
View
|
|
7 chunks |
+11 lines, -81 lines |
0 comments
|
Download
|
|
M |
media/mojo/common/media_type_converters_unittest.cc
|
View
|
|
8 chunks |
+11 lines, -24 lines |
0 comments
|
Download
|
|
M |
media/mojo/interfaces/media_types.mojom
|
View
|
|
3 chunks |
+2 lines, -25 lines |
0 comments
|
Download
|
|
M |
media/renderers/audio_renderer_impl_unittest.cc
|
View
|
|
1 chunk |
+6 lines, -3 lines |
0 comments
|
Download
|
Total messages: 6 (2 generated)
|