OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

deps/media-playback: Use new FFmpeg decode funcs when possible

Browse source 
Prevents potential decoding issues by relying on FFmpeg to manage
sub-packet handling.
This commit is contained in:
jp9000 2017-05-17 16:34:40 -07:00
parent 5ebec76b60
commit d54b51edf4
2 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
deps/media-playback/media-playback/decode.c vendored
View file

@ -204,6 +204,40 @@ static inline int64_t get_estimated_duration(struct mp_decode *d,
}
}
static int decode_packet(struct mp_decode *d, int *got_frame)
{
int ret;
*got_frame = 0;
#ifdef USE_NEW_FFMPEG_DECODE_API
ret = avcodec_send_packet(d->decoder, &d->pkt);
if (ret != 0 && ret != AVERROR(EAGAIN)) {
if (ret == AVERROR_EOF)
ret = 0;
return ret;
}
ret = avcodec_receive_frame(d->decoder, d->frame);
if (ret != 0 && ret != AVERROR(EAGAIN)) {
if (ret == AVERROR_EOF)
ret = 0;
return ret;
}
*got_frame = (ret == 0);
ret = d->pkt.size;
#else
if (d->audio) {
ret = avcodec_decode_audio4(d->decoder,
d->frame, got_frame, &d->pkt);
} else {
ret = avcodec_decode_video2(d->decoder,
d->frame, got_frame, &d->pkt);
}
#endif
return ret;
}
bool mp_decode_next(struct mp_decode *d)
{
bool eof = d->m->eof;
@ -232,25 +266,20 @@ bool mp_decode_next(struct mp_decode *d)
}
}
if (d->audio) {
ret = avcodec_decode_audio4(d->decoder,
d->frame, &got_frame, &d->pkt);
} else {
if (d->m->is_network && !d->got_first_keyframe) {
if (d->pkt.flags & AV_PKT_FLAG_KEY) {
d->got_first_keyframe = true;
} else {
av_packet_unref(&d->orig_pkt);
av_init_packet(&d->orig_pkt);
av_init_packet(&d->pkt);
d->packet_pending = false;
return true;
}
if (!d->audio && d->m->is_network && !d->got_first_keyframe) {
if (d->pkt.flags & AV_PKT_FLAG_KEY) {
d->got_first_keyframe = true;
} else {
av_packet_unref(&d->orig_pkt);
av_init_packet(&d->orig_pkt);
av_init_packet(&d->pkt);
d->packet_pending = false;
return true;
}
ret = avcodec_decode_video2(d->decoder,
d->frame, &got_frame, &d->pkt);
}
ret = decode_packet(d, &got_frame);
if (!got_frame && ret == 0) {
d->eof = true;
return true;

4
deps/media-playback/media-playback/media.h vendored
View file

@ -110,6 +110,10 @@ extern void mp_media_stop(mp_media_t *media);
/* #define DETAILED_DEBUG_INFO */
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
#define USE_NEW_FFMPEG_DECODE_API
#endif
#ifdef __cplusplus
}
#endif