jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libff: Small audio decoder loop refactor

master
Richard Stanway 2016-04-20 02:52:06 +02:00
parent bebaeaeaa9
commit 4c0b316130
No known key found for this signature in database
GPG Key ID: AAC1E5265D71B3FD
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
deps/libff/libff/ff-audio-decoder.c vendored
View File

@ -49,11 +49,6 @@ static bool handle_reset_packet(struct ff_decoder *decoder,
decoder->clock = packet->clock;
av_free_packet(&packet->base);
// not a real packet, so try to get another packet
if (packet_queue_get(&decoder->packet_queue, packet, 1)
== FF_PACKET_FAIL)
return false;
return true;
}
@ -75,6 +70,22 @@ static int decode_frame(struct ff_decoder *decoder,
int ret;
while (true) {
ret = packet_queue_get(&decoder->packet_queue, packet, 1);
if (ret == FF_PACKET_FAIL) {
return -1;
}
if (packet->base.data ==
decoder->packet_queue.flush_packet.base.data) {
avcodec_flush_buffers(decoder->codec);
continue;
}
// Packet has a new clock (reset packet)
if (packet->clock != NULL)
if (!handle_reset_packet(decoder, packet))
return -1;
while (packet->base.size > 0) {
int complete;
@ -95,33 +106,11 @@ static int decode_frame(struct ff_decoder *decoder,
*frame_complete = complete != 0;
return frame->nb_samples *
av_get_bytes_per_sample(frame->format);
av_get_bytes_per_sample(frame->format);
}
if (packet->base.data != NULL)
av_packet_unref(&packet->base);
ret = packet_queue_get(&decoder->packet_queue, packet, 1);
if (ret == FF_PACKET_FAIL) {
return -1;
}
if (packet->base.data ==
decoder->packet_queue.flush_packet.base.data) {
avcodec_flush_buffers(decoder->codec);
// we were flushed, so try to get another packet
ret = packet_queue_get(&decoder->packet_queue,
packet, 1);
if (ret == FF_PACKET_FAIL) {
return -1;
}
}
// Packet has a new clock (reset packet)
if (packet->clock != NULL)
if (!handle_reset_packet(decoder, packet))
return -1;
}
}