i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the existing ffmpeg function to decide if a format is planar.

Browse Source
This commit is contained in:
Adrien Destugues
2015-12-31 16:19:59 +01:00
parent 8113bbfe40
commit 2c49943980
2 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
+5 -12
View File
@@ -408,7 +408,7 @@ AVCodecDecoder::_NegotiateAudioOutputFormat(media_format* inOutFormat)
if (fRawDecodedAudio->opaque == NULL) if (fRawDecodedAudio->opaque == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
if (AVSampleFormatIsPlanar(fContext->sample_fmt)) { if (av_sample_fmt_is_planar(fContext->sample_fmt)) {
fResampleContext = swr_alloc_set_opts(NULL, fResampleContext = swr_alloc_set_opts(NULL,
fContext->channel_layout, fContext->request_sample_fmt, fContext->channel_layout, fContext->request_sample_fmt,
fContext->sample_rate, fContext->sample_rate,
@@ -913,19 +913,10 @@ AVCodecDecoder::_MoveAudioFramesToRawDecodedAudioAndUpdateStartTimes()
if (frames == 0) if (frames == 0)
debugger("fDecodedDataBufferSize not multiple of frame size!"); debugger("fDecodedDataBufferSize not multiple of frame size!");
// The old version of libswresample available for gcc2 gets confused when
// the frame counts for inout and output don't match. So, we use it with
// equal frame counts (but it can still perform re-matrixing of the audio).
#if LIBSWRESAMPLE_VERSION_INT <= AV_VERSION_INT(0, 6, 100)
outFrames = frames;
inFrames = frames;
#endif
// Some decoders do not support format conversion on themselves, or use // Some decoders do not support format conversion on themselves, or use
// "planar" audio (each channel separated instead of interleaved samples). // "planar" audio (each channel separated instead of interleaved samples).
// In that case, we use swresample to convert the data (and it is // In that case, we use swresample to convert the data
// smart enough to do just a copy, when possible) if (av_sample_fmt_is_planar(fContext->sample_fmt)) {
if (AVSampleFormatIsPlanar(fContext->sample_fmt)) {
const uint8_t* ptr[8]; const uint8_t* ptr[8];
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
if (fDecodedDataBuffer->data[i] == NULL) if (fDecodedDataBuffer->data[i] == NULL)
@@ -942,6 +933,8 @@ AVCodecDecoder::_MoveAudioFramesToRawDecodedAudioAndUpdateStartTimes()
} else { } else {
memcpy(fRawDecodedAudio->data[0], fDecodedDataBuffer->data[0] memcpy(fRawDecodedAudio->data[0], fDecodedDataBuffer->data[0]
+ fDecodedDataBufferOffset, frames * fOutputFrameSize); + fDecodedDataBufferOffset, frames * fOutputFrameSize);
outFrames = frames;
inFrames = frames;
} }
size_t remainingSize = inFrames * fOutputFrameSize; size_t remainingSize = inFrames * fOutputFrameSize;
src/add-ons/media/plugins/ffmpeg/Utilities.h
-16
View File
@@ -317,20 +317,4 @@ ConvertAVSampleFormatToRawAudioFormat(AVSampleFormat sampleFormatIn,
} }
inline bool
AVSampleFormatIsPlanar(AVSampleFormat sampleFormat)
{
switch (sampleFormat) {
case AV_SAMPLE_FMT_FLTP:
case AV_SAMPLE_FMT_DBLP:
case AV_SAMPLE_FMT_S32P:
case AV_SAMPLE_FMT_S16P:
case AV_SAMPLE_FMT_U8P:
return true;
default:
return false;
}
}
#endif // UTILITIES_H #endif // UTILITIES_H