mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-07-14 13:22:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Brought back deprecated code for older ffmpeg builds

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2023-02-07 00:03:51 +01:00
parent ecd8ff3757
commit 3df27e289b
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/WallpaperEngine/Audio/CAudioStream.cpp
View File

@ -197,8 +197,12 @@ void CAudioStream::loadCustomContent (const char* filename)
void CAudioStream::initialize () void CAudioStream::initialize ()
{ {
#if FF_API_FIFO_OLD_API
// allocate the FIFO buffer // allocate the FIFO buffer
this->m_queue->packetList = av_fifo_alloc2 (1, sizeof (MyAVPacketList), AV_FIFO_FLAG_AUTO_GROW); this->m_queue->packetList = av_fifo_alloc2 (1, sizeof (MyAVPacketList), AV_FIFO_FLAG_AUTO_GROW);
#else
this->m_queue->packetList = av_fifo_alloc (sizeof (MyAVPacketList));
#endif
// setup the queue information // setup the queue information
this->m_queue->mutex = SDL_CreateMutex (); this->m_queue->mutex = SDL_CreateMutex ();
@ -233,9 +237,17 @@ bool CAudioStream::doQueue (AVPacket* pkt)
{ {
MyAVPacketList entry { pkt }; MyAVPacketList entry { pkt };
#if FF_API_FIFO_OLD_API
// write the entry if possible // write the entry if possible
if (av_fifo_write (this->m_queue->packetList, &entry, 1) < 0) if (av_fifo_write (this->m_queue->packetList, &entry, 1) < 0)
return false; return false;
#else
if (av_fifo_space (this->m_queue->packetList) < sizeof (entry))
if (av_fifo_grow (this->m_queue->packetList, sizeof (entry)) < 0)
return false;
av_fifo_generic_write (this->m_queue->packetList, &entry, sizeof (entry), nullptr);
#endif
this->m_queue->nb_packets ++; this->m_queue->nb_packets ++;
this->m_queue->size += entry.packet->size + sizeof (entry); this->m_queue->size += entry.packet->size + sizeof (entry);
@ -254,8 +266,17 @@ void CAudioStream::dequeuePacket (AVPacket* output)
while (g_KeepRunning) while (g_KeepRunning)
{ {
int ret = -1;
#if FF_API_FIFO_OLD_API
ret = av_fifo_read (this->m_queue->packetList, &entry, 1);
#else
if (av_fifo_size (this->m_queue->packetList) >= sizeof (entry))
ret = av_fifo_generic_read (this->n_queue->packetList, &entry, sizeof (entry), nullptr);
#endif
// enough data available, read it // enough data available, read it
if (av_fifo_read (this->m_queue->packetList, &entry, 1) >= 0) if (ret >= 0)
{ {
this->m_queue->nb_packets --; this->m_queue->nb_packets --;
this->m_queue->size -= entry.packet->size + sizeof (entry); this->m_queue->size -= entry.packet->size + sizeof (entry);

4
src/WallpaperEngine/Audio/CAudioStream.h
View File

@ -81,7 +81,11 @@ namespace WallpaperEngine::Audio
struct PacketQueue struct PacketQueue
{ {
#if FF_API_FIFO_OLD_API
AVFifo* packetList; AVFifo* packetList;
#else
AVFifoBuffer* packetList;
#endif
int nb_packets; int nb_packets;
int size; int size;
int64_t duration; int64_t duration;