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

fix upstream merge conflict

Browse source
This commit is contained in:
Xiao YiFang 2022-06-22 17:48:52 +08:00
parent 01a8995504 7fa7ad6e52
commit af4946d7a7
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 "utils.hh" #include "utils.hh"
using std::vector; using std::vector;
@ -140,7 +141,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 )