821396 - Fix build warnings in content/media/dash

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Catalin Iordache]

Attachment: p2v1.patch

User Agent: Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:17.0) Gecko/20100101 Firefox/17.0
Build ID: 20121129151900

Steps to reproduce:

Fix warnings in content/media/dash/DASHDecoder.cpp and content/media/dash/DASHRepDecoder.cpp

Comment 1

[Catalin Iordache]

I'm a beginner developer. This is actually my second patch for Mozilla codebase, but I have to say that the first one wasn't relevant( bug 821269).

I hope this one is more relevant.

Comment 2

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Comment on attachment 691894 [details] [diff] [review]
p2v1.patch

Review of attachment 691894 [details] [diff] [review]:
-----------------------------------------------------------------

::: content/media/dash/DASHRepDecoder.cpp
@@ +270,5 @@
>    // i.e. inactive rep decoders should only load metadata.
>    bool canDownloadData = mMainDecoder->IsDecoderAllowedToDownloadData(this);
>    if (canDownloadData) {
> +    for (uint32_t i = 0; i < mByteRanges.Length(); i++) {
> +      NS_ENSURE_FALSE(mByteRanges[i].IsNull(), NS_ERROR_NOT_INITIALIZED);    

You added some trailing whitespace here; please remove it.

Comment 3

[Catalin Iordache]

Attachment: whitespaces removed

Comment 4

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 692590 [details] [diff] [review]
whitespaces removed

Review of attachment 692590 [details] [diff] [review]:
-----------------------------------------------------------------

::: content/media/dash/DASHDecoder.cpp
@@ +697,5 @@
>  
>        // Do Stream Switching here before loading next bytes.
>        // Audio stream switching not supported.
>        if (aRepDecoder == VideoRepDecoder() &&
> +          (uint32_t)mVideoSubsegmentIdx < VideoRepDecoder()->GetNumDataByteRanges()) {

Make this:
uint32_t(mVideoSubsegmentIdx)

@@ +938,5 @@
>    NS_ENSURE_TRUE(toDecoderIdx < mVideoRepDecoders.Length(),
>                   NS_ERROR_ILLEGAL_VALUE);
>  
>    // Notify reader and sub decoders and do the switch.
> +  if (toDecoderIdx != (uint32_t)mVideoRepDecoderIdx) {

Make this:
uint32_t(mVideoRepDecoderIdx)

Comment 5

[Catalin Iordache]

Attachment: added for checkin

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ba26ddd4739b

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/ba26ddd4739b