ref: 84ff16c0156e71de20af1cf149f26e3433213174
parent: bd8d97dddbb2a86e506d060788cd662ded2a2aa4
parent: 655d9c5dbfafd4f1f5bb0a03ccd32728932d68aa
author: volvet <[email protected]>
date: Fri Apr 25 14:18:11 EDT 2014
Merge pull request #749 from mstorsjo/dos-newlines Remove dos newlines in the android java code
--- a/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
+++ b/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
@@ -1,117 +1,117 @@
-package com.wels.dec;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-
-import android.widget.Button;
-import android.widget.TextView;
-import java.io.*;
-import java.util.Vector;
-
-public class WelsDecTest extends Activity {
- /** Called when the activity is first created. */
- private OnClickListener OnClickEvent;
- private Button mBtnLoad, mBtnStartSW;
-
- final String mStreamPath = "/sdcard/wels-seq/";
- Vector<String> mStreamFiles = new Vector<String>();
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- final TextView tv = new TextView(this);
- System.out.println("Here we go ...");
- Log.i(TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
- setContentView(R.layout.main);
-
- mBtnLoad = (Button)findViewById(R.id.cfg);
- mBtnStartSW = (Button)findViewById(R.id.buttonSW);
-
- OnClickEvent = new OnClickListener()
- {
- public void onClick(View v)
- {
- switch(v.getId())
- {
- case R.id.cfg:
- {
- String cfgFile = mStreamPath + "BitStreams.txt";
- try {
- BufferedReader bufferedReader = new BufferedReader(new FileReader(cfgFile));
- String text;
- while((text = bufferedReader.readLine()) != null) {
- mStreamFiles.add(mStreamPath + text);
- Log.i(TAG, mStreamPath + text);
- }
- bufferedReader.close();
- } catch(IOException e) {
- Log.e("WELS_DEC", e.getMessage());
- }
- }
- break;
- case R.id.buttonSW:
- {
- System.out.println("decode sequence number = " + mStreamFiles.size());
- Log.i("WSE_DEC","after click");
- try {
- for (int k=0; k < mStreamFiles.size(); k++) {
- String inFile = mStreamFiles.get(k);
- String outFile = mStreamFiles.get(k) + ".yuv";
- Log.i(TAG, "input file:" + inFile+ " output file:" + outFile);
- DoDecoderTest(inFile, outFile);
- }
- } catch (Exception e) {
- Log.e(TAG, e.getMessage());
- }
- mStreamFiles.clear();
- tv.setText( "Decoder is completed!" );
- }
- break;
- }
- }
- };
-
- mBtnLoad.setOnClickListener(OnClickEvent);
- mBtnStartSW.setOnClickListener(OnClickEvent);
-
- System.out.println("Done!");
- }
-
- @Override
- public void onStart()
- {
- Log.i("WSE_DEC","welsdecdemo onStart");
- super.onStart();
- }
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
- return true;
- default:
- return super.onKeyDown(keyCode, event);
- }
- }
-
- public native void DoDecoderTest(String infilename, String outfilename);
- private static final String TAG = "welsdec";
- static {
- try {
- System.loadLibrary("wels");
- System.loadLibrary("stlport_shared");
- System.loadLibrary("welsdecdemo");
- Log.v(TAG, "Load libwelsdec successful");
- }
- catch(Exception e) {
- Log.e(TAG, "Failed to load welsdec"+e.getMessage());
- }
- }
-}
-
+package com.wels.dec;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import android.widget.Button;
+import android.widget.TextView;
+import java.io.*;
+import java.util.Vector;
+
+public class WelsDecTest extends Activity {+ /** Called when the activity is first created. */
+ private OnClickListener OnClickEvent;
+ private Button mBtnLoad, mBtnStartSW;
+
+ final String mStreamPath = "/sdcard/wels-seq/";
+ Vector<String> mStreamFiles = new Vector<String>();
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {+ super.onCreate(savedInstanceState);
+ final TextView tv = new TextView(this);
+ System.out.println("Here we go ...");+ Log.i(TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
+ setContentView(R.layout.main);
+
+ mBtnLoad = (Button)findViewById(R.id.cfg);
+ mBtnStartSW = (Button)findViewById(R.id.buttonSW);
+
+ OnClickEvent = new OnClickListener()
+ {+ public void onClick(View v)
+ {+ switch(v.getId())
+ {+ case R.id.cfg:
+ {+ String cfgFile = mStreamPath + "BitStreams.txt";
+ try {+ BufferedReader bufferedReader = new BufferedReader(new FileReader(cfgFile));
+ String text;
+ while((text = bufferedReader.readLine()) != null) {+ mStreamFiles.add(mStreamPath + text);
+ Log.i(TAG, mStreamPath + text);
+ }
+ bufferedReader.close();
+ } catch(IOException e) {+ Log.e("WELS_DEC", e.getMessage());+ }
+ }
+ break;
+ case R.id.buttonSW:
+ {+ System.out.println("decode sequence number = " + mStreamFiles.size());+ Log.i("WSE_DEC","after click");+ try {+ for (int k=0; k < mStreamFiles.size(); k++) {+ String inFile = mStreamFiles.get(k);
+ String outFile = mStreamFiles.get(k) + ".yuv";
+ Log.i(TAG, "input file:" + inFile+ " output file:" + outFile);
+ DoDecoderTest(inFile, outFile);
+ }
+ } catch (Exception e) {+ Log.e(TAG, e.getMessage());
+ }
+ mStreamFiles.clear();
+ tv.setText( "Decoder is completed!" );
+ }
+ break;
+ }
+ }
+ };
+
+ mBtnLoad.setOnClickListener(OnClickEvent);
+ mBtnStartSW.setOnClickListener(OnClickEvent);
+
+ System.out.println("Done!");+ }
+
+ @Override
+ public void onStart()
+ {+ Log.i("WSE_DEC","welsdecdemo onStart");+ super.onStart();
+ }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {+ switch (keyCode) {+ case KeyEvent.KEYCODE_BACK:
+ return true;
+ default:
+ return super.onKeyDown(keyCode, event);
+ }
+ }
+
+ public native void DoDecoderTest(String infilename, String outfilename);
+ private static final String TAG = "welsdec";
+ static {+ try {+ System.loadLibrary("wels");+ System.loadLibrary("stlport_shared");+ System.loadLibrary("welsdecdemo");+ Log.v(TAG, "Load libwelsdec successful");
+ }
+ catch(Exception e) {+ Log.e(TAG, "Failed to load welsdec"+e.getMessage());
+ }
+ }
+}
+
--- a/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
+++ b/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
@@ -1,118 +1,118 @@
-package com.wels.enc;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-
-import android.widget.Button;
-import android.widget.TextView;
-import java.io.*;
-import java.util.Vector;
-
-public class WelsEncTest extends Activity {
- /** Called when the activity is first created. */
- private OnClickListener OnClickEvent;
- private Button mBtnLoad, mBtnStartSW;
-
- final String mStreamPath = "/sdcard/wels-seq/";
- Vector<String> mCfgFiles = new Vector<String>();
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- final TextView tv = new TextView(this);
- System.out.println("Here we go ...");
- Log.i(TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
- setContentView(R.layout.main);
-
- mBtnLoad = (Button)findViewById(R.id.cfg);
- mBtnStartSW = (Button)findViewById(R.id.buttonSW);
-
-
- OnClickEvent = new OnClickListener()
- {
- public void onClick(View v)
- {
- switch(v.getId())
- {
- case R.id.cfg:
- {
- String cfgFile = mStreamPath + "cfgs.txt";
- try {
- BufferedReader bufferedReader = new BufferedReader(new FileReader(cfgFile));
- String text;
- while((text = bufferedReader.readLine()) != null) {
- mCfgFiles.add(mStreamPath + text);
- Log.i(TAG, mStreamPath + text);
- }
- bufferedReader.close();
- } catch(IOException e) {
- Log.e(TAG, e.getMessage());
- }
- }
- break;
- case R.id.buttonSW:
- {
- System.out.println("decode sequence number = " + mCfgFiles.size());
- Log.i(TAG,"after click");
- try {
- for (int k=0; k < mCfgFiles.size(); k++) {
- String cfgFile = mCfgFiles.get(k);
- DoEncoderTest(cfgFile);
- }
- } catch (Exception e) {
- Log.e(TAG, e.getMessage());
- }
- mCfgFiles.clear();
- tv.setText( "Decoder is completed!" );
- }
- break;
- }
- }
- };
-
- mBtnLoad.setOnClickListener(OnClickEvent);
- mBtnStartSW.setOnClickListener(OnClickEvent);
-
- System.out.println("Done!");
- }
-
- @Override
- public void onStart()
- {
- Log.i(TAG,"welsdecdemo onStart");
- super.onStart();
- }
-
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
- return true;
- default:
- return super.onKeyDown(keyCode, event);
- }
- }
-
- public native void DoEncoderTest(String cfgFileName);
- private static final String TAG = "welsenc";
- static {
- try {
- System.loadLibrary("wels");
- System.loadLibrary("stlport_shared");
- System.loadLibrary("welsencdemo");
- Log.v(TAG, "Load libwelsencdemo.so successful");
- }
- catch(Exception e) {
- Log.e(TAG, "Failed to load welsdec"+e.getMessage());
- }
- }
-
-}
-
+package com.wels.enc;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import android.widget.Button;
+import android.widget.TextView;
+import java.io.*;
+import java.util.Vector;
+
+public class WelsEncTest extends Activity {+ /** Called when the activity is first created. */
+ private OnClickListener OnClickEvent;
+ private Button mBtnLoad, mBtnStartSW;
+
+ final String mStreamPath = "/sdcard/wels-seq/";
+ Vector<String> mCfgFiles = new Vector<String>();
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {+ super.onCreate(savedInstanceState);
+ final TextView tv = new TextView(this);
+ System.out.println("Here we go ...");+ Log.i(TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
+ setContentView(R.layout.main);
+
+ mBtnLoad = (Button)findViewById(R.id.cfg);
+ mBtnStartSW = (Button)findViewById(R.id.buttonSW);
+
+
+ OnClickEvent = new OnClickListener()
+ {+ public void onClick(View v)
+ {+ switch(v.getId())
+ {+ case R.id.cfg:
+ {+ String cfgFile = mStreamPath + "cfgs.txt";
+ try {+ BufferedReader bufferedReader = new BufferedReader(new FileReader(cfgFile));
+ String text;
+ while((text = bufferedReader.readLine()) != null) {+ mCfgFiles.add(mStreamPath + text);
+ Log.i(TAG, mStreamPath + text);
+ }
+ bufferedReader.close();
+ } catch(IOException e) {+ Log.e(TAG, e.getMessage());
+ }
+ }
+ break;
+ case R.id.buttonSW:
+ {+ System.out.println("decode sequence number = " + mCfgFiles.size());+ Log.i(TAG,"after click");
+ try {+ for (int k=0; k < mCfgFiles.size(); k++) {+ String cfgFile = mCfgFiles.get(k);
+ DoEncoderTest(cfgFile);
+ }
+ } catch (Exception e) {+ Log.e(TAG, e.getMessage());
+ }
+ mCfgFiles.clear();
+ tv.setText( "Decoder is completed!" );
+ }
+ break;
+ }
+ }
+ };
+
+ mBtnLoad.setOnClickListener(OnClickEvent);
+ mBtnStartSW.setOnClickListener(OnClickEvent);
+
+ System.out.println("Done!");+ }
+
+ @Override
+ public void onStart()
+ {+ Log.i(TAG,"welsdecdemo onStart");
+ super.onStart();
+ }
+
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {+ switch (keyCode) {+ case KeyEvent.KEYCODE_BACK:
+ return true;
+ default:
+ return super.onKeyDown(keyCode, event);
+ }
+ }
+
+ public native void DoEncoderTest(String cfgFileName);
+ private static final String TAG = "welsenc";
+ static {+ try {+ System.loadLibrary("wels");+ System.loadLibrary("stlport_shared");+ System.loadLibrary("welsencdemo");+ Log.v(TAG, "Load libwelsencdemo.so successful");
+ }
+ catch(Exception e) {+ Log.e(TAG, "Failed to load welsdec"+e.getMessage());
+ }
+ }
+
+}
+