mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
6b21bacef6
- Bug 1206298 - Part 1: Update the expiration time on the fake cache entry object for an intercepted request in the non-e10s case; r=mcmanus (0fa1afb14d) - Bug 1206298 - Part 2: Add a test to make sure that we respect Cache-Control headers on the synthesized response; r=jdm (c7a05d4415) - Bug 121442 - Add platform to GMP storage base dir. r=gerald (6f40a18f39) - Bug 1214967 - Proxy observer service notification across to content process when GMPs are added/removed. r=billm,jwwang (088f770b47) - Bug 1211812 - Add pref to select GMP to use for unencrypted decoding. r=jwwang Bug 1212670 - Implement GMPDecoderModule::SupportsMimeType() and EMEDecoderModule::SupportsMimeType(). r=jwwang (10acef26cd) - Bug 1214932 - Remove fragmented-mp4 from media prefs. r=jya (f2935767c1) - Bug 1214967 - Create a list of GMPs/codecs that can be used for <video> decoding. r=jwwang (3c68f6e08b) - import some vars and prefs to compile again (5456bb7124) - Bug 1205083 - Don't enable low latency WMF video decoding as it crashes sometimes. r=jya (353e727811) - Bug 1101885: P1. Make pref dynamic. r=cpearce (8a3de82e1e) - Bug 1189776: Store our audio decode time in TimeUnits. r=cpearce (0a01637580) - Bug 1202296 - Hide the MFTDecoder within MFTManager so that we can recreate it opaquely. r=cpearce (148e4d1923) - Bug 1211339 - Ensure WMFDecoderModule::SupportsMimeType checks it can create decoders. r=jya (f6e53ff08c) - Bug 1101885: P2. Don't shutdown WMF framework before releasing decoder. r=cpearce (b373402e74) - Bug 1101885: P3. Allow decoder creation fallback. r=cpearce (650ef55564) - Bug 1219300 - Add mutex to protect the |result| because the variable will be access by multiple threads at the same time. r=cpearce (a0f489cbcf) - Bug 1101885: P4. Enable Intel VP8/VP9 HW decoder by default. r=cpearce (cffbca2905) - Bug 1101885: P5. Only attempt to use HW VP decoder if DXVA active. r=cpearce (fd0f12c118) - spaces (f110c8ab3d) - Bug 1203217 - Add some logging when we detect and skip an ID3v2 tag. r=kinetik (74533f7c1e) - small changes (1ab8008527) - Bug 1164453 - Assert that decoder callback is set before using it. r=snorp (79bee3ccbe) - Bug 1190379 - Use AndroidDecoderModule for VP8/9. r=jya (2c672b6630) - Bug 1188871: P2. Call DrainComplete should an error occurs while draining. r=snorp (81f5669010) - Bug 1163667 - [5.1] Ensure empty demuxer sample queue before initiating draining. r=snorp (8a4dd86a28) - Bug 1204483 - Fix busted audio decoding output on Android r=esawin (b0c7dca1ce) - Bug 1220491 - clarify ownership relationships for creators of AudioData; r=gerald (cd043d3ef1) - bug 1162364 detect and abort MF_E_TRANSFORM_STREAM_CHANGE infinite loops r=cpearce (a0f3e17e5f) - Bug 1214065 - Remove unused arguments from MediaDecoder::Load() and its friends. r=kinetik. (6e610f3aed) - Bug 1211766 - Remove AbstractMediaDecoder::GetReentrantMonitor(). r=jya. (beb1a22439) - some cleanup and add back some gestreamer stuff (55c4a19f78) - Bug 1204434 - Remove check of MediaDecoder::IsMediaSeekable from OggReader::ReadMetadata. r=cpearce. (75bf15a1f5) - Bug 1209888 - Remove usage of decoder monitor from OggReader. r=jya. (4e92df9c1c) - Bug 1204882 - Move MediaDecoder::FrameStatistics out of MediaDecoder for easier use in other classes. r=jwwang (7f5d6035be) - Bug 1209887. Part 1 - add assertions. r=jya. (d5a7057c79) - Bug 1209887. Part 2 - remove usage of decoder monitor. r=jya. (56a6de8874) - Bug 1209887. Part 3 - remove unused code. r=jya. (7cd48c424b) - missing bit of 1208930 (045f09408a) - Bug 1211327 - Remove unnecessary usage of decoder monitor from MediaDecoderReader and sub-classes. r=jya. (2a15ac759a) - missing bit 1211766 (221c0a957f) - Bug 1214519 - Fix the coding style of member initializer lists of MediaDecoder. r=jya. (654636af36) - Bug 1206977: P12. Properly shutdown all created test decoders. r=cpearce (79cd0ebc83) - Bug 1206977: P14. Remove obsolete / redundant code. r=cpearce (b5a85ee060) - Bug 1208348 - Check whether DirectShow can decode MP3 before assuming it will work. r=jya (988030aec7) - Bug 1209886 - Clean up InstantiateDecoder() in DecoderTraits.cpp. r=kinetik. (822cac0dee) - Bug 1213176: P1. Remove most MediaFormatReader dependencies on its MediaDecoder parent. r=jwwang (7b5b000408) - Bug 1214989. Part 1 - add MediaDecoderOwner to the constructors of MediaDecoder and sub-classes. r=gerald. (f2f6df4bf2) - Bug 1214989. Part 2 - add MediaDecoderOwner to Clone() and overrides. r=gerald. (db9947115d) - Bug 1214989. Part 3 - remove MediaDecoder::Init() and its callers. r=gerald. (4353925106) - Bug 1217714 - Remove some unused functions from MediaDecoderReader. r=jya. (ae50a0f881) - Bug 1194524 - Use channel->ascynOpen2 in dom/media/MediaResource.cpp (r=sicking) (2a28e80f82) - Bug 1218280. Part 1 - create MediaResourceCallback for MediaResource to send notifications. r=roc. (54c5f58cb0) - Bug 1218280. Part 2 - remove unused code. r=roc. (161d4e28bb) - Bug 1219169. Part 1 - Remove AbstractMediaDecoder::OnStateMachineTaskQueue(). r=jya. (1836fb4bbc) - Bug 1219169. Part 2 - move MediaDecoderStateMachine::OnTaskQueue() to private. r=jya. (873ecac93a) - Bug 1217692. Part 1 - move members that don't have to be public to protected or private sections. r=jya. (25ea01b514) - Bug 1217692. Part 2 - fix some styles to keep 80 cols limit. r=jya. (0aabebd4ed) - Bug 1220558. Part 1 - remove unused arguments from MediaDecoderReader::DispatchNotifyDataArrived() and its callees/callers. r=jya. (0e57bafdb4) - Bug 1218157: Only ever read from cached data in NotifyDataArrived. r=cpearce (235ef09e63) - Bug 1220551. Part 1 - fix the parameters passed to mBufferedState->NotifyDataArrived(). r=jya. (61bdc160b1) - Bug 1220551. Part 2 - remove arguments from NotifyDataArrivedInternal(). r=jya. (edc0c18550)
215 lines
6.9 KiB
C++
215 lines
6.9 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/TaskQueue.h"
|
|
|
|
#include "FFmpegRuntimeLinker.h"
|
|
#include "FFmpegAudioDecoder.h"
|
|
#include "TimeUnits.h"
|
|
|
|
#define MAX_CHANNELS 16
|
|
|
|
namespace mozilla
|
|
{
|
|
|
|
static int (*avcodec_decode_audio4)(AVCodecContext*,AVFrame*,
|
|
int*,const AVPacket*) = nullptr;
|
|
static void (*av_init_packet1)(AVPacket*) = nullptr;
|
|
|
|
FFmpegAudioDecoder<LIBAV_VER>::FFmpegAudioDecoder(
|
|
FlushableTaskQueue* aTaskQueue, MediaDataDecoderCallback* aCallback,
|
|
const AudioInfo& aConfig)
|
|
: FFmpegDataDecoder(aTaskQueue, aCallback, GetCodecId(aConfig.mMimeType))
|
|
{
|
|
MOZ_COUNT_CTOR(FFmpegAudioDecoder);
|
|
// Use a new MediaByteBuffer as the object will be modified during initialization.
|
|
mExtraData = new MediaByteBuffer;
|
|
mExtraData->AppendElements(*aConfig.mCodecSpecificConfig);
|
|
}
|
|
|
|
RefPtr<MediaDataDecoder::InitPromise>
|
|
FFmpegAudioDecoder<LIBAV_VER>::Init()
|
|
{
|
|
nsresult rv = InitDecoder();
|
|
|
|
if(rv == NS_OK) {
|
|
avcodec_decode_audio4 = (decltype(avcodec_decode_audio4))FFmpegRuntimeLinker::avc_ptr[_decode_audio4];
|
|
av_init_packet1 = (decltype(av_init_packet1))FFmpegRuntimeLinker::avc_ptr[_init_packet];
|
|
}
|
|
|
|
return rv == NS_OK ? InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__)
|
|
: InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
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, micro;
|
|
FFmpegRuntimeLinker::GetVersion(major, minor, micro);
|
|
// 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 UniquePtr<AudioDataValue[]>
|
|
CopyAndPackAudio(AVFrame* aFrame, uint32_t aNumChannels, uint32_t aNumAFrames)
|
|
{
|
|
MOZ_ASSERT(aNumChannels <= MAX_CHANNELS);
|
|
|
|
auto audio = MakeUnique<AudioDataValue[]>(aNumChannels * aNumAFrames);
|
|
|
|
if (aFrame->format == AV_SAMPLE_FMT_FLT) {
|
|
// Audio data already packed. No need to do anything other than copy it
|
|
// into a buffer we own.
|
|
memcpy(audio.get(), aFrame->data[0],
|
|
aNumChannels * aNumAFrames * sizeof(AudioDataValue));
|
|
} else if (aFrame->format == AV_SAMPLE_FMT_FLTP) {
|
|
// Planar audio data. Pack it into something we can understand.
|
|
AudioDataValue* tmp = audio.get();
|
|
AudioDataValue** data = reinterpret_cast<AudioDataValue**>(aFrame->data);
|
|
for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
|
|
for (uint32_t channel = 0; channel < aNumChannels; channel++) {
|
|
*tmp++ = data[channel][frame];
|
|
}
|
|
}
|
|
} else if (aFrame->format == AV_SAMPLE_FMT_S16) {
|
|
// Audio data already packed. Need to convert from S16 to 32 bits Float
|
|
AudioDataValue* tmp = audio.get();
|
|
int16_t* data = reinterpret_cast<int16_t**>(aFrame->data)[0];
|
|
for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
|
|
for (uint32_t channel = 0; channel < aNumChannels; channel++) {
|
|
*tmp++ = AudioSampleToFloat(*data++);
|
|
}
|
|
}
|
|
} else if (aFrame->format == AV_SAMPLE_FMT_S16P) {
|
|
// Planar audio data. Convert it from S16 to 32 bits float
|
|
// and pack it into something we can understand.
|
|
AudioDataValue* tmp = audio.get();
|
|
int16_t** data = reinterpret_cast<int16_t**>(aFrame->data);
|
|
for (uint32_t frame = 0; frame < aNumAFrames; frame++) {
|
|
for (uint32_t channel = 0; channel < aNumChannels; channel++) {
|
|
*tmp++ = AudioSampleToFloat(data[channel][frame]);
|
|
}
|
|
}
|
|
}
|
|
|
|
return audio;
|
|
}
|
|
|
|
void
|
|
FFmpegAudioDecoder<LIBAV_VER>::DecodePacket(MediaRawData* aSample)
|
|
{
|
|
MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
|
|
AVPacket packet;
|
|
av_init_packet1(&packet);
|
|
|
|
packet.data = const_cast<uint8_t*>(aSample->Data());
|
|
packet.size = aSample->Size();
|
|
|
|
if (!PrepareFrame()) {
|
|
NS_WARNING("FFmpeg audio decoder failed to allocate frame.");
|
|
mCallback->Error();
|
|
return;
|
|
}
|
|
|
|
int64_t samplePosition = aSample->mOffset;
|
|
media::TimeUnit pts = media::TimeUnit::FromMicroseconds(aSample->mTime);
|
|
|
|
while (packet.size > 0) {
|
|
int decoded;
|
|
int bytesConsumed =
|
|
avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
|
|
|
|
if (bytesConsumed < 0) {
|
|
NS_WARNING("FFmpeg audio decoder error.");
|
|
mCallback->Error();
|
|
return;
|
|
}
|
|
|
|
if (decoded) {
|
|
uint32_t numChannels = mCodecContext->channels;
|
|
uint32_t samplingRate = mCodecContext->sample_rate;
|
|
|
|
UniquePtr<AudioDataValue[]> audio =
|
|
CopyAndPackAudio(mFrame, numChannels, mFrame->nb_samples);
|
|
|
|
media::TimeUnit duration =
|
|
FramesToTimeUnit(mFrame->nb_samples, samplingRate);
|
|
if (!duration.IsValid()) {
|
|
NS_WARNING("Invalid count of accumulated audio samples");
|
|
mCallback->Error();
|
|
return;
|
|
}
|
|
|
|
RefPtr<AudioData> data = new AudioData(samplePosition,
|
|
pts.ToMicroseconds(),
|
|
duration.ToMicroseconds(),
|
|
mFrame->nb_samples,
|
|
Move(audio),
|
|
numChannels,
|
|
samplingRate);
|
|
mCallback->Output(data);
|
|
pts += duration;
|
|
if (!pts.IsValid()) {
|
|
NS_WARNING("Invalid count of accumulated audio samples");
|
|
mCallback->Error();
|
|
return;
|
|
}
|
|
}
|
|
packet.data += bytesConsumed;
|
|
packet.size -= bytesConsumed;
|
|
samplePosition += bytesConsumed;
|
|
}
|
|
|
|
if (mTaskQueue->IsEmpty()) {
|
|
mCallback->InputExhausted();
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
FFmpegAudioDecoder<LIBAV_VER>::Input(MediaRawData* aSample)
|
|
{
|
|
nsCOMPtr<nsIRunnable> runnable(NS_NewRunnableMethodWithArg<RefPtr<MediaRawData>>(
|
|
this, &FFmpegAudioDecoder::DecodePacket, RefPtr<MediaRawData>(aSample)));
|
|
mTaskQueue->Dispatch(runnable.forget());
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
FFmpegAudioDecoder<LIBAV_VER>::ProcessDrain()
|
|
{
|
|
MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
|
|
ProcessFlush();
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
AVCodecID
|
|
FFmpegAudioDecoder<LIBAV_VER>::GetCodecId(const nsACString& aMimeType)
|
|
{
|
|
if (aMimeType.EqualsLiteral("audio/mpeg")) {
|
|
return AV_CODEC_ID_MP3;
|
|
}
|
|
|
|
if (aMimeType.EqualsLiteral("audio/mp4a-latm")) {
|
|
return AV_CODEC_ID_AAC;
|
|
}
|
|
|
|
return AV_CODEC_ID_NONE;
|
|
}
|
|
|
|
FFmpegAudioDecoder<LIBAV_VER>::~FFmpegAudioDecoder()
|
|
{
|
|
MOZ_COUNT_DTOR(FFmpegAudioDecoder);
|
|
}
|
|
|
|
} // namespace mozilla
|