[Android] Update HASH and remove .ts HACK

Thomas Guillem git at videolan.org
Tue Apr 28 18:02:01 CEST 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Apr 28 18:01:14 2015 +0200| [cfd65c713f849bc85407cf32a1a4947569958550] | committer: Thomas Guillem

Update HASH and remove .ts HACK

MediaCodec can now play livestreaming and ts files.

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=cfd65c713f849bc85407cf32a1a4947569958550
---

 compile.sh                                              |    2 +-
 .../org/videolan/vlc/gui/video/VideoPlayerActivity.java |   15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/compile.sh b/compile.sh
index 205b51c..37ecfce 100755
--- a/compile.sh
+++ b/compile.sh
@@ -131,7 +131,7 @@ fi
 # Fetch VLC source #
 ####################
 
-TESTED_HASH=a58d7c7
+TESTED_HASH=8f433b2
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index ec47ad8..b853bd8 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -2729,21 +2729,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
             openedPosition = getIntent().getExtras().getInt(PLAY_EXTRA_OPENED_POSITION, -1);
         }
 
-        /* WARNING: hack to avoid a crash in mediacodec on KitKat.
-         * Disable hardware acceleration if the media has a ts extension. */
-        if (mLocation != null && LibVlcUtil.isKitKatOrLater()) {
-            String locationLC = mLocation.toLowerCase(Locale.ENGLISH);
-            if (locationLC.endsWith(".ts")
-                || locationLC.endsWith(".tts")
-                || locationLC.endsWith(".m2t")
-                || locationLC.endsWith(".mts")
-                || locationLC.endsWith(".m2ts")) {
-                mDisabledHardwareAcceleration = true;
-                mPreviousHardwareAccelerationMode = mLibVLC.getHardwareAcceleration();
-                mLibVLC.setHardwareAcceleration(LibVLC.HW_ACCELERATION_DISABLED);
-            }
-        }
-
         if (openedPosition != -1) {
             // Provided externally from AudioService
             Log.d(TAG, "Continuing playback from AudioService at index " + openedPosition);



More information about the Android mailing list