roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Have specialized AVCodecContext initialization

Browse Source 
A common initialization procedure is too restrictive, and we end up setting up audio configuration for video decoding and vice-versa.
This commit is contained in:
trav90
2016-12-14 03:30:40 -06:00
committed by roytam1
parent 4d1ef4248d
commit 95a8f149db
6 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
+16
View File
@@ -35,6 +35,22 @@ FFmpegAudioDecoder<LIBAV_VER>::Init()
return NS_OK;
}
void
FFmpegAudioDecoder<LIBAV_VER>::InitCodecContext()
{
MOZ_ASSERT(mCodecContext);
// We do not want to set this value to 0 as FFmpeg by default will
// use the number of cores, which with our mozlibavutil get_cpu_count
// isn't implemented.
mCodecContext->thread_count = 1;
// FFmpeg takes this as a suggestion for what format to use for audio samples.
uint32_t major, minor;
FFmpegRuntimeLinker::GetVersion(major, minor);
// LibAV 0.8 produces rubbish float interleaved samples, request 16 bits audio.
mCodecContext->request_sample_fmt =
(major == 53) ? AV_SAMPLE_FMT_S16 : AV_SAMPLE_FMT_FLT;
}
static AudioDataValue*
CopyAndPackAudio(AVFrame* aFrame, uint32_t aNumChannels, uint32_t aNumAFrames)
{