Fix for bug 5584451: Match Java standard with code organization in filterpacks

Filterpacks have been restructured:
- mca/filterpacks/$PACK/java -> mca/filterpacks/java/android/filterpacks/$PACK
- mca/filterpacks/$PACK/native -> mca/filterpacks/native/$PACK

Change-Id: Ic2607d368d67a363a48908ac97c6be99f2d61804

diff --git a/mca/Docs.mk b/mca/Docs.mk
index d9294b5..794b3fa 100644 (file)
--- a/mca/Docs.mk
+++ b/mca/Docs.mk
@@ -33,12 +33,5 @@ define libfilterfw_to_document
  $(call libfilterfw-all-java-files-under,$(1), \
    filterfw/java \
    effect/java \
-   filterpacks/imageproc/java \
-   filterpacks/numeric/java \
-   filterpacks/performance/java \
-   filterpacks/text/java \
-   filterpacks/ui/java \
-   filterpacks/videosrc/java \
-   filterpacks/videoproc/java \
-   filterpacks/videosink/java )
+   filterpacks/java )
 endef

diff --git a/mca/filterpacks/Android.mk b/mca/filterpacks/Android.mk
index 24a558a..6166b1e 100644 (file)
--- a/mca/filterpacks/Android.mk
+++ b/mca/filterpacks/Android.mk
@@ -13,7 +13,43 @@
 # limitations under the License.
 #
 
-TOP_LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+
+##
+# base
+##
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := libfilterpack_base
+LOCAL_SRC_FILES := native/base/geometry.cpp \
+                   native/base/time_util.cpp
+
+LOCAL_CFLAGS := -DANDROID
+
+include external/stlport/libstlport.mk
+
+include $(BUILD_STATIC_LIBRARY)
+
+##
+# filterpack_imageproc
+##
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := libfilterpack_imageproc
+
+LOCAL_SRC_FILES += native/imageproc/brightness.c \
+                   native/imageproc/contrast.c \
+                   native/imageproc/invert.c \
+                   native/imageproc/to_rgba.c
+
+LOCAL_SHARED_LIBRARIES := libutils libfilterfw
+
+LOCAL_PRELINK_MODULE := false
+
+include $(BUILD_SHARED_LIBRARY)
 
-include $(call all-subdir-makefiles)
 

diff --git a/mca/filterpacks/base/Android.mk b/mca/filterpacks/base/Android.mk
deleted file mode 100644 (file)
index ab26a9f..0000000
--- a/mca/filterpacks/base/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-##
-# Build native code
-##
-
-#Build base library
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := libfilterpack_base
-LOCAL_SRC_FILES := native/geometry.cpp \
-                   native/time_util.cpp
-
-LOCAL_CFLAGS := -DANDROID
-
-include external/stlport/libstlport.mk
-
-include $(BUILD_STATIC_LIBRARY)

diff --git a/mca/filterpacks/imageproc/Android.mk b/mca/filterpacks/imageproc/Android.mk
deleted file mode 100644 (file)
index 6c62142..0000000
--- a/mca/filterpacks/imageproc/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-##
-# Build native code
-##
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := libfilterpack_imageproc
-
-LOCAL_SRC_FILES += native/brightness.c \
-                   native/contrast.c \
-                   native/invert.c \
-                   native/to_rgba.c
-
-LOCAL_SHARED_LIBRARIES := libutils libfilterfw
-
-LOCAL_PRELINK_MODULE := false
-
-include $(BUILD_SHARED_LIBRARY)

