Skip to content

Commit 707a286

Browse files
authored
Merge pull request #14114 from wordpress-mobile/fix/skip-video-compression-on-error
Video compression: managing npe and tracking it in MEDIA_VIDEO_CANT_OPTIMIZE event
2 parents 7b466e7 + 4f2b76e commit 707a286

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,31 @@ public void start() {
8585

8686
mOutputPath = mCacheDir.getPath() + "/" + mFilename;
8787

88-
MediaComposer mediaComposer = WPVideoUtils.getVideoOptimizationComposer(
89-
getContext(),
90-
mInputPath,
91-
mOutputPath,
92-
this,
93-
AppPrefs.getVideoOptimizeWidth(),
94-
AppPrefs.getVideoOptimizeQuality());
88+
MediaComposer mediaComposer = null;
89+
boolean wasNpeDetected = false;
90+
91+
try {
92+
mediaComposer = WPVideoUtils.getVideoOptimizationComposer(
93+
getContext(),
94+
mInputPath,
95+
mOutputPath,
96+
this,
97+
AppPrefs.getVideoOptimizeWidth(),
98+
AppPrefs.getVideoOptimizeQuality());
99+
} catch (NullPointerException npe) {
100+
AppLog.w(
101+
AppLog.T.MEDIA,
102+
"VideoOptimizer > NullPointerException while getting composer " + npe.getMessage()
103+
);
104+
wasNpeDetected = true;
105+
}
95106

96107
if (mediaComposer == null) {
97108
AppLog.w(AppLog.T.MEDIA, "VideoOptimizer > null composer");
98-
AnalyticsTracker.track(MEDIA_VIDEO_CANT_OPTIMIZE, AnalyticsUtils.getMediaProperties(getContext(), true,
99-
null, mInputPath));
109+
Map<String, Object> properties = AnalyticsUtils.getMediaProperties(getContext(), true,
110+
null, mInputPath);
111+
properties.put("was_npe_detected", wasNpeDetected);
112+
AnalyticsTracker.track(MEDIA_VIDEO_CANT_OPTIMIZE, properties);
100113
mListener.onVideoOptimizationCompleted(mMedia);
101114
return;
102115
}

0 commit comments

Comments
 (0)