Skip to content

Commit 438e729

Browse files
authored
Merge pull request #3 from brarcher/transcoder
Transcoder
2 parents 1c8980a + 7bcc2e8 commit 438e729

File tree

14 files changed

+494
-776
lines changed

14 files changed

+494
-776
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Video Editor
1+
# Video Transcoder
22
[![Build Status](https://travis-ci.org/brarcher/VideoEditor.svg?branch=master)](https://travis-ci.org/brarcher/VideoEditor)
33

44
# Thanks

app/app.iml

Lines changed: 0 additions & 154 deletions
This file was deleted.

app/src/androidTest/java/videoeditor/bhuvnesh/com/ffmpegvideoeditor/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/protect/videotranscoder/ExampleInstrumentedTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package videoeditor.bhuvnesh.com.ffmpegvideoeditor;
1+
package protect.videotranscoder;
22

33
import android.content.Context;
44
import android.support.test.InstrumentationRegistry;
@@ -15,12 +15,14 @@
1515
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
1616
*/
1717
@RunWith(AndroidJUnit4.class)
18-
public class ExampleInstrumentedTest {
18+
public class ExampleInstrumentedTest
19+
{
1920
@Test
20-
public void useAppContext() throws Exception {
21+
public void useAppContext() throws Exception
22+
{
2123
// Context of the app under test.
2224
Context appContext = InstrumentationRegistry.getTargetContext();
2325

24-
assertEquals("videoeditor.bhuvnesh.com.ffmpegvideoeditor", appContext.getPackageName());
26+
assertEquals("protect.videoeditor", appContext.getPackageName());
2527
}
2628
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="videoeditor.bhuvnesh.com.ffmpegvideoeditor">
3+
package="protect.videotranscoder">
44
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
55
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
66
<uses-permission android:name="android.permission.RECORD_AUDIO"/>

app/src/main/java/videoeditor/bhuvnesh/com/ffmpegvideoeditor/activity/AudioPreviewActivity.java renamed to app/src/main/java/protect/videotranscoder/activity/AudioPreviewActivity.java

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package videoeditor.bhuvnesh.com.ffmpegvideoeditor.activity;
1+
package protect.videotranscoder.activity;
22

33
import android.media.AudioManager;
44
import android.media.MediaPlayer;
@@ -10,25 +10,20 @@
1010
import android.support.v7.app.AppCompatActivity;
1111
import android.view.MenuItem;
1212
import android.widget.TextView;
13-
import videoeditor.bhuvnesh.com.ffmpegvideoeditor.R;
14-
import videoeditor.bhuvnesh.com.ffmpegvideoeditor.views.VisualizerView;
15-
16-
17-
/**
18-
* Created by Bhuvnesh on 09-03-2017.
19-
*/
20-
21-
public class AudioPreviewActivity extends AppCompatActivity {
13+
import protect.videotranscoder.views.VisualizerView;
14+
import protect.videotranscoder.R;
2215

16+
public class AudioPreviewActivity extends AppCompatActivity
17+
{
2318
private VisualizerView mVisualizerView;
2419

2520
private MediaPlayer mMediaPlayer;
2621
private Visualizer mVisualizer;
2722
private static final String FILEPATH = "filepath";
2823

29-
3024
@Override
31-
protected void onCreate(@Nullable Bundle savedInstanceState) {
25+
protected void onCreate(@Nullable Bundle savedInstanceState)
26+
{
3227
super.onCreate(savedInstanceState);
3328
setContentView(R.layout.activity_audio_preview);
3429
ActionBar actionBar = getSupportActionBar();
@@ -38,37 +33,41 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
3833
actionBar.setDisplayShowHomeEnabled(true);
3934
}
4035

41-
mVisualizerView = (VisualizerView) findViewById(R.id.visualizerView);
42-
43-
36+
mVisualizerView = findViewById(R.id.visualizerView);
4437
}
4538

4639
@Override
47-
protected void onResume() {
40+
protected void onResume()
41+
{
4842
super.onResume();
4943
initAudio();
5044
}
5145

5246
@Override
53-
public boolean onOptionsItemSelected(MenuItem item) {
47+
public boolean onOptionsItemSelected(MenuItem item)
48+
{
5449
// handle arrow click here
55-
if (item.getItemId() == android.R.id.home) {
50+
if (item.getItemId() == android.R.id.home)
51+
{
5652
finish(); // close this activity and return to preview activity (if there is any)
5753
}
5854

5955
return super.onOptionsItemSelected(item);
6056
}
6157
@Override
62-
protected void onPause() {
58+
protected void onPause()
59+
{
6360
super.onPause();
64-
if (mMediaPlayer != null) {
61+
if (mMediaPlayer != null)
62+
{
6563
mVisualizer.release();
6664
mMediaPlayer.release();
6765
mMediaPlayer = null;
6866
}
6967
}
7068

71-
private void initAudio() {
69+
private void initAudio()
70+
{
7271
setVolumeControlStream(AudioManager.STREAM_MUSIC);
7372
String filePath = getIntent().getStringExtra(FILEPATH);
7473
TextView tvInstruction=(TextView) findViewById(R.id.tvInstruction);
@@ -86,29 +85,35 @@ private void initAudio() {
8685
// non-Visualizer related code
8786
// in this callback.
8887
mMediaPlayer
89-
.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
90-
public void onCompletion(MediaPlayer mediaPlayer) {
88+
.setOnCompletionListener(new MediaPlayer.OnCompletionListener()
89+
{
90+
public void onCompletion(MediaPlayer mediaPlayer)
91+
{
9192
mVisualizer.setEnabled(false);
9293
}
9394
});
9495
mMediaPlayer.start();
9596
mMediaPlayer.setLooping(true);
9697

9798
}
98-
private void setupVisualizerFxAndUI() {
99+
private void setupVisualizerFxAndUI()
100+
{
99101

100102
// Create the Visualizer object and attach it to our media player.
101103
mVisualizer = new Visualizer(mMediaPlayer.getAudioSessionId());
102104
mVisualizer.setCaptureSize(Visualizer.getCaptureSizeRange()[1]);
103105
mVisualizer.setDataCaptureListener(
104-
new Visualizer.OnDataCaptureListener() {
106+
new Visualizer.OnDataCaptureListener()
107+
{
105108
public void onWaveFormDataCapture(Visualizer visualizer,
106-
byte[] bytes, int samplingRate) {
109+
byte[] bytes, int samplingRate)
110+
{
107111
mVisualizerView.updateVisualizer(bytes);
108112
}
109113

110114
public void onFftDataCapture(Visualizer visualizer,
111-
byte[] bytes, int samplingRate) {
115+
byte[] bytes, int samplingRate)
116+
{
112117
}
113118
}, Visualizer.getMaxCaptureRate() / 2, true, false);
114119
}

0 commit comments

Comments
 (0)