diff --git a/mca/filterfw/java/android/filterfw/basefilters/CallbackFilter.java b/mca/filterpacks/java/android/filterpacks/base/CallbackFilter.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/CallbackFilter.java
rename to mca/filterpacks/java/android/filterpacks/base/CallbackFilter.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/FrameBranch.java b/mca/filterpacks/java/android/filterpacks/base/FrameBranch.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/FrameBranch.java
rename to mca/filterpacks/java/android/filterpacks/base/FrameBranch.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/FrameFetch.java b/mca/filterpacks/java/android/filterpacks/base/FrameFetch.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/FrameFetch.java
rename to mca/filterpacks/java/android/filterpacks/base/FrameFetch.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/FrameSource.java b/mca/filterpacks/java/android/filterpacks/base/FrameSource.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/FrameSource.java
rename to mca/filterpacks/java/android/filterpacks/base/FrameSource.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/FrameStore.java b/mca/filterpacks/java/android/filterpacks/base/FrameStore.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/FrameStore.java
rename to mca/filterpacks/java/android/filterpacks/base/FrameStore.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/GLTextureSource.java b/mca/filterpacks/java/android/filterpacks/base/GLTextureSource.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/GLTextureSource.java
rename to mca/filterpacks/java/android/filterpacks/base/GLTextureSource.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/GLTextureTarget.java b/mca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/GLTextureTarget.java
rename to mca/filterpacks/java/android/filterpacks/base/GLTextureTarget.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/InputStreamSource.java b/mca/filterpacks/java/android/filterpacks/base/InputStreamSource.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/InputStreamSource.java
rename to mca/filterpacks/java/android/filterpacks/base/InputStreamSource.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/NullFilter.java b/mca/filterpacks/java/android/filterpacks/base/NullFilter.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/NullFilter.java
rename to mca/filterpacks/java/android/filterpacks/base/NullFilter.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/ObjectSource.java b/mca/filterpacks/java/android/filterpacks/base/ObjectSource.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/ObjectSource.java
rename to mca/filterpacks/java/android/filterpacks/base/ObjectSource.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/OutputStreamTarget.java b/mca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/OutputStreamTarget.java
rename to mca/filterpacks/java/android/filterpacks/base/OutputStreamTarget.java

diff --git a/mca/filterfw/java/android/filterfw/basefilters/RetargetFilter.java b/mca/filterpacks/java/android/filterpacks/base/RetargetFilter.java
similarity index 100%
rename from mca/filterfw/java/android/filterfw/basefilters/RetargetFilter.java
rename to mca/filterpacks/java/android/filterpacks/base/RetargetFilter.java

diff --git a/mca/filterpacks/imageproc/java/AlphaBlendFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/AlphaBlendFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/AlphaBlendFilter.java

diff --git a/mca/filterpacks/imageproc/java/AutoFixFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/AutoFixFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/AutoFixFilter.java

diff --git a/mca/filterpacks/imageproc/java/BitmapOverlayFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/BitmapOverlayFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/BitmapOverlayFilter.java

diff --git a/mca/filterpacks/imageproc/java/BitmapSource.java b/mca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/BitmapSource.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/BitmapSource.java

diff --git a/mca/filterpacks/imageproc/java/BlackWhiteFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/BlackWhiteFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/BlackWhiteFilter.java

diff --git a/mca/filterpacks/imageproc/java/BlendFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/BlendFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/BlendFilter.java

diff --git a/mca/filterpacks/imageproc/java/BrightnessFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/BrightnessFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/BrightnessFilter.java

diff --git a/mca/filterpacks/imageproc/java/ColorTemperatureFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ColorTemperatureFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ColorTemperatureFilter.java

diff --git a/mca/filterpacks/imageproc/java/ContrastFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ContrastFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ContrastFilter.java

diff --git a/mca/filterpacks/imageproc/java/CropFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/CropFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/CropFilter.java

diff --git a/mca/filterpacks/imageproc/java/CropRectFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/CropRectFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/CropRectFilter.java

diff --git a/mca/filterpacks/imageproc/java/CrossProcessFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/CrossProcessFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/CrossProcessFilter.java

diff --git a/mca/filterpacks/imageproc/java/DocumentaryFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/DocumentaryFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/DocumentaryFilter.java

diff --git a/mca/filterpacks/imageproc/java/DrawOverlayFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/DrawOverlayFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/DrawOverlayFilter.java

diff --git a/mca/filterpacks/imageproc/java/DrawRectFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/DrawRectFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/DrawRectFilter.java

