Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Video selection #24

Merged
merged 9 commits into from
Jan 27, 2018
Merged

Video selection #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f80091
Report FFmpeg error message on failure
brarcher Jan 26, 2018
4cb698b
Resume video playback when encoding and cleanup are complete
brarcher Jan 26, 2018
585bd8a
Start near end of video if end slider is changed
brarcher Jan 26, 2018
3f0bdc0
Add buttons for adjusting time window by 1 second
brarcher Jan 26, 2018
477cee7
Move visibility updates to separate method
brarcher Jan 27, 2018
809c38d
Show video select button after video cancel
brarcher Jan 27, 2018
69c1b91
Fix JOB_FAILED_MSG message when job is canceled
brarcher Jan 27, 2018
f3af7d3
Position buttons below slider and its time text
brarcher Jan 27, 2018
94a9b1b
Increase time navigation button size
brarcher Jan 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 124 additions & 22 deletions app/src/main/java/protect/videotranscoder/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.Spinner;
import android.widget.TextView;
Expand Down Expand Up @@ -75,6 +76,7 @@ public class MainActivity extends AppCompatActivity
public static final String MESSENGER_INTENT_KEY = BuildConfig.APPLICATION_ID + ".MESSENGER_INTENT_KEY";
public static final String FFMPEG_ENCODE_ARGS = BuildConfig.APPLICATION_ID + ".FFMPEG_ENCODE_ARGS";
public static final String FFMPEG_OUTPUT_FILE = BuildConfig.APPLICATION_ID + ".FFMPEG_OUTPUT_FILE";
public static final String FFMPEG_FAILURE_MSG = BuildConfig.APPLICATION_ID + ".FFMPEG_FAILURE_MSG";
public static final String OUTPUT_MIMETYPE = BuildConfig.APPLICATION_ID + ".OUTPUT_MIMETYPE";
public static final String OUTPUT_DURATION_MS = BuildConfig.APPLICATION_ID + ".OUTPUT_DURATION_MS";

Expand Down Expand Up @@ -128,6 +130,10 @@ public class MainActivity extends AppCompatActivity
private Button selectVideoButton;
private Button encodeButton;
private Button cancelButton;
private ImageView startJumpBack;
private ImageView startJumpForward;
private ImageView endJumpBack;
private ImageView endJumpForward;
private MediaInfo videoInfo;

private JobScheduler schedulerService;
Expand All @@ -145,6 +151,11 @@ protected void onCreate(Bundle savedInstanceState)
encodeButton = findViewById(R.id.encode);
cancelButton = findViewById(R.id.cancel);

startJumpBack = findViewById(R.id.startJumpBack);
startJumpForward = findViewById(R.id.startJumpForward);
endJumpBack = findViewById(R.id.endJumpBack);
endJumpForward = findViewById(R.id.endJumpForward);

tvLeft = findViewById(R.id.tvLeft);
tvRight = findViewById(R.id.tvRight);

Expand Down Expand Up @@ -520,10 +531,28 @@ private void updateUiForEncoding()

selectVideoButton.setVisibility(View.GONE);
encodeButton.setVisibility(View.GONE);
startJumpBack.setVisibility(View.GONE);
startJumpForward.setVisibility(View.GONE);
endJumpBack.setVisibility(View.GONE);
endJumpForward.setVisibility(View.GONE);

cancelButton.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.VISIBLE);
}

private void updateUiForVideoSettings()
{
selectVideoButton.setVisibility(View.VISIBLE);
encodeButton.setVisibility(View.VISIBLE);
startJumpBack.setVisibility(View.VISIBLE);
startJumpForward.setVisibility(View.VISIBLE);
endJumpBack.setVisibility(View.VISIBLE);
endJumpForward.setVisibility(View.VISIBLE);

cancelButton.setVisibility(View.GONE);
progressBar.setVisibility(View.GONE);
}

private void cancelEncode()
{
FFmpegUtil.cancelCall();
Expand All @@ -536,6 +565,8 @@ private void cancelEncode()
}

scheduler.cancelAll();

updateUiForVideoSettings();
}

private boolean isEncoding()
Expand All @@ -553,15 +584,21 @@ private void stopVideoPlayback()
}
}

private void startVideoPlayback()
private void startVideoPlayback(Integer positionSec)
{
stopVideoPlayback();

int startTimeSec = rangeSeekBar.getSelectedMinValue().intValue();
int stopTimeSec = rangeSeekBar.getSelectedMaxValue().intValue();
int durationSec = stopTimeSec - startTimeSec;

videoView.seekTo(startTimeSec * 1000);
if(positionSec == null)
{
positionSec = startTimeSec;
}

int durationSec = stopTimeSec - positionSec;

videoView.seekTo(positionSec * 1000);
videoView.start();

videoTimer = new Timer();
Expand All @@ -570,7 +607,7 @@ private void startVideoPlayback()
@Override
public void run()
{
startVideoPlayback();
startVideoPlayback(null);
}
}, durationSec * 1000);
}
Expand Down Expand Up @@ -600,7 +637,7 @@ protected void onResume()

