atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

MediaCodec: release all output buffers on release

Browse Source 
This prevents leaking video memory
This commit is contained in:
Julian Winkler
2024-11-06 23:25:28 +01:00
parent fc0091a989
commit 7c9a32d041
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api-impl-jni/media/android_media_MediaCodec.c
View File

@@ -465,6 +465,10 @@ JNIEXPORT jint JNICALL Java_android_media_MediaCodec_native_1dequeueOutputBuffer
_SET_INT_FIELD(buffer_info, "size", 0); _SET_INT_FIELD(buffer_info, "size", 0);
_SET_LONG_FIELD(buffer_info, "presentationTimeUs", 0); _SET_LONG_FIELD(buffer_info, "presentationTimeUs", 0);
av_frame_free(&frame); av_frame_free(&frame);
// set the buffer to NULL, so we don't try to render it
uint8_t *raw_buffer = get_nio_buffer(env, buffer, &array_ref, &array);
*((AVFrame **)raw_buffer) = NULL;
release_nio_buffer(env, array_ref, array);
return 0; return 0;
} }
if (ret != AVERROR(EAGAIN)) { if (ret != AVERROR(EAGAIN)) {
@@ -569,6 +573,9 @@ JNIEXPORT void JNICALL Java_android_media_MediaCodec_native_1releaseOutputBuffer
*raw_buffer = NULL; *raw_buffer = NULL;
release_nio_buffer(env, array_ref, array); release_nio_buffer(env, array_ref, array);
if (!frame)
return;
if (!render) { if (!render) {
fprintf(stderr, "skipping %dx%d frame!\n", frame->width, frame->height); fprintf(stderr, "skipping %dx%d frame!\n", frame->width, frame->height);
av_frame_free(&frame); av_frame_free(&frame);

9
src/api-impl/android/media/MediaCodec.java
View File

@@ -147,8 +147,15 @@ public class MediaCodec {
public void release() { public void release() {
System.out.println("MediaCodec.release(): codecName=" + codecName); System.out.println("MediaCodec.release(): codecName=" + codecName);
if (native_codec != 0) if (native_codec != 0) {
if (outputBuffers != null) {
for (int i=0; i<outputBuffers.length; i++) {
if (!freeOutputBuffers.contains(i))
releaseOutputBuffer(i, false);
}
}
native_release(native_codec); native_release(native_codec);
}
native_codec = 0; native_codec = 0;
} }