diff --git a/mca/filterpacks/imageproc/java/DuotoneFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/DuotoneFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/DuotoneFilter.java

diff --git a/mca/filterpacks/imageproc/java/FillLightFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/FillLightFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/FillLightFilter.java

diff --git a/mca/filterpacks/imageproc/java/FisheyeFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/FisheyeFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/FisheyeFilter.java

diff --git a/mca/filterpacks/imageproc/java/FixedRotationFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/FixedRotationFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/FixedRotationFilter.java

diff --git a/mca/filterpacks/imageproc/java/FlipFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/FlipFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/FlipFilter.java

diff --git a/mca/filterpacks/imageproc/java/GrainFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/GrainFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/GrainFilter.java

diff --git a/mca/filterpacks/imageproc/java/ImageCombineFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ImageCombineFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ImageCombineFilter.java

diff --git a/mca/filterpacks/imageproc/java/ImageEncoder.java b/mca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ImageEncoder.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ImageEncoder.java

diff --git a/mca/filterpacks/imageproc/java/ImageSlicer.java b/mca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ImageSlicer.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ImageSlicer.java

diff --git a/mca/filterpacks/imageproc/java/ImageStitcher.java b/mca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ImageStitcher.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ImageStitcher.java

diff --git a/mca/filterpacks/imageproc/java/Invert.java b/mca/filterpacks/java/android/filterpacks/imageproc/Invert.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/Invert.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/Invert.java

diff --git a/mca/filterpacks/imageproc/java/LomoishFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/LomoishFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/LomoishFilter.java

diff --git a/mca/filterpacks/imageproc/java/NegativeFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/NegativeFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/NegativeFilter.java

diff --git a/mca/filterpacks/imageproc/java/PosterizeFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/PosterizeFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/PosterizeFilter.java

diff --git a/mca/filterpacks/imageproc/java/RedEyeFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/RedEyeFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/RedEyeFilter.java

diff --git a/mca/filterpacks/imageproc/java/ResizeFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ResizeFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ResizeFilter.java

diff --git a/mca/filterpacks/imageproc/java/RotateFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/RotateFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/RotateFilter.java

diff --git a/mca/filterpacks/imageproc/java/SaturateFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/SaturateFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/SaturateFilter.java

diff --git a/mca/filterpacks/imageproc/java/SepiaFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/SepiaFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/SepiaFilter.java

diff --git a/mca/filterpacks/imageproc/java/SharpenFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/SharpenFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/SharpenFilter.java

diff --git a/mca/filterpacks/imageproc/java/SimpleImageFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/SimpleImageFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/SimpleImageFilter.java

diff --git a/mca/filterpacks/imageproc/java/StraightenFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/StraightenFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/StraightenFilter.java

diff --git a/mca/filterpacks/imageproc/java/TintFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/TintFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/TintFilter.java

diff --git a/mca/filterpacks/imageproc/java/ToGrayFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ToGrayFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ToGrayFilter.java

diff --git a/mca/filterpacks/imageproc/java/ToPackedGrayFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ToPackedGrayFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ToPackedGrayFilter.java

diff --git a/mca/filterpacks/imageproc/java/ToRGBAFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ToRGBAFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ToRGBAFilter.java

diff --git a/mca/filterpacks/imageproc/java/ToRGBFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/ToRGBFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/ToRGBFilter.java

diff --git a/mca/filterpacks/imageproc/java/VignetteFilter.java b/mca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/VignetteFilter.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/VignetteFilter.java

diff --git a/mca/filterpacks/imageproc/java/package-info.java b/mca/filterpacks/java/android/filterpacks/imageproc/package-info.java
similarity index 100%
rename from mca/filterpacks/imageproc/java/package-info.java
rename to mca/filterpacks/java/android/filterpacks/imageproc/package-info.java

diff --git a/mca/filterpacks/numeric/java/SinWaveFilter.java b/mca/filterpacks/java/android/filterpacks/numeric/SinWaveFilter.java
similarity index 100%
rename from mca/filterpacks/numeric/java/SinWaveFilter.java
rename to mca/filterpacks/java/android/filterpacks/numeric/SinWaveFilter.java