if(isEncoding() == false)
{
startVideoPlayback();
startVideoPlayback(null);
}
}

Expand Down Expand Up @@ -656,6 +693,10 @@ private void populateOptionDefaults()
}

encodeButton.setVisibility(View.VISIBLE);
startJumpBack.setVisibility(View.VISIBLE);
startJumpForward.setVisibility(View.VISIBLE);
endJumpBack.setVisibility(View.VISIBLE);
endJumpForward.setVisibility(View.VISIBLE);

containerSpinner.setAdapter(new ArrayAdapter<>(this, R.layout.spinner_textview, MediaContainer.values()));
containerSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
Expand Down Expand Up @@ -866,7 +907,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data)
@Override
public void onPrepared(MediaPlayer mp)
{
int durationMs = mp.getDuration();
final int durationMs = mp.getDuration();
tvLeft.setVisibility(View.VISIBLE);
tvLeft.setText(getTime(0));
tvRight.setVisibility(View.VISIBLE);
Expand All @@ -880,18 +921,75 @@ public void onPrepared(MediaPlayer mp)

rangeSeekBar.setOnRangeSeekbarChangeListener(new OnRangeSeekbarChangeListener()
{
Number prevMinValueSec = 0;
Number prevMaxValueSec = (int)(durationMs / 1000f);

// If the end time slider was moved, resume the playback
// this may seconds before the end
static final int END_PLAYBACK_HEADROOM_SEC = 3;

@Override
public void valueChanged(Number minValue, Number maxValue)
{
Integer playStartSec = null;

if(prevMaxValueSec.intValue() != maxValue.intValue())
{
// End time was changed
prevMaxValueSec = maxValue;
playStartSec = prevMaxValueSec.intValue();

// Resume playback a few seconds before the end
int headroom = Math.min(maxValue.intValue()-minValue.intValue(), END_PLAYBACK_HEADROOM_SEC);
playStartSec -= headroom;
}

if(prevMinValueSec.intValue() != minValue.intValue())
{
// Start time was changed
prevMinValueSec = minValue;
playStartSec = prevMinValueSec.intValue();
}

tvLeft.setText(getTime(minValue.intValue()));
tvRight.setText(getTime(maxValue.intValue()));

if(isEncoding() == false)
if(isEncoding() == false && playStartSec != null)
{
startVideoPlayback();
startVideoPlayback(playStartSec);
}
}
});

class RangeSeekChanger implements View.OnClickListener
{
private final int startOffset;
private final int endOffset;
RangeSeekChanger(int startOffset, int endOffset)
{
this.startOffset = startOffset;
this.endOffset = endOffset;
}

@Override
public void onClick(View v)
{
rangeSeekBar.setMinValue(0);
rangeSeekBar.setMaxValue(durationMs / 1000f);

int selectedStart = rangeSeekBar.getSelectedMinValue().intValue();
int selectedEnd = rangeSeekBar.getSelectedMaxValue().intValue();

rangeSeekBar.setMinStartValue(selectedStart + startOffset);
rangeSeekBar.setMaxStartValue(selectedEnd + endOffset);
rangeSeekBar.apply();
}
}

startJumpForward.setOnClickListener(new RangeSeekChanger(1, 0));
startJumpBack.setOnClickListener(new RangeSeekChanger(-1, 0));
endJumpForward.setOnClickListener(new RangeSeekChanger(0, 1));
endJumpBack.setOnClickListener(new RangeSeekChanger(0, -1));
}
});

Expand Down Expand Up @@ -992,16 +1090,21 @@ public void handleMessage(Message msg)
boolean result = false;
String outputFile = null;
String mimetype = null;
String message = null;

if(messageId == MessageId.JOB_SUCCEDED_MSG)
{
result = true;
outputFile = ((Bundle)msg.obj).getString(FFMPEG_OUTPUT_FILE);
mimetype = ((Bundle)msg.obj).getString(OUTPUT_MIMETYPE);
}
else
{
message = ((Bundle)msg.obj).getString(FFMPEG_FAILURE_MSG);
}

Log.d(TAG, "Job complete, result: " + result);
showEncodeCompleteDialog(mainActivity, result, outputFile, mimetype);
showEncodeCompleteDialog(mainActivity, result, message, outputFile, mimetype);
break;

case FFMPEG_UNSUPPORTED_MSG:
Expand All @@ -1015,13 +1118,9 @@ public void handleMessage(Message msg)
}

