lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Imported Upstream version 0.14.2+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2016-05-24 21:53:01 +02:00
parent fb3990e9e5
commit 41a01dbf05
529 changed files with 25112 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

67
deps/libff/libff/ff-audio-decoder.c vendored
View file

@ -28,6 +28,8 @@
#include <assert.h>
#include "ff-compat.h"
static inline void shrink_packet(struct ff_packet *packet, int packet_length)
{
if (packet_length <= packet->base.size) {
@ -47,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;
}
@ -73,6 +70,28 @@ static int decode_frame(struct ff_decoder *decoder,
int ret;
while (true) {
if (decoder->eof)
ret = packet_queue_get(&decoder->packet_queue, packet, 0);
else
ret = packet_queue_get(&decoder->packet_queue, packet, 1);
if (ret == FF_PACKET_EMPTY) {
return 0;
} else 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;
@ -93,33 +112,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;
}
}
@ -143,8 +140,10 @@ static bool queue_frame(struct ff_decoder *decoder, AVFrame *frame,
|| queue_frame->frame->sample_rate != codec->sample_rate
|| queue_frame->frame->format != codec->sample_fmt);
if (queue_frame->frame != NULL)
if (queue_frame->frame != NULL) {
//FIXME: this shouldn't happen any more!
av_frame_free(&queue_frame->frame);
}
queue_frame->frame = av_frame_clone(frame);
queue_frame->clock = ff_clock_retain(decoder->clock);
@ -166,10 +165,13 @@ void *ff_audio_decoder_thread(void *opaque_audio_decoder)
struct ff_packet packet = {0};
bool frame_complete;
AVFrame *frame = av_frame_alloc();
int ret;
while (!decoder->abort) {
if (decode_frame(decoder, &packet, frame, &frame_complete)
< 0) {
ret = decode_frame(decoder, &packet, frame, &frame_complete);
if (ret == 0) {
break;
} else if (ret < 0) {
av_free_packet(&packet.base);
continue;
}
@ -193,5 +195,8 @@ void *ff_audio_decoder_thread(void *opaque_audio_decoder)
ff_clock_release(&decoder->clock);
av_frame_free(&frame);
decoder->finished = true;
return NULL;
}