Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions NRExoPlayerTracker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ plugins {
id 'maven-publish'
}
android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion "34.0.0"
defaultConfig {
minSdkVersion 16
targetSdkVersion 33
targetSdkVersion 34
versionCode 6
versionName "4.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -36,7 +37,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.2.1'
implementation project(path: ':NewRelicVideoCore')
implementation 'androidx.media3:media3-exoplayer:1.1.0'
implementation 'androidx.media3:media3-exoplayer:1.2.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.10.3'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,10 @@ public void onLoadCompleted(@NonNull EventTime eventTime, @NonNull LoadEventInfo
if (mediaLoadData.dataType == C.DATA_TYPE_MEDIA
&& mediaLoadData.trackType == C.TRACK_TYPE_VIDEO
&& loadEventInfo.loadDurationMs > 0) {
// Calculate the bitrate for this specific chunk in bits per second
this.actualBitrate = (loadEventInfo.bytesLoaded * 8 * 1000) / loadEventInfo.loadDurationMs;
// Use actual video bitrate from player's video format instead of download speed
if (player != null && player.getVideoFormat() != null && player.getVideoFormat().bitrate != C.INDEX_UNSET) {
this.actualBitrate = player.getVideoFormat().bitrate;
}
}
}

Expand Down
7 changes: 4 additions & 3 deletions NRIMATracker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ plugins {
id 'maven-publish'
}
android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion "34.0.0"
defaultConfig {
minSdkVersion 16
targetSdkVersion 33
targetSdkVersion 34
versionCode 6
versionName "4.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -36,7 +37,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation project(path: ':NewRelicVideoCore')
implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
implementation 'androidx.media3:media3-exoplayer-ima:1.2.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
9 changes: 5 additions & 4 deletions NewRelicVideoCore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ plugins {
id 'maven-publish'
}
android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion "34.0.0"
defaultConfig {
minSdkVersion 16
targetSdkVersion 33
targetSdkVersion 34
versionCode 9
versionName "4.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -36,8 +37,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'com.newrelic.agent.android:android-agent:7.6.3'
implementation 'androidx.media3:media3-exoplayer:1.1.0'
implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
implementation 'androidx.media3:media3-exoplayer:1.2.0'
implementation 'androidx.media3:media3-exoplayer-ima:1.2.0'

// Add androidx.leanback for accurate Android TV detection
// implementation 'androidx.leanback:leanback:1.0.0'
Expand Down
13 changes: 7 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ if (localPropertiesFile.exists()) {
def applicationToken = localProperties.getProperty('nr.applicationToken', "")

android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion "34.0.0"
defaultConfig {
buildConfigField "String", "NR_APPLICATION_TOKEN", "\"${applicationToken}\""
applicationId "com.newrelic.nrvideoproject"
minSdkVersion 16
targetSdkVersion 33
targetSdkVersion 34
versionCode 2
versionName "1.1"

Expand Down Expand Up @@ -64,10 +65,10 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test:rules:1.5.0'

implementation 'androidx.media3:media3-exoplayer:1.1.0'
implementation 'androidx.media3:media3-ui:1.1.0'
implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
implementation 'androidx.media3:media3-exoplayer-dash:1.1.0'
implementation 'androidx.media3:media3-exoplayer:1.2.0'
implementation 'androidx.media3:media3-ui:1.2.0'
implementation 'androidx.media3:media3-exoplayer-ima:1.2.0'
implementation 'androidx.media3:media3-exoplayer-dash:1.2.0'

implementation 'com.android.support:multidex:1.0.3'
}