diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java index d5fb4d0819..f03ebb9d62 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java @@ -70,8 +70,7 @@ public final class TransformationException extends Exception { ERROR_CODE_ENCODING_FAILED, ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED, ERROR_CODE_HDR_EDITING_UNSUPPORTED, - ERROR_CODE_GL_INIT_FAILED, - ERROR_CODE_GL_PROCESSING_FAILED, + ERROR_CODE_FRAME_PROCESSING_FAILED, ERROR_CODE_MUXING_FAILED, }) public @interface ErrorCode {} @@ -157,10 +156,8 @@ public final class TransformationException extends Exception { // Video editing errors (5xxx). - /** Caused by a GL initialization failure. */ - public static final int ERROR_CODE_GL_INIT_FAILED = 5001; - /** Caused by a failure while using or releasing a GL program. */ - public static final int ERROR_CODE_GL_PROCESSING_FAILED = 5002; + /** Caused by a frame processing failure. */ + public static final int ERROR_CODE_FRAME_PROCESSING_FAILED = 5001; // Muxing errors (6xxx). /** Caused by a failure while muxing media samples. */ @@ -185,8 +182,7 @@ public final class TransformationException extends Exception { .put("ERROR_CODE_ENCODING_FAILED", ERROR_CODE_ENCODING_FAILED) .put("ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED", ERROR_CODE_OUTPUT_FORMAT_UNSUPPORTED) .put("ERROR_CODE_HDR_EDITING_UNSUPPORTED", ERROR_CODE_HDR_EDITING_UNSUPPORTED) - .put("ERROR_CODE_GL_INIT_FAILED", ERROR_CODE_GL_INIT_FAILED) - .put("ERROR_CODE_GL_PROCESSING_FAILED", ERROR_CODE_GL_PROCESSING_FAILED) + .put("ERROR_CODE_FRAME_PROCESSING_FAILED", ERROR_CODE_FRAME_PROCESSING_FAILED) .put("ERROR_CODE_MUXING_FAILED", ERROR_CODE_MUXING_FAILED) .buildOrThrow(); @@ -204,7 +200,7 @@ public final class TransformationException extends Exception { * Equivalent to {@link TransformationException#getErrorCodeName(int) * TransformationException.getErrorCodeName(this.errorCode)}. */ - public final String getErrorCodeName() { + public String getErrorCodeName() { return getErrorCodeName(errorCode); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java index 187eaef9ec..30d7a93284 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java @@ -120,7 +120,7 @@ import org.checkerframework.dataflow.qual.Pure; public void onFrameProcessingError(FrameProcessingException exception) { asyncErrorListener.onTransformationException( TransformationException.createForFrameProcessingException( - exception, TransformationException.ERROR_CODE_GL_PROCESSING_FAILED)); + exception, TransformationException.ERROR_CODE_FRAME_PROCESSING_FAILED)); } @Override @@ -140,7 +140,7 @@ import org.checkerframework.dataflow.qual.Pure; /* useHdr= */ encoderWrapper.isHdrEditingEnabled()); } catch (FrameProcessingException e) { throw TransformationException.createForFrameProcessingException( - e, TransformationException.ERROR_CODE_GL_INIT_FAILED); + e, TransformationException.ERROR_CODE_FRAME_PROCESSING_FAILED); } frameProcessor.setInputFrameInfo( new FrameInfo(