Skip to content

Commit

Permalink
r1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ojw28 committed Jul 16, 2015
2 parents acee566 + 6a2a838 commit b3bf8fe
Show file tree
Hide file tree
Showing 221 changed files with 12,179 additions and 3,937 deletions.
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Android generated
bin
gen
libs
obj
lint.xml

# IntelliJ IDEA
Expand All @@ -16,6 +18,7 @@ gen-external-apklibs
.classpath
.settings
.checkstyle
.cproject

# Gradle
.gradle
Expand All @@ -37,3 +40,11 @@ proguard-project.txt
.DS_Store
dist
tmp

# VP9 Extension
extensions/vp9/src/main/jni/libvpx
extensions/vp9/src/main/jni/libvpx_android_configs
extensions/vp9/src/main/jni/libyuv

# Opus Extension
extensions/opus/src/main/jni/libopus
16 changes: 16 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Release notes #

### r1.4.0 ###

* Support for extracting Matroska streams (implemented by WebmExtractor).
* Support for tx3g captions in MP4 streams.
* Support for H.265 in MPEG-TS streams on supported devices.
* HLS: Added support for MPEG audio (e.g. MP3).
* HLS: Improved robustness against missing chunks and variants.
* MP4: Added support for embedded MPEG audio (e.g. MP3).
* TTML: Improved handling of whitespace.
* DASH: Support Mpd.Location element.
* Add option to TsExtractor to allow non-IDR keyframes.
* Added MulticastDataSource for connecting to multicast streams.
* (WorkInProgress) - First steps to supporting seeking in DASH DVR window.
* (WorkInProgress) - First steps to supporting styled + positioned subtitles.
* Misc bug fixes.

### r1.3.3 ###

* HLS: Fix failure when playing HLS AAC streams.
Expand Down
6 changes: 3 additions & 3 deletions demo/src/main/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.source=1.7
8 changes: 3 additions & 5 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.exoplayer.demo"
android:versionCode="1303"
android:versionName="1.3.3"
android:versionCode="1400"
android:versionName="1.4.0"
android:theme="@style/RootTheme">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>

Expand Down
102 changes: 0 additions & 102 deletions demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import com.google.android.exoplayer.ExoPlayer;
import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
import com.google.android.exoplayer.TimeRange;
import com.google.android.exoplayer.audio.AudioTrack;
import com.google.android.exoplayer.chunk.Format;
import com.google.android.exoplayer.demo.player.DemoPlayer;
Expand Down Expand Up @@ -46,6 +47,7 @@ public class EventLogger implements DemoPlayer.Listener, DemoPlayer.InfoListener

private long sessionStartTimeMs;
private long[] loadStartTimeMs;
private long[] seekRangeValuesUs;

public EventLogger() {
loadStartTimeMs = new long[DemoPlayer.RENDERER_COUNT];
Expand Down Expand Up @@ -163,7 +165,14 @@ public void onCryptoError(CryptoException e) {
@Override
public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
long initializationDurationMs) {
Log.d(TAG, "decoderInitialized [" + getSessionTimeString() + "]");
Log.d(TAG, "decoderInitialized [" + getSessionTimeString() + ", " + decoderName + "]");
}

@Override
public void onSeekRangeChanged(TimeRange seekRange) {
seekRangeValuesUs = seekRange.getCurrentBoundsUs(seekRangeValuesUs);
Log.d(TAG, "seekRange [ " + seekRange.type + ", " + seekRangeValuesUs[0] + ", "
+ seekRangeValuesUs[1] + "]");
}

private void printInternalError(String type, Exception e) {
Expand Down
Loading

0 comments on commit b3bf8fe

Please sign in to comment.