mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 18:29:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renaming class name and some method name

Browse source
This commit is contained in:
Erwan Croze 2016-06-28 09:31:14 +02:00
parent e0c204fb2b
commit 7ab235c55a
4 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/common/org/linphone/core/OpenH264HelperAction.java → java/common/org/linphone/core/OpenH264DownloadHelperAction.java
View file

@ -1,5 +1,5 @@
package org.linphone.core;
public interface OpenH264HelperAction {
public interface OpenH264DownloadHelperAction {
void startDownload();
}

4
java/common/org/linphone/core/OpenH264HelperListener.java → java/common/org/linphone/core/OpenH264DownloadHelperListener.java
View file

@ -1,6 +1,6 @@
package org.linphone.core;
public interface OpenH264HelperListener {
public interface OpenH264DownloadHelperListener {
/**
* Called at the beginning of download with current < max Called
* at each iteration of download Called at the ending of download
@ -14,5 +14,5 @@ public interface OpenH264HelperListener {
* Called when we failed to download codec
* @param error: Error message
*/
void OnDownloadFailure(String error);
void OnError(String error);
}

5
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -25,7 +25,7 @@ import java.util.List;
import org.linphone.LinphoneService;
import org.linphone.mediastream.MediastreamerAndroidContext;
import org.linphone.mediastream.Version;
import org.linphone.tools.OpenH264Helper;
import org.linphone.tools.OpenH264DownloadHelper;
public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
@ -110,7 +110,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
String userConfig, String factoryConfig, Object userdata, Object context)
throws LinphoneCoreException {
try {
if(context!=null) loadOptionalLibraryWithPath(((android.content.Context)context).getFilesDir() + "/" + OpenH264Helper.getNameLib());
OpenH264DownloadHelper downloadHelper = new OpenH264DownloadHelper();
if(context!=null) loadOptionalLibraryWithPath(((android.content.Context)context).getFilesDir() + "/" + downloadHelper.getNameLib());
MediastreamerAndroidContext.setContext(context);
File user = userConfig == null ? null : new File(userConfig);
File factory = factoryConfig == null ? null : new File(factoryConfig);

73
java/impl/org/linphone/tools/OpenH264Helper.java → java/impl/org/linphone/tools/OpenH264DownloadHelper.java
View file

@ -29,21 +29,21 @@ import java.net.URL;
import java.util.ArrayList;
import org.apache.commons.compress.compressors.bzip2.*;
import org.linphone.core.OpenH264HelperAction;
import org.linphone.core.OpenH264HelperListener;
import org.linphone.core.OpenH264DownloadHelperListener;
import org.linphone.core.OpenH264DownloadHelperAction;
/**
* @author Erwan Croze
*/
public class OpenH264Helper {
private OpenH264HelperListener openH264HelperListener;
private OpenH264HelperAction openH264HelperAction;
public class OpenH264DownloadHelper {
private OpenH264DownloadHelperListener openH264DownloadHelperListener;
private OpenH264DownloadHelperAction openH264DownloadHelperAction;
private ArrayList<Object> userData;
private static String fileDirection = null;
private static String nameLib;
private static String urlDownload;
private static String nameFileDownload;
private static String licenseMessage = "OpenH264 Video Codec provided by Cisco Systems, Inc.";
private String fileDirection = null;
private String nameLib;
private String urlDownload;
private String nameFileDownload;
private String licenseMessage;
/**
* Default values
@ -51,41 +51,42 @@ public class OpenH264Helper {
* urlDownload = "http://ciscobinary.openh264.org/libopenh264-1.5.0-android19.so.bz2"
* nameFileDownload = "libopenh264-1.5.0-android19.so.bz2"
*/
public OpenH264Helper() {
public OpenH264DownloadHelper() {
userData = new ArrayList<Object>();
licenseMessage = "OpenH264 Video Codec provided by Cisco Systems, Inc.";
nameLib = "libopenh264-1.5.so";
urlDownload = "http://ciscobinary.openh264.org/libopenh264-1.5.0-android19.so.bz2";
nameFileDownload = "libopenh264-1.5.0-android19.so.bz2";
}
/**
* Set OpenH264HelperListener
* Set OpenH264DownloadHelperListener
* @param h264Listener
*/
public void setOpenH264HelperListener(OpenH264HelperListener h264Listener) {
openH264HelperListener = h264Listener;
public void setOpenH264HelperListener(OpenH264DownloadHelperListener h264Listener) {
openH264DownloadHelperListener = h264Listener;
}
/**
* Set OpenH264HelperAction
* Set OpenH264DownloadHelperAction
* @param h264Action
*/
public void setOpenH264HelperAction(OpenH264HelperAction h264Action) {
openH264HelperAction = h264Action;
public void setOpenH264HelperAction(OpenH264DownloadHelperAction h264Action) {
openH264DownloadHelperAction = h264Action;
}
/**
* @return OpenH264HelperAction
* @return OpenH264DownloadHelperAction
*/
public OpenH264HelperAction getOpenH264HelperAction() {
return openH264HelperAction;
public OpenH264DownloadHelperAction getOpenH264DownloadHelperAction() {
return openH264DownloadHelperAction;
}
/**
* @return OpenH264HelperListener
* @return OpenH264DownloadHelperListener
*/
public OpenH264HelperListener getOpenH264HelperListener() {
return openH264HelperListener;
public OpenH264DownloadHelperListener getOpenH264DownloadHelperListener() {
return openH264DownloadHelperListener;
}
/**
@ -128,7 +129,7 @@ public class OpenH264Helper {
/**
* @return OpenH264 license message
*/
static public String getLicenseMessage() {
public String getLicenseMessage() {
return licenseMessage;
}
@ -136,20 +137,20 @@ public class OpenH264Helper {
* Set path for file storage
* @param path
*/
static public void setFileDirection(String path) { fileDirection = path; }
public void setFileDirection(String path) { fileDirection = path; }
/**
* Set filename to storage for OpenH264 codec
* @param name
*/
static public void setNameLib(String name) {
public void setNameLib(String name) {
nameLib = name;
}
/**
* @return filename of OpenH264 codec
*/
static public String getNameLib() {
public String getNameLib() {
return nameLib;
}
@ -157,7 +158,7 @@ public class OpenH264Helper {
* Set name download file
* @param name : must be the same name relative to the url
*/
static public void setNameFileDownload(String name) {
public void setNameFileDownload(String name) {
nameFileDownload = name;
}
@ -165,7 +166,7 @@ public class OpenH264Helper {
* Set new url
* @param url : must be a Cisco Url to OpenH264 and .bzip2 file
*/
static public void setUrlDownload(String url) {
public void setUrlDownload(String url) {
urlDownload = url;
}
@ -174,7 +175,7 @@ public class OpenH264Helper {
* Requirements : fileDirection and nameLib init
* @return file exists ?
*/
static public boolean codecExist() {
public boolean isCodecFound() {
return new File(fileDirection+"/" + nameLib).exists();
}
@ -198,7 +199,7 @@ public class OpenH264Helper {
URL url = new URL(urlDownload);
HttpURLConnection urlConnection = (HttpURLConnection)url.openConnection();
urlConnection.connect();
openH264HelperListener.OnProgress(0,10);
openH264DownloadHelperListener.OnProgress(0,10);
InputStream inputStream = urlConnection.getInputStream();
FileOutputStream fileOutputStream = new FileOutputStream(fileDirection+"/"+nameFileDownload);
@ -207,11 +208,11 @@ public class OpenH264Helper {
byte[] buffer = new byte[4096];
int bufferLength;
int total = 0;
openH264HelperListener.OnProgress(total, totalSize);
openH264DownloadHelperListener.OnProgress(total, totalSize);
while((bufferLength = inputStream.read(buffer))>0 ){
total += bufferLength;
fileOutputStream.write(buffer, 0, bufferLength);
openH264HelperListener.OnProgress(total, totalSize);
openH264DownloadHelperListener.OnProgress(total, totalSize);
}
fileOutputStream.close();
@ -229,11 +230,11 @@ public class OpenH264Helper {
bzIn.close();
new File(fileDirection+"/"+nameFileDownload).delete();
openH264HelperListener.OnProgress(2,1);
openH264DownloadHelperListener.OnProgress(2,1);
} catch (FileNotFoundException e) {
openH264HelperListener.OnDownloadFailure(e.getLocalizedMessage());
openH264DownloadHelperListener.OnError(e.getLocalizedMessage());
} catch (IOException e) {
openH264HelperListener.OnDownloadFailure(e.getLocalizedMessage());
openH264DownloadHelperListener.OnError(e.getLocalizedMessage());
}
}
});