37c2cb6a68
@xyz reported a regression on his Sony Xperia Z3 Tablet Compact where
playback would intermittently fail to start, essentially deadlocking in
the decoder. Bisecting narrowed down the issue to this commit, which was
meant as an optimization but is not necessary.
This reverts commit a75bb5496a.
Signed-off-by: Aman Gupta <aman@tmm1.net>
110 lines
2.9 KiB
C
110 lines
2.9 KiB
C
/*
|
|
* Android MediaCodec decoder
|
|
*
|
|
* Copyright (c) 2015-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
|
|
*/
|
|
|
|
#ifndef AVCODEC_MEDIACODECDEC_COMMON_H
|
|
#define AVCODEC_MEDIACODECDEC_COMMON_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdatomic.h>
|
|
#include <stdbool.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "libavutil/frame.h"
|
|
#include "libavutil/pixfmt.h"
|
|
|
|
#include "avcodec.h"
|
|
#include "mediacodec_wrapper.h"
|
|
|
|
typedef struct MediaCodecDecContext {
|
|
|
|
AVCodecContext *avctx;
|
|
atomic_int refcount;
|
|
atomic_int hw_buffer_count;
|
|
|
|
char *codec_name;
|
|
|
|
FFAMediaCodec *codec;
|
|
FFAMediaFormat *format;
|
|
|
|
void *surface;
|
|
|
|
int started;
|
|
int draining;
|
|
int flushing;
|
|
int eos;
|
|
|
|
int width;
|
|
int height;
|
|
int stride;
|
|
int slice_height;
|
|
int color_format;
|
|
int crop_top;
|
|
int crop_bottom;
|
|
int crop_left;
|
|
int crop_right;
|
|
int display_width;
|
|
int display_height;
|
|
|
|
uint64_t output_buffer_count;
|
|
ssize_t current_input_buffer;
|
|
|
|
bool delay_flush;
|
|
atomic_int serial;
|
|
|
|
} MediaCodecDecContext;
|
|
|
|
int ff_mediacodec_dec_init(AVCodecContext *avctx,
|
|
MediaCodecDecContext *s,
|
|
const char *mime,
|
|
FFAMediaFormat *format);
|
|
|
|
int ff_mediacodec_dec_send(AVCodecContext *avctx,
|
|
MediaCodecDecContext *s,
|
|
AVPacket *pkt,
|
|
bool wait);
|
|
|
|
int ff_mediacodec_dec_receive(AVCodecContext *avctx,
|
|
MediaCodecDecContext *s,
|
|
AVFrame *frame,
|
|
bool wait);
|
|
|
|
int ff_mediacodec_dec_flush(AVCodecContext *avctx,
|
|
MediaCodecDecContext *s);
|
|
|
|
int ff_mediacodec_dec_close(AVCodecContext *avctx,
|
|
MediaCodecDecContext *s);
|
|
|
|
int ff_mediacodec_dec_is_flushing(AVCodecContext *avctx,
|
|
MediaCodecDecContext *s);
|
|
|
|
typedef struct MediaCodecBuffer {
|
|
|
|
MediaCodecDecContext *ctx;
|
|
ssize_t index;
|
|
int64_t pts;
|
|
atomic_int released;
|
|
int serial;
|
|
|
|
} MediaCodecBuffer;
|
|
|
|
#endif /* AVCODEC_MEDIACODECDEC_COMMON_H */
|