mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-04-01 22:49:21 +00:00
2a0eb86857
The default behavior of the mediacodec decoder before this commit was to delay flushes until all pending hardware frames were returned to the decoder. This was useful for certain types of applications, but was unexpected behavior for others. The new default behavior with this commit is now to execute flushes immediately to invalidate all pending frames. The old behavior can be enabled by setting delay_flush=1. With the new behavior, video players implementing seek can simply call flush on the decoder without having to worry about whether they have one or more mediacodec frames still buffered in their rendering pipeline. Previously, all these frames had to be explictly freed (or rendered) before the seek/flush would execute. The new behavior matches the behavior of all other lavc decoders, reducing the amount of special casing required when using the mediacodec decoder. Signed-off-by: Aman Gupta <aman@tmm1.net> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
125 lines
2.9 KiB
C
125 lines
2.9 KiB
C
/*
|
|
* Android MediaCodec public API functions
|
|
*
|
|
* Copyright (c) 2016 Matthieu Bouron <matthieu.bouron stupeflix.com>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "libavutil/error.h"
|
|
|
|
#include "mediacodec.h"
|
|
|
|
#if CONFIG_MEDIACODEC
|
|
|
|
#include <jni.h>
|
|
|
|
#include "libavcodec/avcodec.h"
|
|
#include "libavutil/mem.h"
|
|
|
|
#include "ffjni.h"
|
|
#include "mediacodecdec_common.h"
|
|
#include "version.h"
|
|
|
|
AVMediaCodecContext *av_mediacodec_alloc_context(void)
|
|
{
|
|
return av_mallocz(sizeof(AVMediaCodecContext));
|
|
}
|
|
|
|
int av_mediacodec_default_init(AVCodecContext *avctx, AVMediaCodecContext *ctx, void *surface)
|
|
{
|
|
int ret = 0;
|
|
JNIEnv *env = NULL;
|
|
|
|
env = ff_jni_get_env(avctx);
|
|
if (!env) {
|
|
return AVERROR_EXTERNAL;
|
|
}
|
|
|
|
ctx->surface = (*env)->NewGlobalRef(env, surface);
|
|
if (ctx->surface) {
|
|
avctx->hwaccel_context = ctx;
|
|
} else {
|
|
av_log(avctx, AV_LOG_ERROR, "Could not create new global reference\n");
|
|
ret = AVERROR_EXTERNAL;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void av_mediacodec_default_free(AVCodecContext *avctx)
|
|
{
|
|
JNIEnv *env = NULL;
|
|
|
|
AVMediaCodecContext *ctx = avctx->hwaccel_context;
|
|
|
|
if (!ctx) {
|
|
return;
|
|
}
|
|
|
|
env = ff_jni_get_env(avctx);
|
|
if (!env) {
|
|
return;
|
|
}
|
|
|
|
if (ctx->surface) {
|
|
(*env)->DeleteGlobalRef(env, ctx->surface);
|
|
ctx->surface = NULL;
|
|
}
|
|
|
|
av_freep(&avctx->hwaccel_context);
|
|
}
|
|
|
|
int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render)
|
|
{
|
|
MediaCodecDecContext *ctx = buffer->ctx;
|
|
int released = atomic_fetch_add(&buffer->released, 1);
|
|
|
|
if (!released && (ctx->delay_flush || buffer->serial == atomic_load(&ctx->serial))) {
|
|
return ff_AMediaCodec_releaseOutputBuffer(ctx->codec, buffer->index, render);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
|
|
#include <stdlib.h>
|
|
|
|
AVMediaCodecContext *av_mediacodec_alloc_context(void)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
int av_mediacodec_default_init(AVCodecContext *avctx, AVMediaCodecContext *ctx, void *surface)
|
|
{
|
|
return AVERROR(ENOSYS);
|
|
}
|
|
|
|
void av_mediacodec_default_free(AVCodecContext *avctx)
|
|
{
|
|
}
|
|
|
|
int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render)
|
|
{
|
|
return AVERROR(ENOSYS);
|
|
}
|
|
|
|
#endif
|