diff --git a/mca/filterpacks/numeric/java/package-info.java b/mca/filterpacks/java/android/filterpacks/numeric/package-info.java
similarity index 100%
rename from mca/filterpacks/numeric/java/package-info.java
rename to mca/filterpacks/java/android/filterpacks/numeric/package-info.java

diff --git a/mca/filterpacks/performance/java/Throughput.java b/mca/filterpacks/java/android/filterpacks/performance/Throughput.java
similarity index 100%
rename from mca/filterpacks/performance/java/Throughput.java
rename to mca/filterpacks/java/android/filterpacks/performance/Throughput.java

diff --git a/mca/filterpacks/performance/java/ThroughputFilter.java b/mca/filterpacks/java/android/filterpacks/performance/ThroughputFilter.java
similarity index 100%
rename from mca/filterpacks/performance/java/ThroughputFilter.java
rename to mca/filterpacks/java/android/filterpacks/performance/ThroughputFilter.java

diff --git a/mca/filterpacks/performance/java/package-info.java b/mca/filterpacks/java/android/filterpacks/performance/package-info.java
similarity index 100%
rename from mca/filterpacks/performance/java/package-info.java
rename to mca/filterpacks/java/android/filterpacks/performance/package-info.java

diff --git a/mca/filterpacks/text/java/StringLogger.java b/mca/filterpacks/java/android/filterpacks/text/StringLogger.java
similarity index 100%
rename from mca/filterpacks/text/java/StringLogger.java
rename to mca/filterpacks/java/android/filterpacks/text/StringLogger.java

diff --git a/mca/filterpacks/text/java/StringSource.java b/mca/filterpacks/java/android/filterpacks/text/StringSource.java
similarity index 100%
rename from mca/filterpacks/text/java/StringSource.java
rename to mca/filterpacks/java/android/filterpacks/text/StringSource.java

diff --git a/mca/filterpacks/text/java/ToUpperCase.java b/mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java
similarity index 100%
rename from mca/filterpacks/text/java/ToUpperCase.java
rename to mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java

diff --git a/mca/filterpacks/text/java/package-info.java b/mca/filterpacks/java/android/filterpacks/text/package-info.java
similarity index 100%
rename from mca/filterpacks/text/java/package-info.java
rename to mca/filterpacks/java/android/filterpacks/text/package-info.java

diff --git a/mca/filterpacks/ui/java/SurfaceRenderFilter.java b/mca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java
similarity index 100%
rename from mca/filterpacks/ui/java/SurfaceRenderFilter.java
rename to mca/filterpacks/java/android/filterpacks/ui/SurfaceRenderFilter.java

diff --git a/mca/filterpacks/ui/java/SurfaceTargetFilter.java b/mca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java
similarity index 100%
rename from mca/filterpacks/ui/java/SurfaceTargetFilter.java
rename to mca/filterpacks/java/android/filterpacks/ui/SurfaceTargetFilter.java

diff --git a/mca/filterpacks/ui/java/package-info.java b/mca/filterpacks/java/android/filterpacks/ui/package-info.java
similarity index 100%
rename from mca/filterpacks/ui/java/package-info.java
rename to mca/filterpacks/java/android/filterpacks/ui/package-info.java

diff --git a/mca/filterpacks/videoproc/java/BackDropperFilter.java b/mca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java
similarity index 100%
rename from mca/filterpacks/videoproc/java/BackDropperFilter.java
rename to mca/filterpacks/java/android/filterpacks/videoproc/BackDropperFilter.java

diff --git a/mca/filterpacks/videosink/java/MediaEncoderFilter.java b/mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java
similarity index 100%
rename from mca/filterpacks/videosink/java/MediaEncoderFilter.java
rename to mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java

diff --git a/mca/filterpacks/videosink/java/MediaRecorderStopException.java b/mca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java
similarity index 100%
rename from mca/filterpacks/videosink/java/MediaRecorderStopException.java
rename to mca/filterpacks/java/android/filterpacks/videosink/MediaRecorderStopException.java

