History

avcodec/mediacodec_surface: define and use FFANativeWindow to mimic NDK interface

This will make it easy to switch to ANativeWindow_fromSurface and ANativeWindow_release in the future.

Aman Gupta committed 7 years ago

Commit 7fddf4b1 parent 8a3623e2 files · +8 −5Browse files

Unified · Split

2 files
  1. libavcodec/mediacodec_surface.c +3 −3
  2. libavcodec/mediacodec_surface.h +5 −2
libavcodec/mediacodec_surface.c+3−3
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include "ffjni.h"
2626 #include "mediacodec_surface.h"
2727
28−void *ff_mediacodec_surface_ref(void *surface, void *log_ctx)
28+FFANativeWindow *ff_mediacodec_surface_ref(void *surface, void *log_ctx)
2929 {
3030 JNIEnv *env = NULL;
3131
@@ -37,7 +37,7 @@ void *ff_mediacodec_surface_ref(void *surface, void *log_ctx) · 5 unmodified lines
3737 return (*env)->NewGlobalRef(env, surface);
3838 }
3939
40−int ff_mediacodec_surface_unref(void *surface, void *log_ctx)
40+int ff_mediacodec_surface_unref(FFANativeWindow *window, void *log_ctx)
4141 {
4242 JNIEnv *env = NULL;
4343
@@ -46,7 +46,7 @@ int ff_mediacodec_surface_unref(void *surface, void *log_ctx) · 2 unmodified lines
4646 return AVERROR_EXTERNAL;
4747 }
4848
49− (*env)->DeleteGlobalRef(env, surface);
49+ (*env)->DeleteGlobalRef(env, window);
5050
5151 return 0;
5252 }
libavcodec/mediacodec_surface.h+5−2
@@ -25,7 +25,10 @@ · 24 unmodified lines
2525
2626 #include "libavcodec/avcodec.h"
2727
28−void *ff_mediacodec_surface_ref(void *surface, void *log_ctx);
29−int ff_mediacodec_surface_unref(void *surface, void *log_ctx);
28+struct FFANativeWindow;
29+typedef struct FFANativeWindow FFANativeWindow;
30+
31+FFANativeWindow *ff_mediacodec_surface_ref(void *surface, void *log_ctx);
32+int ff_mediacodec_surface_unref(FFANativeWindow *window, void *log_ctx);
3033
3134 #endif /* AVCODEC_MEDIACODEC_SURFACE_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t