Bug 1006248. Part 4: Use better #include paths for libstagefright headers in a couple of places. r=glandium
authorRobert O'Callahan <robert@ocallahan.org>
Tue, 06 May 2014 17:40:59 +1200
changeset 181902 80779d35e8717fda6d035b4b1f8a6d30f74f5cb7
parent 181901 24e9947e23eef2c3e529710f067485b0818c6211
child 181903 41708cef5ec182544769d9d18776958aa79d27cd
push id43168
push userrocallahan@mozilla.com
push dateWed, 07 May 2014 02:37:43 +0000
treeherdermozilla-inbound@80779d35e871 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1006248
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1006248. Part 4: Use better #include paths for libstagefright headers in a couple of places. r=glandium
content/media/omx/OMXCodecProxy.h
media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
--- a/content/media/omx/OMXCodecProxy.h
+++ b/content/media/omx/OMXCodecProxy.h
@@ -3,17 +3,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef OMX_CODEC_PROXY_DECODER_H_
 #define OMX_CODEC_PROXY_DECODER_H_
 
 
 #include <android/native_window.h>
-#include <IOMX.h>
+#include <media/IOMX.h>
 #include <stagefright/MediaBuffer.h>
 #include <stagefright/MediaSource.h>
 #include <utils/threads.h>
 
 #include "MediaResourceManagerClient.h"
 
 namespace android {
 
--- a/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
@@ -8,20 +8,20 @@
 
 // Android/Stagefright
 #include <avc_utils.h>
 #include <binder/ProcessState.h>
 #include <foundation/ABuffer.h>
 #include <foundation/AMessage.h>
 #include <gui/Surface.h>
 #include <media/ICrypto.h>
-#include <MediaCodec.h>
-#include <MediaDefs.h>
-#include <MediaErrors.h>
-#include <MetaData.h>
+#include <media/stagefright/MediaCodec.h>
+#include <media/stagefright/MediaDefs.h>
+#include <media/stagefright/MediaErrors.h>
+#include <media/stagefright/MetaData.h>
 #include <OMX_Component.h>
 using namespace android;
 
 // WebRTC
 #include "common_video/interface/texture_video_frame.h"
 #include "video_engine/include/vie_external_codec.h"
 
 // Gecko