private void showEncodeCompleteDialog(final MainActivity mainActivity, final boolean result,
final String outputFile, final String mimetype)
final String ffmpegMessage, final String outputFile,
final String mimetype)
{
ProgressBar progressBar = mainActivity.findViewById(R.id.encodeProgress);
Button selectVideoButton = mainActivity.findViewById(R.id.selectVideo);
Button encodeButton = mainActivity.findViewById(R.id.encode);
Button cancelButton = mainActivity.findViewById(R.id.cancel);

Log.d(TAG, "Encode result: " + result);

String message;
Expand All @@ -1032,12 +1131,20 @@ private void showEncodeCompleteDialog(final MainActivity mainActivity, final boo
}
else
{
message = mainActivity.getResources().getString(R.string.transcodeFailed);
message = mainActivity.getResources().getString(R.string.transcodeFailed, ffmpegMessage);
}

AlertDialog.Builder builder = new AlertDialog.Builder(mainActivity)
.setMessage(message)
.setCancelable(true)
.setOnDismissListener(new DialogInterface.OnDismissListener()
{
@Override
public void onDismiss(DialogInterface dialog)
{
mainActivity.startVideoPlayback(null);
}
})
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
{
public void onClick(DialogInterface dialog, int which)
Expand Down Expand Up @@ -1070,12 +1177,7 @@ public void onClick(DialogInterface dialog, int which)

builder.show();

//startVideoPlayback();

selectVideoButton.setVisibility(View.VISIBLE);
encodeButton.setVisibility(View.VISIBLE);
cancelButton.setVisibility(View.GONE);
progressBar.setVisibility(View.GONE);
mainActivity.updateUiForVideoSettings();
}
}

Expand Down
14 changes: 12 additions & 2 deletions app/src/main/java/protect/videotranscoder/service/FFmpegProcessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
import com.github.hiteshsondhi88.libffmpeg.ExecuteBinaryResponseHandler;

import protect.videotranscoder.FFmpegUtil;
import protect.videotranscoder.R;
import protect.videotranscoder.ResultCallbackHandler;

import static protect.videotranscoder.activity.MainActivity.FFMPEG_ENCODE_ARGS;
import static protect.videotranscoder.activity.MainActivity.FFMPEG_FAILURE_MSG;
import static protect.videotranscoder.activity.MainActivity.FFMPEG_OUTPUT_FILE;
import static protect.videotranscoder.activity.MainActivity.MESSENGER_INTENT_KEY;
import static protect.videotranscoder.activity.MainActivity.OUTPUT_DURATION_MS;
Expand Down Expand Up @@ -77,7 +79,13 @@ public void onFailure(String s)
Log.d(TAG, "Failed with output : " + s);
jobFinished(params, false);

sendMessage(MessageId.JOB_FAILED_MSG, params.getJobId());
// The last line of the output should be the failure message
String [] lines = s.split("\n");
String failureMg = lines[lines.length-1].trim();

Bundle bundle = new Bundle();
bundle.putString(FFMPEG_FAILURE_MSG, failureMg);
sendMessage(MessageId.JOB_FAILED_MSG, bundle);
}

@Override
Expand Down Expand Up @@ -142,7 +150,9 @@ public boolean onStopJob(JobParameters params)

FFmpegUtil.cancelCall();

sendMessage(MessageId.JOB_FAILED_MSG, params.getJobId());
Bundle bundle = new Bundle();
bundle.putString(FFMPEG_FAILURE_MSG, getResources().getString(R.string.encodeCanceled));
sendMessage(MessageId.JOB_FAILED_MSG, bundle);

// Return false to drop the job.
return false;
Expand Down
Binary file added app/src/main/res/drawable-hdpi/ic_fast_forward_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/ic_fast_rewind_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/ic_fast_forward_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/ic_fast_rewind_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/ic_fast_forward_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/ic_fast_rewind_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/ic_fast_forward_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/ic_fast_rewind_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/ic_fast_forward_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/ic_fast_rewind_black_24dp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 33 additions & 2 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,60 @@
android:id="@+id/buttonContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_below="@id/tvRight"
android:orientation="horizontal">
<ImageView
android:id="@+id/startJumpBack"
android:layout_width="@dimen/timeNavButtonSize"
android:layout_height="@dimen/timeNavButtonSize"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:src="@drawable/ic_fast_rewind_black_24dp"/>
<ImageView
android:id="@+id/startJumpForward"
android:layout_width="@dimen/timeNavButtonSize"
android:layout_height="@dimen/timeNavButtonSize"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:src="@drawable/ic_fast_forward_black_24dp"/>
<Button
android:id="@+id/selectVideo"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/selectVideo"
/>
<Button
android:id="@+id/encode"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:text="@string/encode"
/>
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:text="@string/cancel"
/>
<ImageView
android:id="@+id/endJumpBack"
android:layout_width="@dimen/timeNavButtonSize"
android:layout_height="@dimen/timeNavButtonSize"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:src="@drawable/ic_fast_rewind_black_24dp"/>
<ImageView
android:id="@+id/endJumpForward"
android:layout_width="@dimen/timeNavButtonSize"
android:layout_height="@dimen/timeNavButtonSize"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:src="@drawable/ic_fast_forward_black_24dp"/>
</LinearLayout>

<ProgressBar
Expand Down
Loading