From 834a68f37210558ba09670c2da5398923fc245e4 Mon Sep 17 00:00:00 2001 From: xufuji456 Date: Mon, 6 Jun 2022 14:51:25 +0800 Subject: [PATCH] Feature: modify to release_retriever() --- app/src/main/cpp/metadata/ffmpeg_media_retriever.c | 2 +- app/src/main/cpp/metadata/ffmpeg_media_retriever.h | 2 +- app/src/main/cpp/metadata/media_retriever.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/cpp/metadata/ffmpeg_media_retriever.c b/app/src/main/cpp/metadata/ffmpeg_media_retriever.c index 09dd3a0..7f90e58 100755 --- a/app/src/main/cpp/metadata/ffmpeg_media_retriever.c +++ b/app/src/main/cpp/metadata/ffmpeg_media_retriever.c @@ -691,7 +691,7 @@ int set_native_window(State **state_ptr, ANativeWindow* native_window) { return SUCCESS; } -void release(State **state_ptr) { +void release_retriever(State **state_ptr) { State *state = *state_ptr; diff --git a/app/src/main/cpp/metadata/ffmpeg_media_retriever.h b/app/src/main/cpp/metadata/ffmpeg_media_retriever.h index f697dde..f0a15d4 100755 --- a/app/src/main/cpp/metadata/ffmpeg_media_retriever.h +++ b/app/src/main/cpp/metadata/ffmpeg_media_retriever.h @@ -56,6 +56,6 @@ int get_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt); int get_scaled_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt, int width, int height); int get_audio_thumbnail(State **state_ptr, AVPacket *pkt); int set_native_window(State **ps, ANativeWindow* native_window); -void release(State **ps); +void release_retriever(State **ps); #endif /*FFMPEG_MEDIA_RETRIEVER_H_*/ diff --git a/app/src/main/cpp/metadata/media_retriever.cpp b/app/src/main/cpp/metadata/media_retriever.cpp index f12b706..0416979 100755 --- a/app/src/main/cpp/metadata/media_retriever.cpp +++ b/app/src/main/cpp/metadata/media_retriever.cpp @@ -14,7 +14,7 @@ MediaRetriever::MediaRetriever() MediaRetriever::~MediaRetriever() { Mutex::Autolock lock(mLock); - ::release(&state); + ::release_retriever(&state); } int MediaRetriever::setDataSource(const char *srcUrl)