Bug 1328142 - Unify macros in MediaPipeline. r=pkerr
authorAndreas Pehrson <pehrsons@gmail.com>
Tue, 03 Jan 2017 17:10:41 +0100
changeset 377345 cd5f8d67b620278cab7d009466858cc3b9de748c
parent 377344 4efc5eb60678b2725239be50ff4300491df9ab9e
child 377346 84568b4acdccb31cc8c5c4d91a653b4d54f5b07d
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspkerr
bugs1328142
milestone53.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 1328142 - Unify macros in MediaPipeline. r=pkerr MozReview-Commit-ID: 6ePBKzxZndB
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -2189,26 +2189,24 @@ public:
                         uint32_t y_stride,
                         uint32_t cbcr_stride,
                         uint32_t time_stamp,
                         int64_t render_time,
                         const RefPtr<layers::Image>& video_image)
   {
 #ifdef MOZILLA_INTERNAL_API
     ReentrantMonitorAutoEnter enter(monitor_);
-#endif // MOZILLA_INTERNAL_API
 
-#if defined(MOZILLA_INTERNAL_API)
     if (buffer) {
       // Create a video frame using |buffer|.
 #ifdef MOZ_WIDGET_GONK
       RefPtr<PlanarYCbCrImage> yuvImage = new GrallocImage();
 #else
       RefPtr<PlanarYCbCrImage> yuvImage = image_container_->CreatePlanarYCbCrImage();
-#endif
+#endif // MOZ_WIDGET_GONK
       uint8_t* frame = const_cast<uint8_t*>(static_cast<const uint8_t*> (buffer));
 
       PlanarYCbCrData yuvData;
       yuvData.mYChannel = frame;
       yuvData.mYSize = IntSize(y_stride, height_);
       yuvData.mYStride = y_stride;
       yuvData.mCbCrStride = cbcr_stride;
       yuvData.mCbChannel = frame + height_ * yuvData.mYStride;