third-party-mirrors/spek
1
0
Fork 0
mirror of https://github.com/alexkay/spek.git synced 2025-06-08 11:22:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated FFmpeg APIs to support FFmpeg 5.x

Browse Source
This commit is contained in:
MikeWang000000 2022-07-12 00:49:00 +08:00 committed by Alexander Kojevnikov
parent 59e44ce5b2
commit b956c1fd78
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LICENCE.md
View File

@ -20,6 +20,7 @@ Contributors:
* Jakov Smolic * Jakov Smolic
* Jonathan Gonzalez V * Jonathan Gonzalez V
* Matteo Bini * Matteo Bini
* Mike Wang
* Simon Ruderich * Simon Ruderich
* Stefan Kost * Stefan Kost
* Thibault North * Thibault North

60
src/spek-audio.cc
View File

@ -50,7 +50,7 @@ private:
int channel; int channel;
AVPacket packet; AVPacket *packet;
int offset; int offset;
AVFrame *frame; AVFrame *frame;
int buffer_len; int buffer_len;
@ -103,7 +103,7 @@ std::unique_ptr<AudioFile> Audio::open(const std::string& file_name, int stream)
AVStream *avstream = nullptr; AVStream *avstream = nullptr;
AVCodecParameters *codecpar = nullptr; AVCodecParameters *codecpar = nullptr;
AVCodec *codec = nullptr; const AVCodec *codec = nullptr;
if (!error) { if (!error) {
avstream = format_context->streams[audio_stream]; avstream = format_context->streams[audio_stream];
codecpar = avstream->codecpar; codecpar = avstream->codecpar;
@ -143,7 +143,7 @@ std::unique_ptr<AudioFile> Audio::open(const std::string& file_name, int stream)
if (bits_per_sample) { if (bits_per_sample) {
bit_rate = 0; bit_rate = 0;
} }
channels = codecpar->channels; channels = codecpar->ch_layout.nb_channels;
if (avstream->duration != AV_NOPTS_VALUE) { if (avstream->duration != AV_NOPTS_VALUE) {
duration = avstream->duration * av_q2d(avstream->time_base); duration = avstream->duration * av_q2d(avstream->time_base);
@ -201,9 +201,9 @@ AudioFileImpl::AudioFileImpl(
sample_rate(sample_rate), sample_rate(sample_rate),
bits_per_sample(bits_per_sample), streams(streams), channels(channels), duration(duration) bits_per_sample(bits_per_sample), streams(streams), channels(channels), duration(duration)
{ {
av_init_packet(&this->packet); this->packet = av_packet_alloc();
this->packet.data = nullptr; this->packet->data = nullptr;
this->packet.size = 0; this->packet->size = 0;
this->offset = 0; this->offset = 0;
this->frame = av_frame_alloc(); this->frame = av_frame_alloc();
this->buffer_len = 0; this->buffer_len = 0;
@ -221,11 +221,11 @@ AudioFileImpl::~AudioFileImpl()
if (this->frame) { if (this->frame) {
av_frame_free(&this->frame); av_frame_free(&this->frame);
} }
if (this->packet.data) { if (this->packet->data) {
this->packet.data -= this->offset; this->packet->data -= this->offset;
this->packet.size += this->offset; this->packet->size += this->offset;
this->offset = 0; this->offset = 0;
av_packet_unref(&this->packet); av_packet_unref(this->packet);
} }
if (this->codec_context) { if (this->codec_context) {
avcodec_free_context(&codec_context); avcodec_free_context(&codec_context);
@ -258,23 +258,23 @@ int AudioFileImpl::read()
} }
for (;;) { for (;;) {
while (this->packet.size > 0) { while (this->packet->size > 0) {
av_frame_unref(this->frame); av_frame_unref(this->frame);
int got_frame = 0; int ret;
int len = avcodec_decode_audio4( ret = avcodec_send_packet(this->codec_context, this->packet);
this->codec_context, this->frame, &got_frame, &this->packet if (ret < 0) {
); // Error sending a packet for decoding, skip the frame.
if (len < 0) {
// Error, skip the frame.
break; break;
} }
this->packet.data += len; ret = avcodec_receive_frame(this->codec_context, this->frame);
this->packet.size -= len; if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
this->offset += len; // Error during decoding, skip the frame.
if (!got_frame) { break;
// No data yet, get more frames.
continue;
} }
int len = this->packet->size;
this->packet->data += len;
this->packet->size -= len;
this->offset += len;
// We have data, return it and come back for more later. // We have data, return it and come back for more later.
int samples = this->frame->nb_samples; int samples = this->frame->nb_samples;
if (samples > this->buffer_len) { if (samples > this->buffer_len) {
@ -324,19 +324,19 @@ int AudioFileImpl::read()
} }
return samples; return samples;
} }
if (this->packet.data) { if (this->packet->data) {
this->packet.data -= this->offset; this->packet->data -= this->offset;
this->packet.size += this->offset; this->packet->size += this->offset;
this->offset = 0; this->offset = 0;
av_packet_unref(&this->packet); av_packet_unref(this->packet);
} }
int res = 0; int res = 0;
while ((res = av_read_frame(this->format_context, &this->packet)) >= 0) { while ((res = av_read_frame(this->format_context, this->packet)) >= 0) {
if (this->packet.stream_index == this->audio_stream) { if (this->packet->stream_index == this->audio_stream) {
break; break;
} }
av_packet_unref(&this->packet); av_packet_unref(this->packet);
} }
if (res < 0) { if (res < 0) {
// End of file or error. // End of file or error.