1378304 - Remove AbstractMediaDecoder::GetResource()

Status: RESOLVED FIXED

(Core :: Audio/Video: Playback, enhancement, P3)

Description

[JW Wang [:jwwang] [:jw_wang]]

A step toward bug 1378295.

Comment 1

[JW Wang [:jwwang] [:jw_wang]]

Attachment: Bug 1378304. P1 - pass a MediaResource* to DecoderTraits::CreateReader() to reduce the use of AbstractMediaDecoder::GetResource().

Review commit: https://reviewboard.mozilla.org/r/154726/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/154726/

Comment 2

[JW Wang [:jwwang] [:jw_wang]]

Attachment: Bug 1378304. P2 - replace GetResource() with mResource in MediaDecoder sub-classes.

Review commit: https://reviewboard.mozilla.org/r/154728/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/154728/

Comment 3

[JW Wang [:jwwang] [:jw_wang]]

Attachment: Bug 1378304. P3 - store MediaResource in MediaDecoderReader and replace the use of GetResource() with mResource.

Note MediaDecoderReader::GetBuffered() accesses mResource which is null
when it is actually a MediaFormatReader. However, it is OK for MediaFormatReader
will override UpdateBuffered() and will never call GetBuffered().

Review commit: https://reviewboard.mozilla.org/r/154730/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/154730/

Comment 4

[JW Wang [:jwwang] [:jw_wang]]

Attachment: Bug 1378304. P4 - remove AbstractMediaDecoder::GetResource().

Review commit: https://reviewboard.mozilla.org/r/154732/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/154732/

Comment 5

[Jean-Yves Avenard [:jya]]

Comment on attachment 8883781 [details]
Bug 1378304. P1 - pass a MediaResource* to DecoderTraits::CreateReader() to reduce the use of AbstractMediaDecoder::GetResource().

https://reviewboard.mozilla.org/r/154726/#review159792

Comment 6

[Jean-Yves Avenard [:jya]]

Comment on attachment 8883782 [details]
Bug 1378304. P2 - replace GetResource() with mResource in MediaDecoder sub-classes.

https://reviewboard.mozilla.org/r/154728/#review159796

Comment 7

[Jean-Yves Avenard [:jya]]

Comment on attachment 8883783 [details]
Bug 1378304. P3 - store MediaResource in MediaDecoderReader and replace the use of GetResource() with mResource.

https://reviewboard.mozilla.org/r/154730/#review159798

::: dom/media/MediaDecoderReader.cpp:76
(Diff revision 1)
> +                                       MediaResource* aResource)
>    : mAudioCompactor(mAudioQueue)
>    , mDecoder(aDecoder)
> -  , mTaskQueue(new TaskQueue(
> +  , mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
> -      GetMediaThreadPool(MediaThreadType::PLAYBACK),
> -      "MediaDecoderReader::mTaskQueue",
> +                             "MediaDecoderReader::mTaskQueue",

all those formatting changes are out of scope when all youre doing is adding a new member.

also, please use the formatting generated by clang-format

::: dom/media/android/AndroidMediaReader.cpp:32
(Diff revision 1)
>  
> -AndroidMediaReader::AndroidMediaReader(AbstractMediaDecoder *aDecoder,
> -                                       const MediaContainerType& aContainerType) :
> -  MediaDecoderReader(aDecoder),
> -  mType(aContainerType),
> -  mPlugin(nullptr),
> +AndroidMediaReader::AndroidMediaReader(AbstractMediaDecoder* aDecoder,
> +                                       const MediaContainerType& aContainerType,
> +                                       MediaResource* aResource)
> +  : MediaDecoderReader(aDecoder, aResource)
> +  , mType(aContainerType)

out of scope.

Comment 8

[JW Wang [:jwwang] [:jw_wang]]

Comment on attachment 8883783 [details]
Bug 1378304. P3 - store MediaResource in MediaDecoderReader and replace the use of GetResource() with mResource.

https://reviewboard.mozilla.org/r/154730/#review159798

> all those formatting changes are out of scope when all youre doing is adding a new member.
> 
> also, please use the formatting generated by clang-format

Yes, the format change is already done by |mach clang-format|.
|mach clang-format| only works for the current change. How can I move the format change to another patch?

Comment 9

[Jean-Yves Avenard [:jya]]

Comment on attachment 8883784 [details]
Bug 1378304. P4 - remove AbstractMediaDecoder::GetResource().

https://reviewboard.mozilla.org/r/154732/#review159800

you mentioned in your bug description that it would help using MediaDecoderReader with webrtc, what are you plans there?

I don't see how.

Comment 10

[JW Wang [:jwwang] [:jw_wang]]

It would be easier to reuse MediaDecoderReader without supplying a AbstractMediaDecoder. BufferDecoder is an example whose implementation is mostly empty. It exists only for we can pass something to the constructor of MediaDecoderReader.

Comment 11

[JW Wang [:jwwang] [:jw_wang]]

Comment on attachment 8883783 [details]
Bug 1378304. P3 - store MediaResource in MediaDecoderReader and replace the use of GetResource() with mResource.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/154730/diff/1-2/

Comment 12

[JW Wang [:jwwang] [:jw_wang]]

Comment on attachment 8883784 [details]
Bug 1378304. P4 - remove AbstractMediaDecoder::GetResource().

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/154732/diff/1-2/

Comment 13

[JW Wang [:jwwang] [:jw_wang]]

Thanks for the review!

Comment 14

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/66cfc213ea2c
P1 - pass a MediaResource* to DecoderTraits::CreateReader() to reduce the use of AbstractMediaDecoder::GetResource(). r=jya
https://hg.mozilla.org/integration/autoland/rev/b290ce30c00d
P2 - replace GetResource() with mResource in MediaDecoder sub-classes. r=jya
https://hg.mozilla.org/integration/autoland/rev/b76b993079f0
P3 - store MediaResource in MediaDecoderReader and replace the use of GetResource() with mResource. r=jya
https://hg.mozilla.org/integration/autoland/rev/c20113d6cac6
P4 - remove AbstractMediaDecoder::GetResource(). r=jya

Comment 15

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/66cfc213ea2c
https://hg.mozilla.org/mozilla-central/rev/b290ce30c00d
https://hg.mozilla.org/mozilla-central/rev/b76b993079f0
https://hg.mozilla.org/mozilla-central/rev/c20113d6cac6