1219475 - bool-compare warning saptype > 2

Status: RESOLVED FIXED

(Core :: Audio/Video: Playback, defect)

Description

[Ralph Giles (:rillian)]

0:03.61 /home/giles/mozilla/firefox/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp:2194:29: warning: comparison of constant ‘2’ with boolean expression is always false [-Wbool-compare]
 0:03.61          if (!sap || saptype > 2) {
 0:03.61                              ^

Comment 1

[Ralph Giles (:rillian)]

Attachment: Fix stagefright comparison warning

Comment 3

[Ralph Giles (:rillian)]

Attachment: Fix stagefright comparison warning v2

Oops, remove unrelated changes from the patch.

Comment 4

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

Comment on attachment 8680317 [details] [diff] [review]
Fix stagefright comparison warning v2

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

r+ with proper masking.

::: media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
@@ +2190,4 @@
>              ALOGW("sub-sidx boxes not supported yet");
>          }
>          bool sap = d3 & 0x80000000;
> +        uint32_t saptype = d3 >> 28;

As discussed, you should mask the value to exclude the left-most bit (which should be a 1 in most cases), i.e.:
  (d3 >> 28) & 0x3

Comment 5

[Ralph Giles (:rillian)]

Attachment: Fix stagefright comparison warning v3

Add missing mask. Carrying forward r=gerald.

Comment 6

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/59d9b597bafa

Comment 7

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

https://hg.mozilla.org/mozilla-central/rev/59d9b597bafa

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/releases/mozilla-b2g44_v2_5/rev/59d9b597bafa

Comment 9

[Carsten Book [:Tomcat]]

removing the b2g 2.5 flag since this commit has been reverted due to an incorrect merge, sorry for the confusion