RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

ad_lavc, vd_lavc: support new Libav decoding API

Browse Source 
For now only found in Libav.
This commit is contained in:
wm4 2016-03-24 17:53:30 +01:00
parent f0febc35eb
commit 4300bfd518
3 changed files with 38 additions and 3 deletions
audio/decode
ad_lavc.c
video/decode
vd_lavc.c
wscript

14
audio/decode/ad_lavc.c
View File

@ -192,6 +192,19 @@ static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt,
int got_frame = 0; int got_frame = 0;
av_frame_unref(priv->avframe); av_frame_unref(priv->avframe);
#if HAVE_AVCODEC_NEW_CODEC_API
int ret = avcodec_send_packet(avctx, &pkt);
if (ret >= 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
if (ret >= 0 && mpkt)
mpkt->len = 0;
ret = avcodec_receive_frame(avctx, priv->avframe);
if (ret >= 0)
got_frame = 1;
if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
ret = 0;
}
#else
int ret = avcodec_decode_audio4(avctx, priv->avframe, &got_frame, &pkt); int ret = avcodec_decode_audio4(avctx, priv->avframe, &got_frame, &pkt);
if (mpkt) { if (mpkt) {
// At least "shorten" decodes sub-frames, instead of the whole packet. // At least "shorten" decodes sub-frames, instead of the whole packet.
@ -208,6 +221,7 @@ static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt,
return 0; return 0;
} }
} }
#endif
if (ret < 0) { if (ret < 0) {
MP_ERR(da, "Error decoding audio.\n"); MP_ERR(da, "Error decoding audio.\n");
return -1; return -1;

21
video/decode/vd_lavc.c
View File

@ -646,6 +646,7 @@ static void decode(struct dec_video *vd, struct demux_packet *packet,
vd_ffmpeg_ctx *ctx = vd->priv; vd_ffmpeg_ctx *ctx = vd->priv;
AVCodecContext *avctx = ctx->avctx; AVCodecContext *avctx = ctx->avctx;
struct vd_lavc_params *opts = ctx->opts->vd_lavc_params; struct vd_lavc_params *opts = ctx->opts->vd_lavc_params;
bool consumed = false;
AVPacket pkt; AVPacket pkt;
if (!avctx) if (!avctx)
@ -667,7 +668,23 @@ static void decode(struct dec_video *vd, struct demux_packet *packet,
reset_avctx(vd); reset_avctx(vd);
hwdec_lock(ctx); hwdec_lock(ctx);
#if HAVE_AVCODEC_NEW_CODEC_API
ret = avcodec_send_packet(avctx, packet ? &pkt : NULL);
if (ret >= 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
if (ret >= 0)
consumed = true;
ret = avcodec_receive_frame(avctx, ctx->pic);
if (ret >= 0)
got_picture = 1;
if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
ret = 0;
} else {
consumed = true;
}
#else
ret = avcodec_decode_video2(avctx, ctx->pic, &got_picture, &pkt); ret = avcodec_decode_video2(avctx, ctx->pic, &got_picture, &pkt);
consumed = true;
#endif
hwdec_unlock(ctx); hwdec_unlock(ctx);
// Reset decoder if it was fully flushed. Caller might send more flush // Reset decoder if it was fully flushed. Caller might send more flush
@ -692,10 +709,8 @@ static void decode(struct dec_video *vd, struct demux_packet *packet,
return; return;
} }
if (packet) { if (packet && consumed)
// always fully consumed
packet->len = 0; packet->len = 0;
}
// Skipped frame, or delayed output due to multithreaded decoding. // Skipped frame, or delayed output due to multithreaded decoding.
if (!got_picture) { if (!got_picture) {

6
wscript
View File

@ -484,6 +484,12 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_
'func': check_statement('libavcodec/avcodec.h', 'func': check_statement('libavcodec/avcodec.h',
'avcodec_profile_name(0,0)', 'avcodec_profile_name(0,0)',
use='libav'), use='libav'),
}, {
'name': 'avcodec-new-codec-api',
'desc': 'new libavcodec decode/encode API',
'func': check_statement('libavcodec/avcodec.h',
'avcodec_send_packet(0,0)',
use='libav'),
}, },
] ]