mm-video: rename B-family OMX component

This change is needed to support both legacy
and v4l2 interfaces to co-exist in hardware/qcom/media.

*rename B-family  mm-video as mm-video-v4l2.

Change-Id: I25ed7be76a58b543e03723b4b6932ac886fbf1c6

57 files changed, 2 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index b0beaac7..e5611ce9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@ include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk
 endif
 
 ifneq ($(filter msm8610 msm8226 msm8974 msm8960 msm8660 msm7630_surf apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),)
-include $(QCOM_MEDIA_ROOT)/mm-video/Android.mk
+include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
 endif
 
 ifneq ($(filter msm8610 msm8226 msm8974 msm8960 apq8084 mpq8092,$(TARGET_BOARD_PLATFORM)),)
diff --git a/mm-video/Android.mk b/mm-video-v4l2/Android.mk
index 2d0a5335..2d0a5335 100755
--- a/mm-video/Android.mk
+++ b/mm-video-v4l2/Android.mk
diff --git a/mm-video/DivxDrmDecrypt/Android.mk b/mm-video-v4l2/DivxDrmDecrypt/Android.mk
index 0af340a9..38862260 100755
--- a/mm-video/DivxDrmDecrypt/Android.mk
+++ b/mm-video-v4l2/DivxDrmDecrypt/Android.mk
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 #            Deploy the headers that can be exposed
 #===============================================================================
 
-LOCAL_COPY_HEADERS_TO   := mm-video/DivxDrmDecrypt
+LOCAL_COPY_HEADERS_TO   := mm-video-v4l2/DivxDrmDecrypt
 LOCAL_COPY_HEADERS      := inc/DivXDrmDecrypt.h
 
 LOCAL_CFLAGS := \
diff --git a/mm-video/DivxDrmDecrypt/inc/DivXDrmDecrypt.h b/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h
index 4b0b707d..4b0b707d 100755
--- a/mm-video/DivxDrmDecrypt/inc/DivXDrmDecrypt.h
+++ b/mm-video-v4l2/DivxDrmDecrypt/inc/DivXDrmDecrypt.h
diff --git a/mm-video/DivxDrmDecrypt/src/DivXDrmDecrypt.cpp b/mm-video-v4l2/DivxDrmDecrypt/src/DivXDrmDecrypt.cpp
index ff4a382a..ff4a382a 100755
--- a/mm-video/DivxDrmDecrypt/src/DivXDrmDecrypt.cpp
+++ b/mm-video-v4l2/DivxDrmDecrypt/src/DivXDrmDecrypt.cpp
diff --git a/mm-video/vidc/common/inc/extra_data_handler.h b/mm-video-v4l2/vidc/common/inc/extra_data_handler.h
index c7b6e7bb..c7b6e7bb 100644
--- a/mm-video/vidc/common/inc/extra_data_handler.h
+++ b/mm-video-v4l2/vidc/common/inc/extra_data_handler.h
diff --git a/mm-video/vidc/common/inc/vidc_color_converter.h b/mm-video-v4l2/vidc/common/inc/vidc_color_converter.h
index bbfbdaea..bbfbdaea 100644
--- a/mm-video/vidc/common/inc/vidc_color_converter.h
+++ b/mm-video-v4l2/vidc/common/inc/vidc_color_converter.h
diff --git a/mm-video/vidc/common/src/extra_data_handler.cpp b/mm-video-v4l2/vidc/common/src/extra_data_handler.cpp
index aa3b563b..aa3b563b 100644
--- a/mm-video/vidc/common/src/extra_data_handler.cpp
+++ b/mm-video-v4l2/vidc/common/src/extra_data_handler.cpp
diff --git a/mm-video/vidc/common/src/vidc_color_converter.cpp b/mm-video-v4l2/vidc/common/src/vidc_color_converter.cpp
index e75dd3ca..e75dd3ca 100644
--- a/mm-video/vidc/common/src/vidc_color_converter.cpp
+++ b/mm-video-v4l2/vidc/common/src/vidc_color_converter.cpp
diff --git a/mm-video/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index 97ff2973..97ff2973 100755
--- a/mm-video/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
diff --git a/mm-video/vidc/vdec/inc/Map.h b/mm-video-v4l2/vidc/vdec/inc/Map.h
index 6d5873e0..6d5873e0 100755
--- a/mm-video/vidc/vdec/inc/Map.h
+++ b/mm-video-v4l2/vidc/vdec/inc/Map.h
diff --git a/mm-video/vidc/vdec/inc/decoder_driver_test.h b/mm-video-v4l2/vidc/vdec/inc/decoder_driver_test.h
index b3afafeb..b3afafeb 100755
--- a/mm-video/vidc/vdec/inc/decoder_driver_test.h
+++ b/mm-video-v4l2/vidc/vdec/inc/decoder_driver_test.h
diff --git a/mm-video/vidc/vdec/inc/frameparser.h b/mm-video-v4l2/vidc/vdec/inc/frameparser.h
index 186c0397..186c0397 100755
--- a/mm-video/vidc/vdec/inc/frameparser.h
+++ b/mm-video-v4l2/vidc/vdec/inc/frameparser.h
diff --git a/mm-video/vidc/vdec/inc/h264_utils.h b/mm-video-v4l2/vidc/vdec/inc/h264_utils.h
index 8006bb2a..8006bb2a 100755
--- a/mm-video/vidc/vdec/inc/h264_utils.h
+++ b/mm-video-v4l2/vidc/vdec/inc/h264_utils.h
diff --git a/mm-video/vidc/vdec/inc/hevc_utils.h b/mm-video-v4l2/vidc/vdec/inc/hevc_utils.h
index 6482ee47..6482ee47 100644
--- a/mm-video/vidc/vdec/inc/hevc_utils.h
+++ b/mm-video-v4l2/vidc/vdec/inc/hevc_utils.h
diff --git a/mm-video/vidc/vdec/inc/message_queue.h b/mm-video-v4l2/vidc/vdec/inc/message_queue.h
index d5924e6a..d5924e6a 100755
--- a/mm-video/vidc/vdec/inc/message_queue.h
+++ b/mm-video-v4l2/vidc/vdec/inc/message_queue.h
diff --git a/mm-video/vidc/vdec/inc/mp4_utils.h b/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
index 9a435bf7..9a435bf7 100644
--- a/mm-video/vidc/vdec/inc/mp4_utils.h
+++ b/mm-video-v4l2/vidc/vdec/inc/mp4_utils.h
diff --git a/mm-video/vidc/vdec/inc/omx_vdec.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
index c7877549..c7877549 100644
--- a/mm-video/vidc/vdec/inc/omx_vdec.h
+++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
diff --git a/mm-video/vidc/vdec/inc/omx_vdec_hevc.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec_hevc.h
index 43603583..43603583 100644
--- a/mm-video/vidc/vdec/inc/omx_vdec_hevc.h
+++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec_hevc.h
diff --git a/mm-video/vidc/vdec/inc/power_module.h b/mm-video-v4l2/vidc/vdec/inc/power_module.h
index 59586a12..59586a12 100644
--- a/mm-video/vidc/vdec/inc/power_module.h
+++ b/mm-video-v4l2/vidc/vdec/inc/power_module.h
diff --git a/mm-video/vidc/vdec/inc/qtypes.h b/mm-video-v4l2/vidc/vdec/inc/qtypes.h
index 63126af7..63126af7 100755
--- a/mm-video/vidc/vdec/inc/qtypes.h
+++ b/mm-video-v4l2/vidc/vdec/inc/qtypes.h
diff --git a/mm-video/vidc/vdec/inc/queue.h b/mm-video-v4l2/vidc/vdec/inc/queue.h
index f22e43c1..f22e43c1 100755
--- a/mm-video/vidc/vdec/inc/queue.h
+++ b/mm-video-v4l2/vidc/vdec/inc/queue.h
diff --git a/mm-video/vidc/vdec/inc/ts_parser.h b/mm-video-v4l2/vidc/vdec/inc/ts_parser.h
index 8e884c77..8e884c77 100755
--- a/mm-video/vidc/vdec/inc/ts_parser.h
+++ b/mm-video-v4l2/vidc/vdec/inc/ts_parser.h
diff --git a/mm-video/vidc/vdec/src/frameparser.cpp b/mm-video-v4l2/vidc/vdec/src/frameparser.cpp
index c591f5fd..c591f5fd 100755
--- a/mm-video/vidc/vdec/src/frameparser.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/frameparser.cpp
diff --git a/mm-video/vidc/vdec/src/h264_utils.cpp b/mm-video-v4l2/vidc/vdec/src/h264_utils.cpp
index 651bb6b4..651bb6b4 100644
--- a/mm-video/vidc/vdec/src/h264_utils.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/h264_utils.cpp
diff --git a/mm-video/vidc/vdec/src/hevc_utils.cpp b/mm-video-v4l2/vidc/vdec/src/hevc_utils.cpp
index a283f0ed..a283f0ed 100644
--- a/mm-video/vidc/vdec/src/hevc_utils.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/hevc_utils.cpp
diff --git a/mm-video/vidc/vdec/src/message_queue.c b/mm-video-v4l2/vidc/vdec/src/message_queue.c
index a6b491ed..a6b491ed 100755
--- a/mm-video/vidc/vdec/src/message_queue.c
+++ b/mm-video-v4l2/vidc/vdec/src/message_queue.c
diff --git a/mm-video/vidc/vdec/src/mp4_utils.cpp b/mm-video-v4l2/vidc/vdec/src/mp4_utils.cpp
index 95335d08..95335d08 100644
--- a/mm-video/vidc/vdec/src/mp4_utils.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/mp4_utils.cpp
diff --git a/mm-video/vidc/vdec/src/omx_vdec.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec.cpp
index f9ca19ca..f9ca19ca 100644
--- a/mm-video/vidc/vdec/src/omx_vdec.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec.cpp
diff --git a/mm-video/vidc/vdec/src/omx_vdec_hevc.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc.cpp
index 2b8fc200..2b8fc200 100644
--- a/mm-video/vidc/vdec/src/omx_vdec_hevc.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_hevc.cpp
diff --git a/mm-video/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index 44810df4..44810df4 100644
--- a/mm-video/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
diff --git a/mm-video/vidc/vdec/src/power_module.cpp b/mm-video-v4l2/vidc/vdec/src/power_module.cpp
index 38492186..38492186 100644
--- a/mm-video/vidc/vdec/src/power_module.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/power_module.cpp
diff --git a/mm-video/vidc/vdec/src/queue.c b/mm-video-v4l2/vidc/vdec/src/queue.c
index 368d7c4d..368d7c4d 100755
--- a/mm-video/vidc/vdec/src/queue.c
+++ b/mm-video-v4l2/vidc/vdec/src/queue.c
diff --git a/mm-video/vidc/vdec/src/ts_parser.cpp b/mm-video-v4l2/vidc/vdec/src/ts_parser.cpp
index 44aa2005..44aa2005 100644
--- a/mm-video/vidc/vdec/src/ts_parser.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/ts_parser.cpp
diff --git a/mm-video/vidc/vdec/test/decoder_driver_test.c b/mm-video-v4l2/vidc/vdec/test/decoder_driver_test.c
index fe870f82..fe870f82 100755
--- a/mm-video/vidc/vdec/test/decoder_driver_test.c
+++ b/mm-video-v4l2/vidc/vdec/test/decoder_driver_test.c
diff --git a/mm-video/vidc/vdec/test/omx_vdec_test.cpp b/mm-video-v4l2/vidc/vdec/test/omx_vdec_test.cpp
index a191ee28..a191ee28 100644
--- a/mm-video/vidc/vdec/test/omx_vdec_test.cpp
+++ b/mm-video-v4l2/vidc/vdec/test/omx_vdec_test.cpp
diff --git a/mm-video/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index cb3429ae..cb3429ae 100644
--- a/mm-video/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
diff --git a/mm-video/vidc/venc/inc/camera_test.h b/mm-video-v4l2/vidc/venc/inc/camera_test.h
index 53bc2da6..53bc2da6 100755
--- a/mm-video/vidc/venc/inc/camera_test.h
+++ b/mm-video-v4l2/vidc/venc/inc/camera_test.h
diff --git a/mm-video/vidc/venc/inc/fb_test.h b/mm-video-v4l2/vidc/venc/inc/fb_test.h
index 52a007f1..52a007f1 100755
--- a/mm-video/vidc/venc/inc/fb_test.h
+++ b/mm-video-v4l2/vidc/venc/inc/fb_test.h
diff --git a/mm-video/vidc/venc/inc/omx_video_base.h b/mm-video-v4l2/vidc/venc/inc/omx_video_base.h
index 58b0d4fa..58b0d4fa 100644
--- a/mm-video/vidc/venc/inc/omx_video_base.h
+++ b/mm-video-v4l2/vidc/venc/inc/omx_video_base.h
diff --git a/mm-video/vidc/venc/inc/omx_video_common.h b/mm-video-v4l2/vidc/venc/inc/omx_video_common.h
index dc4be1d3..dc4be1d3 100755
--- a/mm-video/vidc/venc/inc/omx_video_common.h
+++ b/mm-video-v4l2/vidc/venc/inc/omx_video_common.h
diff --git a/mm-video/vidc/venc/inc/omx_video_encoder.h b/mm-video-v4l2/vidc/venc/inc/omx_video_encoder.h
index f59c4ab8..f59c4ab8 100644
--- a/mm-video/vidc/venc/inc/omx_video_encoder.h
+++ b/mm-video-v4l2/vidc/venc/inc/omx_video_encoder.h
diff --git a/mm-video/vidc/venc/inc/queue.h b/mm-video-v4l2/vidc/venc/inc/queue.h
index 530b087d..530b087d 100755
--- a/mm-video/vidc/venc/inc/queue.h
+++ b/mm-video-v4l2/vidc/venc/inc/queue.h
diff --git a/mm-video/vidc/venc/inc/venc_util.h b/mm-video-v4l2/vidc/venc/inc/venc_util.h
index cfa590ca..cfa590ca 100755
--- a/mm-video/vidc/venc/inc/venc_util.h
+++ b/mm-video-v4l2/vidc/venc/inc/venc_util.h
diff --git a/mm-video/vidc/venc/inc/video_encoder_device.h b/mm-video-v4l2/vidc/venc/inc/video_encoder_device.h
index fb24c767..fb24c767 100644
--- a/mm-video/vidc/venc/inc/video_encoder_device.h
+++ b/mm-video-v4l2/vidc/venc/inc/video_encoder_device.h
diff --git a/mm-video/vidc/venc/inc/video_encoder_device_v4l2.h b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
index 78729b69..78729b69 100644
--- a/mm-video/vidc/venc/inc/video_encoder_device_v4l2.h
+++ b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
diff --git a/mm-video/vidc/venc/inc/video_encoder_test.h b/mm-video-v4l2/vidc/venc/inc/video_encoder_test.h
index bf1082a5..bf1082a5 100755
--- a/mm-video/vidc/venc/inc/video_encoder_test.h
+++ b/mm-video-v4l2/vidc/venc/inc/video_encoder_test.h
diff --git a/mm-video/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
index b0e14038..b0e14038 100644
--- a/mm-video/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
diff --git a/mm-video/vidc/venc/src/omx_video_encoder.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
index e47db8f3..e47db8f3 100644
--- a/mm-video/vidc/venc/src/omx_video_encoder.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
diff --git a/mm-video/vidc/venc/src/video_encoder_device.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device.cpp
index 7b56d33a..7b56d33a 100644
--- a/mm-video/vidc/venc/src/video_encoder_device.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device.cpp
diff --git a/mm-video/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
index bddd8e4c..bddd8e4c 100644
--- a/mm-video/vidc/venc/src/video_encoder_device_v4l2.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
diff --git a/mm-video/vidc/venc/test/camera_test.cpp b/mm-video-v4l2/vidc/venc/test/camera_test.cpp
index f5ae6dbe..f5ae6dbe 100755
--- a/mm-video/vidc/venc/test/camera_test.cpp
+++ b/mm-video-v4l2/vidc/venc/test/camera_test.cpp
diff --git a/mm-video/vidc/venc/test/fb_test.c b/mm-video-v4l2/vidc/venc/test/fb_test.c
index 6479a3e9..6479a3e9 100755
--- a/mm-video/vidc/venc/test/fb_test.c
+++ b/mm-video-v4l2/vidc/venc/test/fb_test.c
diff --git a/mm-video/vidc/venc/test/queue.c b/mm-video-v4l2/vidc/venc/test/queue.c
index 94756b0a..94756b0a 100755
--- a/mm-video/vidc/venc/test/queue.c
+++ b/mm-video-v4l2/vidc/venc/test/queue.c
diff --git a/mm-video/vidc/venc/test/venc_test.cpp b/mm-video-v4l2/vidc/venc/test/venc_test.cpp
index 7afb5bd9..7afb5bd9 100644
--- a/mm-video/vidc/venc/test/venc_test.cpp
+++ b/mm-video-v4l2/vidc/venc/test/venc_test.cpp
diff --git a/mm-video/vidc/venc/test/venc_util.c b/mm-video-v4l2/vidc/venc/test/venc_util.c
index 4e4688e8..4e4688e8 100755
--- a/mm-video/vidc/venc/test/venc_util.c
+++ b/mm-video-v4l2/vidc/venc/test/venc_util.c
diff --git a/mm-video/vidc/venc/test/video_encoder_test.c b/mm-video-v4l2/vidc/venc/test/video_encoder_test.c
index 567d081b..567d081b 100755
--- a/mm-video/vidc/venc/test/video_encoder_test.c
+++ b/mm-video-v4l2/vidc/venc/test/video_encoder_test.c