@sapui5/sap.ndc 1.96.21 → 1.96.23

package/src/sap/ndc/BarcodeScanner.js

@@ -3,22 +3,14 @@
  * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
-/*global cordova, EB, ImageCapture, Map */
+/*global cordova, EB, ImageCapture */
 
-// configure shim for zxing library to allow AMD-like import
+// configure shim for zxingcpp library to allow AMD-like import
 sap.ui.loader.config({
 	shim: {
-		'sap/ndc/thirdparty/ZXing': {
-			amd: true,
-			exports: 'ZXing'
-		},
 		'sap/ndc/thirdparty/zxingcpp/zxing_reader': {
 			amd: true,
 			exports: 'ZXing'
-		},
-		'sap/ndc/thirdparty/opencv/opencv_js': {
-			amd: true,
-			exports: 'cv'
 		}
 	}
 });
@@ -89,10 +81,10 @@ sap.ui.define([
 	/* Internal methods and properties							 */
 	/* =========================================================== */
 		oStream,
-		oSrc,
-		oCap,
 		oScanDialog,
 		oBarcodeVideoDOM,
+		oBarcodeCanvasDOM,
+		oContext,
 		oBarcodeOverlayDOM,
 		oBarcodeHighlightDOM,
 
@@ -159,18 +151,7 @@ sap.ui.define([
 					description: "WebAssembly build (using Emcripten) of zxing-cpp",
 					status: oScannerAPIStatus.Initial,
 					instance: null, //oZXingCPP
-					scannerAPI: null, //oZXingCPPScannerAPI
-					openCV: {
-						instance: null, //oCV
-						scannerAPI: null //oCVInstance
-					}
-				},
-				ZXing: {
-					key: "ZXing",
-					description: "ZXing",
-					status: oScannerAPIStatus.Initial,
-					instance: null, //oZXing
-					scannerAPI: null //oZXingScannerAPI
+					scannerAPI: null //oZXingCPPScannerAPI
 				}
 			},
 			bReady: true			// No scanning is in progress
@@ -194,10 +175,6 @@ sap.ui.define([
 				ZXingCPP: {
 					key: "ZXingCPP",
 					status: oScannerAPIStatus.Initial
-				},
-				ZXing: {
-					key: "ZXing",
-					status: oScannerAPIStatus.Initial
 				}
 			}
 		}).setDefaultBindingMode(BindingMode.OneWay),
@@ -216,16 +193,6 @@ sap.ui.define([
 		return oModel.getProperty("/apis/" + sScannerAPI + "/");
 	}
 
-	/**
-	 * Get the scanner API status in data model
-	 * @param {string} sScannerAPI The scanner API
-	 * @returns {string} The status of the scanner API
-	 * @private
-	 */
-	function getScannerAPIStatus(sScannerAPI) {
-		return oModel.getProperty("/apis/" + sScannerAPI + "/status");
-	}
-
 	/**
 	 * Update the scanner API in data model
 	 * @param {string} sScannerAPI The scanner API
@@ -275,17 +242,13 @@ sap.ui.define([
 	 function setScannerAPIUnAvailable(sScannerAPI) {
 		oModel.setProperty("/apis/" + sScannerAPI + "/instance", null);
 		oModel.setProperty("/apis/" + sScannerAPI + "/scannerAPI", null);
-		if (sScannerAPI === 'ZXingCPP') {
-			oModel.setProperty("/apis/ZXingCPP/openCV/instance", null);
-			oModel.setProperty("/apis/ZXingCPP/openCV/scannerAPI", null);
-		}
 		updateScannerAPI(sScannerAPI, oScannerAPIStatus.UnAvailable);
 	}
 
 	/**
 	 * Returns the current scanner API that will be used to scan.
 	 * @private
-	 * @returns {string} The Barcode Scanner API info. (e.g. ZebraEnterpriseBrowser, Cordova, ZXingCPP, ZXing or unknown)
+	 * @returns {string} The Barcode Scanner API info. (e.g. ZebraEnterpriseBrowser, Cordova, ZXingCPP or unknown)
 	 */
 	function getCurrentScannerAPI() {
 		return oModel.getProperty("/scannerAPI");
@@ -343,16 +306,15 @@ sap.ui.define([
 	}
 
 	/**
-	 * Disable the Feature APIs(ZXing, ZXingCPP)
+	 * Disable the Feature APIs(ZXingCPP)
 	 * @private
 	 */
 	function disableFeatureAPIs() {
 		// set the feature available to false since the feature flag is false
 		oModel.setProperty("/available", false);
 		oStatusModel.setProperty("/available", false);
-		setScannerAPIUnAvailable("ZXing");
 		setScannerAPIUnAvailable("ZXingCPP");
-		Log.debug("BarcodeScanner.disableFeatureAPIs: Set status of Feature scanner APIs (ZXing, ZXingCPP) to unavailable!");
+		Log.debug("BarcodeScanner.disableFeatureAPIs: Set status of Feature scanner APIs (ZXingCPP) to unavailable!");
 	}
 
 	/**
@@ -361,7 +323,7 @@ sap.ui.define([
 	 */
 	function initScannerAPIs() {
 		try {
-			// check cordova plugin, if exists, no need to check ZXingCPP or ZXing
+			// check cordova plugin, if exists, no need to check ZXingCPP
 			var oCordovaScannerAPI = cordova.plugins.barcodeScanner;
 			if (oCordovaScannerAPI) {
 				oModel.setProperty("/apis/Cordova/scannerAPI", oCordovaScannerAPI);
@@ -371,7 +333,7 @@ sap.ui.define([
 					setCurrentScannerAPI("Cordova");
 				}
 				Log.debug("BarcodeScanner.initScannerAPIs: Cordova BarcodeScanner plugin is available!");
-				// disable feature scanner APIs (ZXingCPP, ZXing)
+				// disable feature scanner APIs (ZXingCPP)
 				disableFeatureAPIs();
 			} else {
 				Log.debug("BarcodeScanner.initScannerAPIs: Cordova BarcodeScanner plugin is unavailable!");
@@ -398,61 +360,14 @@ sap.ui.define([
 		loadZXingCPPAPI();
 	}
 
-	/**
-	 * Load ZXing scanner API
-	 * @param {function} fnSuccess The callback function if load success
-	 * @param {function} fnFail The callback function if load failed
-	 * @private
-	 */
-	function loadZXingAPI(fnSuccess, fnFail) {
-		updateScannerAPI("ZXing", oScannerAPIStatus.Loading);
-		sap.ui.require([
-			"sap/ndc/thirdparty/ZXing"
-		], function (ZXing) {
-			var oZXing = ZXing;
-			if (oZXing) {
-				oModel.setProperty("/apis/ZXing/instance", ZXing);
-				var oZXingScannerAPI = new oZXing.BrowserMultiFormatReader();
-				if (oZXingScannerAPI) {
-					oModel.setProperty("/apis/ZXing/scannerAPI", oZXingScannerAPI);
-					setScannerAPIAvailable("ZXing");
-					Log.debug("BarcodeScanner.loadZXingAPI: ZXing BrowserMultiFormatReader API is available!");
-					fnSuccess();
-				} else {
-					setScannerAPIUnAvailable("ZXing");
-					Log.error("BarcodeScanner.loadZXingAPI: ZXing BrowserMultiFormatReader API is unavailable");
-					fnFail();
-				}
-			} else {
-				setScannerAPIUnAvailable("ZXing");
-				Log.error("BarcodeScanner.loadZXingAPI: ZXing API is unavailable");
-				fnFail();
-			}
-		}, function (oError) {
-			setScannerAPIUnAvailable("ZXing");
-			Log.error("BarcodeScanner.loadZXingAPI: ZXing API is unavailable.\n" + oError);
-			fnFail();
-		});
-	}
-
 	/**
 	 * Callback for Load ZXingCPP scanner API or Instances failed
 	 * @private
 	 */
 	 function loadZXingCPPFailed(sMessage) {
 		Log.error(sMessage);
-		setScannerAPIUnAvailable("ZXingCPP");
-		var sZXingStatus = getScannerAPIStatus("ZXing");
-		if (sZXingStatus === oScannerAPIStatus.UnAvailable) {
-			// set the feature available to false since both of ZXing and ZXingCPP are unavailable
-			Log.warning("BarcodeScanner.loadZXingCPPFailed: ZXing is unavailable too, no feature scanner API available now.");
-			oModel.setProperty("/available", false);
-			oStatusModel.setProperty("/available", false);
-		} else if (getCurrentScannerAPI() !== "ZebraEnterpriseBrowser"){
-			// if current scanner API is not Zebra and ZXing is not unavailable, set ZXing as current scanner API
-			Log.debug("BarcodeScanner.loadZXingCPPFailed: Zebra is not current scanner API, ZXing if NOT UnAvailable, so set ZXing as current scanner API.");
-			setCurrentScannerAPI("ZXing");
-		}
+		Log.warning("BarcodeScanner.loadZXingCPPFailed: no feature scanner API available now.");
+		disableFeatureAPIs();
 		oModel.checkUpdate(true);
 	}
 
@@ -464,11 +379,9 @@ sap.ui.define([
 		Log.info("BarcodeScanner.loadZXingCPPAPI: load ZXingCPP API");
 		updateScannerAPI("ZXingCPP", oScannerAPIStatus.Loading);
 		sap.ui.require([
-			"sap/ndc/thirdparty/zxingcpp/zxing_reader",
-			"sap/ndc/thirdparty/opencv/opencv_js"
-		], function (ZXing, cv) {
+			"sap/ndc/thirdparty/zxingcpp/zxing_reader"
+		], function (ZXing) {
 			oModel.setProperty("/apis/ZXingCPP/instance", ZXing);
-			oModel.setProperty("/apis/ZXingCPP/openCV/instance", cv);
 			if (getCurrentScannerAPI() === "unknown") {
 				// set current scanner API to ZXingCPP if Zebra is unavailable
 				setCurrentScannerAPI("ZXingCPP");
@@ -481,30 +394,38 @@ sap.ui.define([
 	}
 
 	/**
-	 * Load ZXingCPP scanner Instances.
+	 * Load ZXingCPP scanner Instance.
 	 * @param {function} fnSuccess The callback function if load success
 	 * @param {function} fnFail The callback function if load failed
 	 * @private
 	 */
-	function loadZXingCPPInstances(fnSuccess, fnFail) {
-		// since the size or opencv.wasm is about 6.5M, we need to open a busy dialog to lock the current frame/page
+	function loadZXingCPPInstance(fnSuccess, fnFail) {
+		// since the size of zxing_reader.wasm is about 1M, we need to open a busy dialog to lock the current frame/page
 		var oBusyDialog = new BusyDialog({
 			title: oResourceModel.getProperty("BARCODE_DIALOG_BUSY_TITLE"),
 			text: oResourceModel.getProperty("BARCODE_DIALOG_BUSY_TEXT_ZXINGCPP")
 		});
 		oBusyDialog.open();
 		updateScannerAPI("ZXingCPP", oScannerAPIStatus.Loading);
-		Promise.all([loadZXingCPPInstance(), loadOpenCVInstance()]).then(function() {
+		var oZXingCPPConfig = {
+			"locateFile": function(sPath, sScriptDictionary) {
+				return locateFile(sPath, sScriptDictionary, "zxingcpp");
+			}
+		};
+		var oZXingCPP = oModel.getProperty("/apis/ZXingCPP/instance");
+		oZXingCPP(oZXingCPPConfig).then(function(instance) {
+			oModel.setProperty("/apis/ZXingCPP/scannerAPI", instance);
+			Log.debug("BarcodeScanner.loadZXingCPPInstance: wasm lib instance of ZXingCPP is available!");
 			setScannerAPIAvailable("ZXingCPP");
 			if (getCurrentScannerAPI() === "unknown") {
 				// set current scanner API to ZXingCPP if Zebra is unavailable
 				setCurrentScannerAPI("ZXingCPP");
 			}
-			Log.debug("BarcodeScanner.loadZXingCPPInstances: ZXingCPP API is available!");
+			Log.debug("BarcodeScanner.loadZXingCPPInstance: ZXingCPP API is available!");
 			oBusyDialog.close();
 			fnSuccess();
-		}, function(sMessage) {
-			loadZXingCPPFailed(sMessage);
+		}, function(oError) {
+			loadZXingCPPFailed("BarcodeScanner.loadZXingCPPInstance: can not load wasm lib instance of ZXingCPP.\n" + oError);
 			oBusyDialog.close();
 			fnFail();
 		});
@@ -525,60 +446,6 @@ sap.ui.define([
 		return sScriptDictionary + sPath;
 	}
 
-	/**
-	 * Load ZXingCPP wasm file
-	 * @returns {Promise} Promise object which loads the ZXingCPP instance
-	 * @private
-	 */
-	function loadZXingCPPInstance() {
-		return new Promise(function (resolve, reject) {
-			var oZXingCPPConfig = {
-				"locateFile": function(sPath, sScriptDictionary) {
-					return locateFile(sPath, sScriptDictionary, "zxingcpp");
-				}
-			};
-			var oZXingCPP = oModel.getProperty("/apis/ZXingCPP/instance");
-			oZXingCPP(oZXingCPPConfig).then(function(instance) {
-				if (isScannerAPIUnAvailable("ZXingCPP")) {
-					Log.warning("BarcodeScanner.loadZXingCPPInstance: ZXingCPP is set to unavailable by failure of loading opencv instance!");
-				} else {
-					oModel.setProperty("/apis/ZXingCPP/scannerAPI", instance);
-					Log.debug("BarcodeScanner.loadZXingCPPInstance: wasm lib instance of ZXingCPP is available!");
-				}
-				resolve();
-			}, function(oError) {
-				reject("BarcodeScanner.loadZXingCPPInstance: can not load wasm lib instance of ZXingCPP.\n" + oError);
-			});
-		});
-	}
-
-	/**
-	 * Load opencv wasm file
-	 * @returns {Promise} Promise object which loads the OpenCV instance
-	 * @private
-	 */
-	function loadOpenCVInstance() {
-		return new Promise(function (resolve, reject) {
-			var oOpenCVConfig = {
-				"locateFile": function(sPath, sScriptDictionary) {
-					return locateFile(sPath, sScriptDictionary, "opencv");
-				}
-			};
-			var oCV = oModel.getProperty("/apis/ZXingCPP/openCV/instance");
-			oCV(oOpenCVConfig).then(function(instance) {
-				if (isScannerAPIUnAvailable("ZXingCPP")) {
-					Log.warning("BarcodeScanner.loadOpenCVInstance: ZXingCPP is set to unavailable by failure of loading zxingcpp instance!");
-				} else {
-					oModel.setProperty("/apis/ZXingCPP/openCV/scannerAPI", instance);
-					Log.debug("BarcodeScanner.loadOpenCVInstance: wasm lib instance of opencv is available!");
-				}
-				resolve();
-			}, function(oError) {
-				reject("BarcodeScanner.loadOpenCVInstance: can not load wasm lib instance of opencv.\n" + oError);
-			});
-		});
-	}
-
 	/**
 	 * Used to detect if browser support enumerate devices
 	 * @private
@@ -685,12 +552,7 @@ sap.ui.define([
 							updateDevicesInStatusModel();
 							Log.debug("BarcodeScanner.findMainCamera: the main camera is " + oCamera.deviceId);
 							oStream = stream;
-							// use ZXingCPP or ZXing to scan the barcode directly if :
-							//    current scanner API is ZXing, and ZXing is available
-							// or
-							//    current scanner API is NOT ZXing, ZXingCPP is available, and the video stream is not null
-							if ((getCurrentScannerAPI() !== "ZXing" && isScannerAPIAvailable("ZXingCPP"))
-								|| (getCurrentScannerAPI() === "ZXing" && isScannerAPIAvailable("ZXing"))) {
+							if (oStream) {
 								openBarcodeScannerDialogContains();
 							} else {
 								oScanDialog.getModel().setProperty("/isNoScanner", true);
@@ -953,7 +815,7 @@ sap.ui.define([
 		if (!oModel.getProperty("/config/preferFrontCamera")) {
 			delete oModel.getProperty("/config/defaultConstraints/video").facingMode;
 			var oDevices = oModel.getProperty("/devices");
-			if (isUserMediaAccessSupported() && !oModel.getProperty("/config/deviceId") && !oDevices.mainCamera && !Device.os.ios && oDevices.needCheck && oDevices.all.length > 1) {
+			if (!oModel.getProperty("/config/deviceId") && !oDevices.mainCamera && !Device.os.ios && oDevices.needCheck && oDevices.all.length > 1) {
 				var oCameras = oDevices.back.length > 1 ? oDevices.back : oDevices.all;
 				var sCategory = oDevices.back.length > 1 ? "back" : "all";
 				Log.debug("BarcodeScanner.openBarcodeScannerDialog: start to find the main camera in " + sCategory + " camera list.");
@@ -989,12 +851,7 @@ sap.ui.define([
 			.then(
 				function(stream) {
 					oStream = stream;
-					// use ZXingCPP or ZXing to scan the barcode if :
-					//    current scanner API is ZXing, and ZXing is available
-					// or
-					//    current scanner API is NOT ZXing, ZXingCPP is available, and the video stream is not null
-					if ((getCurrentScannerAPI() !== "ZXing" && isScannerAPIAvailable("ZXingCPP") && oStream)
-						|| (getCurrentScannerAPI() === "ZXing" && isScannerAPIAvailable("ZXing"))) {
+					if (oStream) {
 						openBarcodeScannerDialogContains();
 					} else {
 						oModel.setProperty("/scanDialog/isNoScanner", true);
@@ -1052,7 +909,7 @@ sap.ui.define([
 			oScanDialog.setModel(oResourceModel, "i18n");
 		}
 
-		if ((isScannerAPIAvailable("ZXingCPP") || isScannerAPIAvailable("ZXing")) && isUserMediaAccessSupported()) {
+		if (isScannerAPIAvailable("ZXingCPP") && isUserMediaAccessSupported()) {
 			openBarcodeScannerDialog();
 		} else {
 			if (oModel.getProperty("/available")) {
@@ -1118,42 +975,6 @@ sap.ui.define([
 			);
 	}
 
-	/**
-	 * Scan the barcode via ZXing
-	 * @private
-	 */
-	function scanWithZXing() {
-		if (checkScannerAPIStatus("ZXing", oScannerAPIStatus.Initial)) {
-			Log.debug("BarcodeScanner.scanWithZXing: ZXing is not loaded, start to load it.");
-			loadZXingAPI(function() {
-				getScanDialog();
-			}, function() {
-				if (isScannerAPIUnAvailable("ZXingCPP")) {
-					Log.warning("BarcodeScanner.scanWithZXing: ZXingCPP is unavailable too, no feature scanner API available now.");
-					// set the feature available to false since both of ZXing and ZXingCPP are unavailable
-					oModel.setProperty("/available", false);
-					oStatusModel.setProperty("/available", false);
-					Log.warning("BarcodeScanner.scanWithZXing: Set feature available to False");
-					if (isScannerAPIAvailable("ZebraEnterpriseBrowser")) {
-						setCurrentScannerAPI("ZebraEnterpriseBrowser");
-						Log.debug("BarcodeScanner.scanWithZXing: Zebra is available, set the current scanner API to Zebra.");
-					} else {
-						setCurrentScannerAPI("unknown");
-						Log.warning("BarcodeScanner.scanWithZXing: Zebra is unavailable too, set the current scanner API to unknown.");
-					}
-					getScanDialog();
-				} else {
-					// if ZXingCPP scanner API is NOT UnAvailable, set ZXingCPP as current scanner API, and use it to scan bacode.
-					setCurrentScannerAPI("ZXingCPP");
-					Log.debug("BarcodeScanner.scanWithZXing: ZXingCPP is NOT UnAvailable, switch to ZXingCPP to scan barcode.");
-					scanWithZXingCPP();
-				}
-			});
-		} else {
-			getScanDialog();
-		}
-	}
-
 	/**
 	 * Scan the barcode via ZXingCPP
 	 * @private
@@ -1161,28 +982,17 @@ sap.ui.define([
 	 function scanWithZXingCPP() {
 		if (checkScannerAPIStatus("ZXingCPP", oScannerAPIStatus.Initial)) {
 			Log.debug("BarcodeScanner.scanWithZXingCPP: ZXingCPP instances is not loaded, start to load them.");
-			loadZXingCPPInstances(function() {
+			loadZXingCPPInstance(function() {
 				getScanDialog();
 			}, function() {
-				if (isScannerAPIUnAvailable("ZXing")) {
-					Log.warning("BarcodeScanner.scanWithZXingCPP: ZXing is unavailable too, no feature scanner API available now.");
-					// set the feature available to false since both of ZXing and ZXingCPP are unavailable
-					oModel.setProperty("/available", false);
-					oStatusModel.setProperty("/available", false);
-					Log.warning("BarcodeScanner.scanWithZXingCPP: Set feature available to False");
-					if (isScannerAPIAvailable("ZebraEnterpriseBrowser")) {
-						setCurrentScannerAPI("ZebraEnterpriseBrowser");
-						Log.debug("BarcodeScanner.scanWithZXingCPP: Zebra is available, set the current scanner API to Zebra.");
-					} else {
-						setCurrentScannerAPI("unknown");
-						Log.warning("BarcodeScanner.scanWithZXingCPP: Zebra is unavailable too, set the current scanner API to unknown.");
-					}
-					getScanDialog();
+				if (isScannerAPIAvailable("ZebraEnterpriseBrowser")) {
+					setCurrentScannerAPI("ZebraEnterpriseBrowser");
+					Log.debug("BarcodeScanner.scanWithZXingCPP: Zebra is available, set the current scanner API to Zebra.");
 				} else {
-					// if ZXing scanner API is NOT UnAvailable, use ZXing to scan the barcode.
-					Log.debug("BarcodeScanner.scanWithZXingCPP: ZXing is NOT UnAvailable, switch to ZXing to scan barcode.");
-					scanWithZXing();
+					setCurrentScannerAPI("unknown");
+					Log.warning("BarcodeScanner.scanWithZXingCPP: Zebra is unavailable too, set the current scanner API to unknown.");
 				}
+				getScanDialog();
 			});
 		} else {
 			getScanDialog();
@@ -1195,65 +1005,48 @@ sap.ui.define([
 	 */
 	function openBarcodeScannerDialogContains() {
 		var oBarcodeScannerUIContainer;
-		if (getCurrentScannerAPI() !== "ZXing") {
-			Log.debug("BarcodeScanner.openBarcodeScannerDialogContains: Use ZXingCPP to read the barcode.");
-			oScanDialog.attachAfterOpen(function() {
-				// Dev note: if video element dom reference is unavailable at this point (console exception)
-				// some error happened during dialog creation and may not be directly related to video element
-				oScanDialog.getEndButton().setEnabled(true);
-				oScanDialog.setBusy(false);
-
-				if (!oBarcodeHighlightDOM) {
-					oBarcodeHighlightDOM = oBarcodeScannerUIContainer.getDomRef('highlight');
-				}
-				if (!oBarcodeVideoDOM) {
-					oBarcodeVideoDOM = oBarcodeScannerUIContainer ? oBarcodeScannerUIContainer.getDomRef('video') : undefined;
-				}
-				try {
-					oBarcodeVideoDOM.srcObject = oStream;
-					oBarcodeVideoDOM
-					.play()
-					.then(function() {
-						if (!oSrc) {
-							oBarcodeVideoDOM.width = oBarcodeVideoDOM.videoWidth;
-							oBarcodeVideoDOM.height = oBarcodeVideoDOM.videoHeight;
-							var oCVInstance = oModel.getProperty("/apis/ZXingCPP/openCV/scannerAPI");
-							oSrc = new oCVInstance.Mat(oBarcodeVideoDOM.videoHeight, oBarcodeVideoDOM.videoWidth, oCVInstance.CV_8UC4);
-							oCap = new oCVInstance.VideoCapture(oBarcodeVideoDOM);
-						}
-						decodeWithZXingCPP();
-					});
-				} catch (err) {
-					Log.debug("BarcodeScanner.openBarcodeScannerDialogContains is failed. error: " + err);
-				}
-			});
-		} else {
-			Log.debug("BarcodeScanner.openBarcodeScannerDialogContains: Use zxing to read the barcode.");
-			if (Device.os.ios && Device.os.versionStr.split('.')[0] === '16' && oStream) {
-				// When decoding QR-code by iPhone (iOS 16), this stream will clash with another stream from ZXing-js.
-				var videoTrack = typeof oStream.stop === "function" ? oStream : oStream.getTracks()[0];
-				videoTrack.stop();
+		Log.debug("BarcodeScanner.openBarcodeScannerDialogContains: Use ZXingCPP to read the barcode.");
+		oScanDialog.attachAfterOpen(function() {
+			// Dev note: if video element dom reference is unavailable at this point (console exception)
+			// some error happened during dialog creation and may not be directly related to video element
+			oScanDialog.getEndButton().setEnabled(true);
+			oScanDialog.setBusy(false);
+
+			if (!oBarcodeHighlightDOM) {
+				oBarcodeHighlightDOM = oBarcodeScannerUIContainer.getDomRef('highlight');
 			}
-			oScanDialog.attachAfterOpen(function() {
-				// Dev note: if video element dom reference is unavailable at this point (console exception)
-				// some error happened during dialog creation and may not be directly related to video element
-				oScanDialog.getEndButton().setEnabled(true);
-				oScanDialog.setBusy(false);
-
-				if (!oBarcodeHighlightDOM) {
-					oBarcodeHighlightDOM = oBarcodeScannerUIContainer ? oBarcodeScannerUIContainer.getDomRef('highlight') : undefined;
+			if (!oBarcodeVideoDOM) {
+				oBarcodeVideoDOM = oBarcodeScannerUIContainer ? document.createElement("video") : undefined;
+				if (oBarcodeVideoDOM) {
+					oBarcodeVideoDOM.setAttribute("id", "video");
+					oBarcodeVideoDOM.setAttribute("autoplay", "autoplay");
+					oBarcodeVideoDOM.setAttribute("webkit-playsinline", "webkit-playsinline");
+					oBarcodeVideoDOM.setAttribute("playsinline", "playsinline");
 				}
-				if (!oBarcodeVideoDOM) {
-					oBarcodeVideoDOM = oBarcodeScannerUIContainer ? oBarcodeScannerUIContainer.getDomRef('video') : undefined;
-				}
-				decodeWithZXing();
-			});
-		}
+			}
+			if (!oBarcodeCanvasDOM) {
+				oBarcodeCanvasDOM = oBarcodeScannerUIContainer ? oBarcodeScannerUIContainer.getDomRef('canvas') : undefined;
+				oContext = oBarcodeCanvasDOM.getContext("2d", { willReadFrequently: true });
+			}
+			try {
+				oBarcodeVideoDOM.srcObject = oStream;
+				oBarcodeVideoDOM.play().then(function() {
+					oBarcodeCanvasDOM.width = oBarcodeVideoDOM.videoWidth;
+					oBarcodeCanvasDOM.height = oBarcodeVideoDOM.videoHeight;
+					decodeWithZXingCPP();
+				});
+			} catch (err) {
+				Log.debug("BarcodeScanner.openBarcodeScannerDialogContains is failed. error: " + err);
+			}
+		});
 		oScanDialog.destroyContent();
 		oBarcodeHighlightDOM = undefined;
 		oBarcodeOverlayDOM = undefined;
 		oBarcodeVideoDOM = undefined;
 
+		oBarcodeCanvasDOM = undefined;
+		oContext = undefined;
+
 		oBarcodeScannerUIContainer = new BarcodeScannerUIContainer();
 		oScanDialog.addContent(oBarcodeScannerUIContainer);
 
@@ -1271,20 +1064,18 @@ sap.ui.define([
 	 * @private
 	 */
 	function decodeWithZXingCPP() {
-		if (!oBarcodeVideoDOM.srcObject && oSrc) {
-			oSrc.delete();
+		if (!oBarcodeVideoDOM || !oBarcodeVideoDOM.srcObject) {
 			return;
 		}
-		scanFrame(oBarcodeVideoDOM);
-		var oData;
-		try {
-			oCap.read(oSrc);
-			oData = oSrc.data;
-		} catch (err) {
-			Log.info("BarcodeScanner.decodeWithZXingCPP: cap.read error: " + err);
-		}
+		scanFrame();
 
 		try {
+			oContext.drawImage(oBarcodeVideoDOM, 0, 0, oBarcodeCanvasDOM.width, oBarcodeCanvasDOM.height);
+
+			var imgWidth = oBarcodeCanvasDOM.width;
+			var imgHeight = oBarcodeCanvasDOM.height;
+			var imageData = oBarcodeCanvasDOM.getContext('2d').getImageData(0, 0, imgWidth, imgHeight);
+			var oData = imageData.data;
 			var buffer;
 			var oZXingCPPScannerAPI = oModel.getProperty("/apis/ZXingCPP/scannerAPI");
 			try {
@@ -1293,12 +1084,11 @@ sap.ui.define([
 			} catch (err) {
 				Log.info("BarcodeScanner.decodeWithZXingCPP: zxing.HEAPU8 error: " + err);
 			}
-			var width = oSrc.cols;
-			var height = oSrc.rows;
-			var result;
-			result = oZXingCPPScannerAPI.readBarcodeFromPixmap(buffer, width,height, true, "");
+			var results = oZXingCPPScannerAPI.readBarcodesFromPixmap(buffer, imgWidth, imgHeight, true, "", 1);
 			oZXingCPPScannerAPI._free(buffer);
-			if (result.format) {
+			var iSize = results.size();
+			if (iSize > 0 && results.get(0).format) {
+				var result = results.get(0);
 				highlightResult(result);
 				if (result.cancelled === "false" || !result.cancelled) {
 					result.cancelled = false;
@@ -1328,56 +1118,6 @@ sap.ui.define([
 		}
 	}
 
-	/**
-	 * Decode the barcode via ZXing scanner API
-	 * @private
-	 */
-	function decodeWithZXing() {
-		var hints = new Map();
-		var oZXing = oModel.getProperty("/apis/ZXing/instance");
-		hints.set(oZXing.DecodeHintType.ASSUME_GS1, true);
-		var oZXingScannerAPI = oModel.getProperty("/apis/ZXing/scannerAPI");
-		oZXingScannerAPI.reader.setHints(hints);
-
-		var callBackHandler = function (result, err) {
-			scanFrame(oBarcodeVideoDOM);
-			if (result) {
-				highlightResult(result);
-				if (result.cancelled === "false" || !result.cancelled) {
-					result.cancelled = false;
-					var onFnSuccess = oModel.getProperty("/callBackHandler/onFnSuccess");
-					if (typeof onFnSuccess === "function") {
-						result.scanningTime = "unknown";
-						if (oModel.getProperty("/scanDialog/scanningStartTime") > 0) {
-							var scanningStopTime = Date.now();
-							result.scanningTime = scanningStopTime - oModel.getProperty("/scanDialog/scanningStartTime");
-						}
-						if (!oModel.getProperty("/config/enableGS1Header") && result.text.indexOf("]C1") === 0) {
-							// Remove the prefix from GS1-128 barcode result of ZXing-js
-							result.text = result.text.split("]C1")[1];
-						}
-						onFnSuccess(result);
-					}
-					BarcodeScanner.closeScanDialog();
-				}
-			} else if (oBarcodeHighlightDOM && oModel.getProperty("/scanDialog/barcodeOverlaySetup")) {
-				hideHightLight();
-			}
-
-			if (err && oZXing && !(err instanceof oZXing.NotFoundException)) {
-				Log.warning("BarcodeScanner.decodeWithZXing: Started continuous decode failed.");
-				var onFnFail = oModel.getProperty("/callBackHandler/onFnFail");
-				if (typeof onFnFail === "function") {
-					onFnFail(err);
-					oModel.setProperty("/scanDialog/isNoScanner", true);
-					openBarcodeInputDialog();
-				}
-			}
-		};
-
-		oZXingScannerAPI.decodeFromConstraints(oModel.getProperty("/config/defaultConstraints"), oBarcodeVideoDOM.id, callBackHandler);
-	}
-
 	/**
 	 * Highlight the scan result area
 	 * @param {object} result The scan result object
@@ -1397,8 +1137,8 @@ sap.ui.define([
 		}
 
 		if (oBarcodeHighlightDOM) {
-			scaleX = oBarcodeVideoDOM.clientWidth / oBarcodeVideoDOM.videoWidth;
-			scaleY = oBarcodeVideoDOM.clientHeight / oBarcodeVideoDOM.videoHeight;
+			scaleX = oBarcodeCanvasDOM.clientWidth / oBarcodeVideoDOM.videoWidth;
+			scaleY = oBarcodeCanvasDOM.clientHeight / oBarcodeVideoDOM.videoHeight;
 			if (result.position) {
 				result.resultPoints = [
 					result.position.topLeft,
@@ -1448,8 +1188,8 @@ sap.ui.define([
 		oBarcodeHighlightDOM.style.height = '0';
 	}
 
-	function scanFrame(video) {
-		if (!oScanDialog || !video || !video.videoHeight || !video.videoWidth) {
+	function scanFrame() {
+		if (!oScanDialog || !oBarcodeCanvasDOM) {
 			return;
 		}
 		var iInactiveZonePercent = 0.15;
@@ -1459,11 +1199,11 @@ sap.ui.define([
 			oBarcodeOverlayDOM = oBarcodeScannerUIContainer.getDomRef('overlay');
 		}
 
-		updateZoom(video);
+		updateZoom();
 
 		if (oBarcodeOverlayDOM) {
-			var oBarcodeOverlayWidthTemp = video.clientWidth * (1 - 2 * iInactiveZonePercent);
-			var oBarcodeOverlayHeightTemp = video.clientHeight * (1 - 2 * iInactiveZonePercent);
+			var oBarcodeOverlayWidthTemp = oBarcodeCanvasDOM.clientWidth * (1 - 2 * iInactiveZonePercent);
+			var oBarcodeOverlayHeightTemp = oBarcodeCanvasDOM.clientHeight * (1 - 2 * iInactiveZonePercent);
 
 			if (oBarcodeOverlayWidthTemp <= oBarcodeOverlayHeightTemp) {
 				oBarcodeOverlayHeightTemp = oBarcodeOverlayWidthTemp * (1 - 2 * iInactiveZonePercent);
@@ -1477,14 +1217,14 @@ sap.ui.define([
 
 				oBarcodeOverlayDOM.style.width = oBarcodeOverlayWidthTemp + 'px';
 				oBarcodeOverlayDOM.style.height = oBarcodeOverlayHeightTemp + 'px';
-				oBarcodeOverlayDOM.style.borderWidth = (video.clientHeight - oBarcodeOverlayHeightTemp) / 2 + 'px ' + (video.clientWidth - oBarcodeOverlayWidthTemp) / 2 + 'px';
+				oBarcodeOverlayDOM.style.borderWidth = (oBarcodeCanvasDOM.clientHeight - oBarcodeOverlayHeightTemp) / 2 + 'px ' + (oBarcodeCanvasDOM.clientWidth - oBarcodeOverlayWidthTemp) / 2 + 'px';
 			}
 		}
 	}
 
-	function updateZoom(video) {
-		if (oModel.getProperty("/config/zoom") !== "skipUpdateZoom" && video) {
-			var videoTrack = video.srcObject.getVideoTracks();
+	function updateZoom() {
+		if (oModel.getProperty("/config/zoom") !== "skipUpdateZoom" && oBarcodeVideoDOM) {
+			var videoTrack = oBarcodeVideoDOM.srcObject.getVideoTracks();
 			var oSupport = window.navigator.mediaDevices.getSupportedConstraints();
 			var capabilities = videoTrack[0].getCapabilities();
 			// Verify the permission about updating zoom
@@ -1538,22 +1278,11 @@ sap.ui.define([
 	}
 
 	function closeScannerContain() {
-		if (getCurrentScannerAPI() === "ZXing" && isScannerAPIAvailable("ZXing")) {
-			var oZXingScannerAPI =  oModel.getProperty("/apis/ZXing/scannerAPI");
-			oZXingScannerAPI.reset();
-			oZXingScannerAPI.stopContinuousDecode();
-			oZXingScannerAPI.reader.reset();
-		}
 		if (oStream) {
 			var videoTrack = typeof oStream.stop === "function" ? oStream : oStream.getTracks()[0];
 			videoTrack.stop();
 			oStream = undefined;
 		}
-		if (oSrc) {
-			oSrc.delete();
-			oSrc = undefined;
-		}
-		oCap = undefined;
 	}
 
 	function zebraEBScanEnable() {
@@ -1732,8 +1461,6 @@ sap.ui.define([
 			scanWithZebra();
 		} else if (isScannerAPIAvailable("Cordova")) {
 			scanWithCordova();
-		} else if (getCurrentScannerAPI() === "ZXing") {
-			scanWithZXing();
 		} else {
 			scanWithZXingCPP();
 		}
@@ -1776,10 +1503,6 @@ sap.ui.define([
 	 *			{
 	 *				key: "ZXingCPP",
 	 *				status: "Available"
-	 *			},
-	 *			{
-	 *				key: "ZXing",
-	 *				status: "Initial"
 	 *			}
 	 *		]
 	 *	}
@@ -1804,7 +1527,7 @@ sap.ui.define([
 	/**
 	 * Returns the scanner API info that will be used to scan the barcode.
 	 *
-	 * @returns {string} The Barcode Scanner API info. (e.g. ZebraEnterpriseBrowser, Cordova, ZXingCPP, ZXing or unknown)
+	 * @returns {string} The Barcode Scanner API info. (e.g. ZebraEnterpriseBrowser, Cordova, ZXingCPP or unknown)
 	 * @public
 	 * @static
 	 */
@@ -1816,10 +1539,10 @@ sap.ui.define([
 	/**
 	 * Set the scanner API info that will be used to scan the barcode.
 	 *
-	 * IMPORTANT: The status of the scanner API must be <strong>"Available"</strong>(for ZXingCPP and ZXing, status is <strong>NOT "UnAvailable"</strong>), or will return False. Scanner APIs with status value can be got by using {@link #getStatusModel}.
-	 * By default, Barcode Scanner will select the scanner API(Available) with priority: ZebraEnterpriseBrowser > Cordova > ZXingCPP > ZXing.
+	 * IMPORTANT: The status of the scanner API must be <strong>"Available"</strong>(for ZXingCPP, status is <strong>NOT "UnAvailable"</strong>), or will return False. Scanner APIs with status value can be got by using {@link #getStatusModel}.
+	 * By default, Barcode Scanner will select the scanner API(Available) with priority: ZebraEnterpriseBrowser > Cordova > ZXingCPP.
 	 *
-	 * @param {string} [scannerAPI] Defines the scanner API to scan the barcode. Scanner API can be "ZebraEnterpriseBrowser", "Cordova", "ZXingCPP" or "ZXing".
+	 * @param {string} [scannerAPI] Defines the scanner API to scan the barcode. Scanner API can be "ZebraEnterpriseBrowser", "Cordova", "ZXingCPP".
 	 * @returns {boolean} Return True if set success.
 	 * @public
 	 * @static
@@ -1835,7 +1558,7 @@ sap.ui.define([
 			if (!oScannerAPI) {
 				Log.error("BarcodeScanner.scan: The scanner API '" + scannerAPI + "' doesn't exist, will use current scanner API '" + oModel.getProperty("/apis/" + getCurrentScannerAPI() + "/description") + "' to scan the barcode.");
 				return false;
-			} else if (scannerAPI === "ZXing" || scannerAPI === "ZXingCPP") {
+			} else if (scannerAPI === "ZXingCPP") {
 				if (isScannerAPIUnAvailable(scannerAPI)) {
 					Log.error("BarcodeScanner.scan: The scanner API '" + scannerAPI + "' is unavailable, will use current scanner API '" + oModel.getProperty("/apis/" + getCurrentScannerAPI() + "/description") + "' to scan the barcode.");
 					return false;