loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-14 19:19:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation error in ffmpeg JNI layer

Browse Source 
PiperOrigin-RevId: 490263003
(cherry picked from commit 202e03fc64dac568955ce00684368cbea9b244f7)
This commit is contained in:
christosts 2022-11-22 17:31:00 +00:00 committed by microkatz
parent 9b0790e418
commit a114b0e01f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
View File

@ -91,7 +91,7 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
/** /**
* Transforms ffmpeg AVERROR into a negative AUDIO_DECODER_ERROR constant value. * Transforms ffmpeg AVERROR into a negative AUDIO_DECODER_ERROR constant value.
*/ */
int transformError(const char *functionName, int errorNumber); int transformError(int errorNumber);
/** /**
* Outputs a log message describing the avcodec error number. * Outputs a log message describing the avcodec error number.
@ -348,9 +348,9 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
return outSize; return outSize;
} }
int transformError(int result) { int transformError(int errorNumber) {
return result == AVERROR_INVALIDDATA ? AUDIO_DECODER_ERROR_INVALID_DATA return errorNumber == AVERROR_INVALIDDATA ? AUDIO_DECODER_ERROR_INVALID_DATA
: AUDIO_DECODER_ERROR_OTHER; : AUDIO_DECODER_ERROR_OTHER;
} }
void logError(const char *functionName, int errorNumber) { void logError(const char *functionName, int errorNumber) {