Commit a650b476 authored by Jose Dapena Paz's avatar Jose Dapena Paz Committed by Commit Bot

GCC: avoid naming a type with same name of an existing template in decoder selector test.

In decoder selector test, we alias DecoderSelector to the instantiated template
(i.e. DecoderSelector<media::DemuxerStream::AUDIO>). GCC does not allow that as
the alias name clashes with template name.

To solve it we rename the alias to be MockDecoderSelector.

Bug: 819294
Change-Id: I8ca0664df9b874fd5bd0c1db3397cbd17d14e084
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310492Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Commit-Queue: José Dapena Paz <jdapena@igalia.com>
Cr-Commit-Position: refs/heads/master@{#790738}
parent 24be0c6b
...@@ -41,7 +41,7 @@ class AudioDecoderSelectorTestParam { ...@@ -41,7 +41,7 @@ class AudioDecoderSelectorTestParam {
static constexpr media::DemuxerStream::Type kStreamType = static constexpr media::DemuxerStream::Type kStreamType =
media::DemuxerStream::AUDIO; media::DemuxerStream::AUDIO;
using DecoderSelector = DecoderSelector<media::DemuxerStream::AUDIO>; using MockDecoderSelector = DecoderSelector<media::DemuxerStream::AUDIO>;
using MockDecoder = media::MockAudioDecoder; using MockDecoder = media::MockAudioDecoder;
using Output = media::AudioBuffer; using Output = media::AudioBuffer;
...@@ -79,7 +79,7 @@ class VideoDecoderSelectorTestParam { ...@@ -79,7 +79,7 @@ class VideoDecoderSelectorTestParam {
static constexpr media::DemuxerStream::Type kStreamType = static constexpr media::DemuxerStream::Type kStreamType =
media::DemuxerStream::VIDEO; media::DemuxerStream::VIDEO;
using DecoderSelector = DecoderSelector<media::DemuxerStream::VIDEO>; using MockDecoderSelector = DecoderSelector<media::DemuxerStream::VIDEO>;
using MockDecoder = media::MockVideoDecoder; using MockDecoder = media::MockVideoDecoder;
using Output = media::VideoFrame; using Output = media::VideoFrame;
...@@ -125,8 +125,8 @@ class WebCodecsDecoderSelectorTest : public ::testing::Test { ...@@ -125,8 +125,8 @@ class WebCodecsDecoderSelectorTest : public ::testing::Test {
public: public:
// Convenience aliases. // Convenience aliases.
using Self = WebCodecsDecoderSelectorTest<TypeParam>; using Self = WebCodecsDecoderSelectorTest<TypeParam>;
using Decoder = typename TypeParam::DecoderSelector::Decoder; using Decoder = typename TypeParam::MockDecoderSelector::Decoder;
using DecoderConfig = typename TypeParam::DecoderSelector::DecoderConfig; using DecoderConfig = typename TypeParam::MockDecoderSelector::DecoderConfig;
using MockDecoder = typename TypeParam::MockDecoder; using MockDecoder = typename TypeParam::MockDecoder;
using Output = typename TypeParam::Output; using Output = typename TypeParam::Output;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment