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

Implement an FfmpegVideoRenderer #7132

Open
wants to merge 7 commits into
base: dev-v2
Choose a base branch
from
Open

Implement an FfmpegVideoRenderer #7132

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab67ca8
Implement an FfmpegVideoRenderer
haohaozaici Mar 13, 2020
4497919
Merge ffmpeg video renderer to current ffmpeg extension
haohaozaici Mar 20, 2020
29d8226
Merge remote-tracking branch 'upstream/dev-v2' into ffmpeg-video-rend…
haohaozaici Apr 20, 2020
0e9bab2
Fix FfmpegVideoDecoder Lint.ThenChange paths
haohaozaici Apr 20, 2020
37ef691
Use the appropriate method to link to Ffmpeg Library
haohaozaici Apr 20, 2020
c80189f
Fix ffmpeg library android.mk compilation error
haohaozaici May 6, 2020
1eb3eaa
Merge branch 'dev-v2' into ffmpeg-video-renderer
haohaozaici Sep 29, 2020
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
Prev Previous commit
Next Next commit
Fix FfmpegVideoDecoder Lint.ThenChange paths
  • Loading branch information
@haohaozaici
haohaozaici committed Apr 20, 2020
commit 0e9bab2b257c5d58665abd0076e6e72aec139be5
40 changes: 22 additions & 18 deletions ...ons/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@
extends
SimpleDecoder<VideoDecoderInputBuffer, VideoDecoderOutputBuffer, FfmpegDecoderException> {

// Error codes matching ffmpeg_jni.cc.
private static final int DECODER_ERROR_INVALID_DATA = -1;
private static final int DECODER_ERROR_OTHER = -2;
private static final int DECODER_ERROR_READ_FRAME = -3;
private static final int DECODER_ERROR_SEND_PACKET = -4;
// LINT.IfChange
private static final int VIDEO_DECODER_SUCCESS = 0;
private static final int VIDEO_DECODER_ERROR_INVALID_DATA = -1;
private static final int VIDEO_DECODER_ERROR_OTHER = -2;
private static final int VIDEO_DECODER_ERROR_READ_FRAME = -3;
private static final int VIDEO_DECODER_ERROR_SEND_PACKET = -4;
// LINT.ThenChange(../../../../../../../jni/ffmpeg_jni.cc)

private final String codecName;
private long nativeContext;
Expand Down Expand Up @@ -142,13 +144,13 @@ protected FfmpegDecoderException decode(
boolean needSendAgain = false;
int sendPacketResult = ffmpegSendPacket(nativeContext, inputData, inputSize,
inputBuffer.timeUs);
if (sendPacketResult == DECODER_ERROR_INVALID_DATA) {
if (sendPacketResult == VIDEO_DECODER_ERROR_INVALID_DATA) {
outputBuffer.setFlags(C.BUFFER_FLAG_DECODE_ONLY);
return null;
} else if (sendPacketResult == DECODER_ERROR_READ_FRAME) {
} else if (sendPacketResult == VIDEO_DECODER_ERROR_READ_FRAME) {
// need read frame
needSendAgain = true;
} else if (sendPacketResult == DECODER_ERROR_OTHER) {
} else if (sendPacketResult == VIDEO_DECODER_ERROR_OTHER) {
return new FfmpegDecoderException("ffmpegDecode error: (see logcat)");
}

Expand All @@ -157,13 +159,13 @@ protected FfmpegDecoderException decode(
// We need to dequeue the decoded frame from the decoder even when the input data is
// decode-only.
int getFrameResult = ffmpegReceiveFrame(nativeContext, outputMode, outputBuffer, decodeOnly);
if (getFrameResult == DECODER_ERROR_SEND_PACKET) {
if (getFrameResult == VIDEO_DECODER_ERROR_SEND_PACKET) {
return null;
} else if (getFrameResult == DECODER_ERROR_OTHER) {
} else if (getFrameResult == VIDEO_DECODER_ERROR_OTHER) {
return new FfmpegDecoderException("ffmpegDecode error: (see logcat)");
}

if (getFrameResult == DECODER_ERROR_INVALID_DATA) {
if (getFrameResult == VIDEO_DECODER_ERROR_INVALID_DATA) {
outputBuffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
}

Expand Down Expand Up @@ -206,7 +208,7 @@ public void renderToSurface(VideoDecoderOutputBuffer outputBuffer, Surface surfa
}
if (ffmpegRenderFrame(
nativeContext, surface,
outputBuffer, outputBuffer.width, outputBuffer.height) == DECODER_ERROR_OTHER) {
outputBuffer, outputBuffer.width, outputBuffer.height) == VIDEO_DECODER_ERROR_OTHER) {
throw new FfmpegDecoderException(
"Buffer render error: ");
}
Expand All @@ -226,21 +228,23 @@ private native int ffmpegRenderFrame(
/**
* Decodes the encoded data passed.
*
* @param context Decoder context.
* @param context Decoder context.
* @param encodedData Encoded data.
* @param length Length of the data buffer.
* @return 0 if successful, {@link #DECODER_ERROR_OTHER} if an error occurred.
* @param length Length of the data buffer.
* @return {@link #VIDEO_DECODER_SUCCESS} if successful, {@link #VIDEO_DECODER_ERROR_OTHER} if an
* error occurred.
*/
private native int ffmpegSendPacket(long context, ByteBuffer encodedData, int length,
long inputTime);

/**
* Gets the decoded frame.
*
* @param context Decoder context.
* @param context Decoder context.
* @param outputBuffer Output buffer for the decoded frame.
* @return 0 if successful, {@link #DECODER_ERROR_INVALID_DATA} if successful but the frame is
* decode-only, {@link #DECODER_ERROR_OTHER} if an error occurred.
* @return {@link #VIDEO_DECODER_SUCCESS} if successful, {@link #VIDEO_DECODER_ERROR_INVALID_DATA}
* if successful but the frame is decode-only, {@link #VIDEO_DECODER_ERROR_OTHER} if an error
* occurred.
*/
private native int ffmpegReceiveFrame(
long context, int outputMode, VideoDecoderOutputBuffer outputBuffer, boolean decodeOnly);
Expand Down