diff --git a/mca/filterpacks/videosrc/java/CameraSource.java b/mca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java
similarity index 100%
rename from mca/filterpacks/videosrc/java/CameraSource.java
rename to mca/filterpacks/java/android/filterpacks/videosrc/CameraSource.java

diff --git a/mca/filterpacks/videosrc/java/MediaSource.java b/mca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java
similarity index 100%
rename from mca/filterpacks/videosrc/java/MediaSource.java
rename to mca/filterpacks/java/android/filterpacks/videosrc/MediaSource.java

diff --git a/mca/filterpacks/videosrc/java/SurfaceTextureSource.java b/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java
similarity index 100%
rename from mca/filterpacks/videosrc/java/SurfaceTextureSource.java
rename to mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureSource.java

diff --git a/mca/filterpacks/videosrc/java/SurfaceTextureTarget.java b/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java
similarity index 100%
rename from mca/filterpacks/videosrc/java/SurfaceTextureTarget.java
rename to mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java

diff --git a/mca/filterpacks/videosrc/java/package-info.java b/mca/filterpacks/java/android/filterpacks/videosrc/package-info.java
similarity index 100%
rename from mca/filterpacks/videosrc/java/package-info.java
rename to mca/filterpacks/java/android/filterpacks/videosrc/package-info.java

diff --git a/mca/filterpacks/base/native/geometry.cpp b/mca/filterpacks/native/base/geometry.cpp
similarity index 100%
rename from mca/filterpacks/base/native/geometry.cpp
rename to mca/filterpacks/native/base/geometry.cpp

diff --git a/mca/filterpacks/base/native/geometry.h b/mca/filterpacks/native/base/geometry.h
similarity index 100%
rename from mca/filterpacks/base/native/geometry.h
rename to mca/filterpacks/native/base/geometry.h

diff --git a/mca/filterpacks/base/native/time_util.cpp b/mca/filterpacks/native/base/time_util.cpp
similarity index 100%
rename from mca/filterpacks/base/native/time_util.cpp
rename to mca/filterpacks/native/base/time_util.cpp

diff --git a/mca/filterpacks/base/native/time_util.h b/mca/filterpacks/native/base/time_util.h
similarity index 100%
rename from mca/filterpacks/base/native/time_util.h
rename to mca/filterpacks/native/base/time_util.h

diff --git a/mca/filterpacks/base/native/utilities.h b/mca/filterpacks/native/base/utilities.h
similarity index 100%
rename from mca/filterpacks/base/native/utilities.h
rename to mca/filterpacks/native/base/utilities.h

diff --git a/mca/filterpacks/base/native/vec_types.h b/mca/filterpacks/native/base/vec_types.h
similarity index 100%
rename from mca/filterpacks/base/native/vec_types.h
rename to mca/filterpacks/native/base/vec_types.h

diff --git a/mca/filterpacks/imageproc/native/brightness.c b/mca/filterpacks/native/imageproc/brightness.c
similarity index 100%
rename from mca/filterpacks/imageproc/native/brightness.c
rename to mca/filterpacks/native/imageproc/brightness.c

diff --git a/mca/filterpacks/imageproc/native/contrast.c b/mca/filterpacks/native/imageproc/contrast.c
similarity index 100%
rename from mca/filterpacks/imageproc/native/contrast.c
rename to mca/filterpacks/native/imageproc/contrast.c

diff --git a/mca/filterpacks/imageproc/native/invert.c b/mca/filterpacks/native/imageproc/invert.c
similarity index 100%
rename from mca/filterpacks/imageproc/native/invert.c
rename to mca/filterpacks/native/imageproc/invert.c

diff --git a/mca/filterpacks/imageproc/native/to_rgba.c b/mca/filterpacks/native/imageproc/to_rgba.c
similarity index 100%
rename from mca/filterpacks/imageproc/native/to_rgba.c
rename to mca/filterpacks/native/imageproc/to_rgba.c