sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor tweaks/fixes.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=113868179
This commit is contained in:
cblay 2016-02-04 11:01:05 -08:00 committed by Oliver Woodman
parent 43e1e7e83a
commit 6bc52262db
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/src/main/java/com/google/android/exoplayer/dash/mpd/ContentProtection.java
View file

@ -70,8 +70,8 @@ public class ContentProtection {
@Override @Override
public int hashCode() { public int hashCode() {
int hashCode = schemeUriId.hashCode(); int hashCode = schemeUriId.hashCode();
hashCode = (37 * hashCode) + (uuid != null ? uuid.hashCode() : 0); hashCode = (31 * hashCode) + (uuid != null ? uuid.hashCode() : 0);
hashCode = (37 * hashCode) + (data != null ? data.hashCode() : 0); hashCode = (31 * hashCode) + (data != null ? data.hashCode() : 0);
return hashCode; return hashCode;
} }

7
library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
View file

@ -206,8 +206,11 @@ public final class Loader {
executorThread = Thread.currentThread(); executorThread = Thread.currentThread();
if (!loadable.isLoadCanceled()) { if (!loadable.isLoadCanceled()) {
TraceUtil.beginSection(loadable.getClass().getSimpleName() + ".load()"); TraceUtil.beginSection(loadable.getClass().getSimpleName() + ".load()");
loadable.load(); try {
TraceUtil.endSection(); loadable.load();
} finally {
TraceUtil.endSection();
}
} }
sendEmptyMessage(MSG_END_OF_SOURCE); sendEmptyMessage(MSG_END_OF_SOURCE);
} catch (IOException e) { } catch (IOException e) {