Merge pull request #707 from RWOverdijk/feat/ontimedmetadata-android
Feat/ontimedmetadata android
This commit is contained in:
commit
4fc0aab31c
@ -5,6 +5,7 @@ import android.app.Activity;
|
|||||||
import android.content.res.AssetFileDescriptor;
|
import android.content.res.AssetFileDescriptor;
|
||||||
import android.graphics.Matrix;
|
import android.graphics.Matrix;
|
||||||
import android.media.MediaPlayer;
|
import android.media.MediaPlayer;
|
||||||
|
import android.media.TimedMetaData;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
@ -22,6 +23,8 @@ import com.facebook.react.bridge.Arguments;
|
|||||||
import com.facebook.react.bridge.LifecycleEventListener;
|
import com.facebook.react.bridge.LifecycleEventListener;
|
||||||
import com.facebook.react.bridge.ReadableMap;
|
import com.facebook.react.bridge.ReadableMap;
|
||||||
import com.facebook.react.bridge.WritableMap;
|
import com.facebook.react.bridge.WritableMap;
|
||||||
|
import com.facebook.react.bridge.WritableArray;
|
||||||
|
import com.facebook.react.bridge.WritableNativeArray;
|
||||||
import com.facebook.react.uimanager.ThemedReactContext;
|
import com.facebook.react.uimanager.ThemedReactContext;
|
||||||
import com.facebook.react.uimanager.events.RCTEventEmitter;
|
import com.facebook.react.uimanager.events.RCTEventEmitter;
|
||||||
import com.yqritc.scalablevideoview.ScalableType;
|
import com.yqritc.scalablevideoview.ScalableType;
|
||||||
@ -30,6 +33,7 @@ import com.yqritc.scalablevideoview.ScaleManager;
|
|||||||
import com.yqritc.scalablevideoview.Size;
|
import com.yqritc.scalablevideoview.Size;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.lang.Math;
|
import java.lang.Math;
|
||||||
@ -38,14 +42,21 @@ import java.math.BigDecimal;
|
|||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
@SuppressLint("ViewConstructor")
|
@SuppressLint("ViewConstructor")
|
||||||
public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnPreparedListener, MediaPlayer
|
public class ReactVideoView extends ScalableVideoView implements
|
||||||
.OnErrorListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnInfoListener, LifecycleEventListener, MediaController.MediaPlayerControl {
|
MediaPlayer.OnPreparedListener,
|
||||||
|
MediaPlayer.OnErrorListener,
|
||||||
|
MediaPlayer.OnBufferingUpdateListener,
|
||||||
|
MediaPlayer.OnCompletionListener,
|
||||||
|
MediaPlayer.OnInfoListener,
|
||||||
|
LifecycleEventListener,
|
||||||
|
MediaController.MediaPlayerControl {
|
||||||
|
|
||||||
public enum Events {
|
public enum Events {
|
||||||
EVENT_LOAD_START("onVideoLoadStart"),
|
EVENT_LOAD_START("onVideoLoadStart"),
|
||||||
EVENT_LOAD("onVideoLoad"),
|
EVENT_LOAD("onVideoLoad"),
|
||||||
EVENT_ERROR("onVideoError"),
|
EVENT_ERROR("onVideoError"),
|
||||||
EVENT_PROGRESS("onVideoProgress"),
|
EVENT_PROGRESS("onVideoProgress"),
|
||||||
|
EVENT_TIMED_METADATA("onTimedMetadata"),
|
||||||
EVENT_SEEK("onVideoSeek"),
|
EVENT_SEEK("onVideoSeek"),
|
||||||
EVENT_END("onVideoEnd"),
|
EVENT_END("onVideoEnd"),
|
||||||
EVENT_STALLED("onPlaybackStalled"),
|
EVENT_STALLED("onPlaybackStalled"),
|
||||||
@ -84,6 +95,10 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP
|
|||||||
public static final String EVENT_PROP_WIDTH = "width";
|
public static final String EVENT_PROP_WIDTH = "width";
|
||||||
public static final String EVENT_PROP_HEIGHT = "height";
|
public static final String EVENT_PROP_HEIGHT = "height";
|
||||||
public static final String EVENT_PROP_ORIENTATION = "orientation";
|
public static final String EVENT_PROP_ORIENTATION = "orientation";
|
||||||
|
public static final String EVENT_PROP_METADATA = "metadata";
|
||||||
|
public static final String EVENT_PROP_TARGET = "target";
|
||||||
|
public static final String EVENT_PROP_METADATA_IDENTIFIER = "identifier";
|
||||||
|
public static final String EVENT_PROP_METADATA_VALUE = "value";
|
||||||
|
|
||||||
public static final String EVENT_PROP_ERROR = "error";
|
public static final String EVENT_PROP_ERROR = "error";
|
||||||
public static final String EVENT_PROP_WHAT = "what";
|
public static final String EVENT_PROP_WHAT = "what";
|
||||||
@ -199,6 +214,9 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP
|
|||||||
mMediaPlayer.setOnBufferingUpdateListener(this);
|
mMediaPlayer.setOnBufferingUpdateListener(this);
|
||||||
mMediaPlayer.setOnCompletionListener(this);
|
mMediaPlayer.setOnCompletionListener(this);
|
||||||
mMediaPlayer.setOnInfoListener(this);
|
mMediaPlayer.setOnInfoListener(this);
|
||||||
|
if (Build.VERSION.SDK_INT >= 23) {
|
||||||
|
mMediaPlayer.setOnTimedMetaDataAvailableListener(new TimedMetaDataAvailableListener());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -544,6 +562,9 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Select track (so we can use it to listen to timed meta data updates)
|
||||||
|
mp.selectTrack(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -578,6 +599,9 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBufferingUpdate(MediaPlayer mp, int percent) {
|
public void onBufferingUpdate(MediaPlayer mp, int percent) {
|
||||||
|
// Select track (so we can use it to listen to timed meta data updates)
|
||||||
|
mp.selectTrack(0);
|
||||||
|
|
||||||
mVideoBufferedDuration = (int) Math.round((double) (mVideoDuration * percent) / 100.0);
|
mVideoBufferedDuration = (int) Math.round((double) (mVideoDuration * percent) / 100.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -631,6 +655,35 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This is not fully tested and does not work for all forms of timed metadata
|
||||||
|
@TargetApi(23) // 6.0
|
||||||
|
public class TimedMetaDataAvailableListener
|
||||||
|
implements MediaPlayer.OnTimedMetaDataAvailableListener
|
||||||
|
{
|
||||||
|
public void onTimedMetaDataAvailable(MediaPlayer mp, TimedMetaData data) {
|
||||||
|
WritableMap event = Arguments.createMap();
|
||||||
|
|
||||||
|
try {
|
||||||
|
String rawMeta = new String(data.getMetaData(), "UTF-8");
|
||||||
|
WritableMap id3 = Arguments.createMap();
|
||||||
|
|
||||||
|
id3.putString(EVENT_PROP_METADATA_VALUE, rawMeta.substring(rawMeta.lastIndexOf("\u0003") + 1));
|
||||||
|
id3.putString(EVENT_PROP_METADATA_IDENTIFIER, "id3/TDEN");
|
||||||
|
|
||||||
|
WritableArray metadata = new WritableNativeArray();
|
||||||
|
|
||||||
|
metadata.pushMap(id3);
|
||||||
|
|
||||||
|
event.putArray(EVENT_PROP_METADATA, metadata);
|
||||||
|
event.putDouble(EVENT_PROP_TARGET, getId());
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
mEventEmitter.receiveEvent(getId(), Events.EVENT_TIMED_METADATA.toString(), event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onDetachedFromWindow() {
|
protected void onDetachedFromWindow() {
|
||||||
mMediaPlayerValid = false;
|
mMediaPlayerValid = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user