869251 - Disable omx decoder and camera on gonk-JB

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Michael Wu [:mwu]]

Attachment: Disable omx decoder and camera on gonk-JB

Disabling the omx decoder and camera code will get us building for now on gonk-JB.

I had to add includes to gfx/layers/Makefile.in to get GonkIOSurfaceImage.cpp to build. It seemed easier to make that build than to figure out how to ifdef it out.

Comment 1

[cajbir (:cajbir)]

Comment on attachment 746144 [details] [diff] [review]
Disable omx decoder and camera on gonk-JB

Can you split the patch up into C++ code changes which I'll review and build file changes which a build peer will need to review. I'll review then.

Comment 2

[Michael Wu [:mwu]]

Attachment: Disable omx decoder and camera on gonk-JB (code changes)

Comment 3

[Michael Wu [:mwu]]

Attachment: Disable omx decoder and camera on gonk-JB (build changes)

Comment 4

[cajbir (:cajbir)]

Comment on attachment 746149 [details] [diff] [review]
Disable omx decoder and camera on gonk-JB (code changes)

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

I suggest doing a try build to ensure nothing breaks on non-gonk platforms due to these changes.

Comment 5

[Michael Wu [:mwu]]

https://tbpl.mozilla.org/?tree=Try&rev=42ba96ebddda

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 746150 [details] [diff] [review]
Disable omx decoder and camera on gonk-JB (build changes)

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

::: configure.in
@@ +205,4 @@
>      15)
>          GONK_INCLUDES="-I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/frameworks/base/include -I$gonkdir/frameworks/base/services/camera -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib -I$gonkdir/dalvik/libnativehelper/include/nativehelper"
>          MOZ_B2G_BT=1
> +        MOZ_B2G_CAMERA=1

This enables camera where it was not enabled before, is that wanted?

Comment 7

[Michael Wu [:mwu]]

(In reply to Mike Hommey [:glandium] from comment #6)
> Comment on attachment 746150 [details] [diff] [review]
> Disable omx decoder and camera on gonk-JB (build changes)
> 
> Review of attachment 746150 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: configure.in
> @@ +205,4 @@
> >      15)
> >          GONK_INCLUDES="-I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/frameworks/base/include -I$gonkdir/frameworks/base/services/camera -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib -I$gonkdir/dalvik/libnativehelper/include/nativehelper"
> >          MOZ_B2G_BT=1
> > +        MOZ_B2G_CAMERA=1
> 
> This enables camera where it was not enabled before, is that wanted?

Yup. It was being enabled in the mozconfig previously, but only for compatibility with an old and completely unsupported configuration. It makes sense to just enable camera by default on ICS where it's supported now and simplify the mozconfig.

Comment 8

[Michael Wu [:mwu]]

https://hg.mozilla.org/projects/birch/rev/7372a5417a28

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/7372a5417a28