hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

FFmpeg 5.0 player: stop reading raw data at EOF

Browse source 
Since the update to FFmpeg 5.0, when FFmpeg+libao internal player is
selected, most sounds fail to be pronounced. Furthermore, each failed
pronunciation attempt increases GoldenDict's CPU usage. Finally,
GoldenDict continues to hang and utilize the CPU cores when the user
attempts to exit it.

The reason for the issue is: GoldenDict's readAudioData() returns 0 at
EOF but FFmpeg expects the callback to return AVERROR_EOF. As a result,
internal player's threads are busy calling readAudioData() indefinitely.

a606f27f4c
documented the expected return value of the read_packet callback.
252500a78f
removed the code that handled the deprecated 0 return value gracefully.

The relevant deprecation warning
"Invalid return value 0 for stream protocol" had been flooding
GoldenDict's output for years

Fixes #1489.
This commit is contained in:
Igor Kushnir 2022-06-21 16:29:05 +03:00
parent 39abe4f1a6
commit 7fa7ad6e52
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ffmpegaudio.cc
View file

@ -28,6 +28,7 @@ extern "C" {
#include <vector> #include <vector>
#include "gddebug.hh"
#include "qt4x5.hh" #include "qt4x5.hh"
using std::vector; using std::vector;
@ -143,7 +144,17 @@ DecoderContext::~DecoderContext()
static int readAudioData( void * opaque, unsigned char * buffer, int bufferSize ) static int readAudioData( void * opaque, unsigned char * buffer, int bufferSize )
{ {
QDataStream * pStream = ( QDataStream * )opaque; QDataStream * pStream = ( QDataStream * )opaque;
return pStream->readRawData( ( char * )buffer, bufferSize ); // This function is passed as the read_packet callback into avio_alloc_context().
// The documentation for this callback parameter states:
// For stream protocols, must never return 0 but rather a proper AVERROR code.
if( pStream->atEnd() )
return AVERROR_EOF;
const int bytesRead = pStream->readRawData( ( char * )buffer, bufferSize );
// QDataStream::readRawData() returns 0 at EOF => return AVERROR_EOF in this case.
// An error is unlikely here, so just print a warning and return AVERROR_EOF too.
if( bytesRead < 0 )
gdWarning( "readAudioData: error while reading raw data." );
return bytesRead > 0 ? bytesRead : AVERROR_EOF;
} }
bool DecoderContext::openCodec( QString & errorString ) bool DecoderContext::openCodec( QString & errorString )