mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-01 06:35:42 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
79 lines
2.3 KiB
C++
79 lines
2.3 KiB
C++
/* 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/. */
|
|
|
|
#ifndef DOM_CAMERA_CAMERAPREVIEWMEDIASTREAM_H
|
|
#define DOM_CAMERA_CAMERAPREVIEWMEDIASTREAM_H
|
|
|
|
#include "VideoFrameContainer.h"
|
|
#include "MediaStreamGraph.h"
|
|
#include "mozilla/Mutex.h"
|
|
|
|
namespace mozilla {
|
|
|
|
class FakeMediaStreamGraph : public MediaStreamGraph
|
|
{
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FakeMediaStreamGraph)
|
|
public:
|
|
FakeMediaStreamGraph()
|
|
: MediaStreamGraph(16000)
|
|
{
|
|
}
|
|
|
|
virtual void
|
|
DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed<nsIRunnable> aRunnable) override;
|
|
|
|
protected:
|
|
~FakeMediaStreamGraph()
|
|
{}
|
|
};
|
|
|
|
/**
|
|
* This is a stream for camera preview.
|
|
*
|
|
* XXX It is a temporary fix of SourceMediaStream.
|
|
* A camera preview requests no delay and no buffering stream,
|
|
* but the SourceMediaStream does not support it.
|
|
*/
|
|
class CameraPreviewMediaStream : public MediaStream
|
|
{
|
|
typedef mozilla::layers::Image Image;
|
|
|
|
public:
|
|
explicit CameraPreviewMediaStream(DOMMediaStream* aWrapper);
|
|
|
|
virtual void AddAudioOutput(void* aKey) override;
|
|
virtual void SetAudioOutputVolume(void* aKey, float aVolume) override;
|
|
virtual void RemoveAudioOutput(void* aKey) override;
|
|
virtual void AddVideoOutput(VideoFrameContainer* aContainer) override;
|
|
virtual void RemoveVideoOutput(VideoFrameContainer* aContainer) override;
|
|
virtual void Suspend() override {}
|
|
virtual void Resume() override {}
|
|
virtual void AddListener(MediaStreamListener* aListener) override;
|
|
virtual void RemoveListener(MediaStreamListener* aListener) override;
|
|
virtual void Destroy() override;
|
|
void OnPreviewStateChange(bool aActive);
|
|
|
|
void Invalidate();
|
|
|
|
// Call these on any thread.
|
|
void SetCurrentFrame(const gfx::IntSize& aIntrinsicSize, Image* aImage);
|
|
void ClearCurrentFrame();
|
|
void RateLimit(bool aLimit);
|
|
|
|
protected:
|
|
// mMutex protects all the class' fields.
|
|
// This class is not registered to MediaStreamGraph.
|
|
// It needs to protect all the fields.
|
|
Mutex mMutex;
|
|
int32_t mInvalidatePending;
|
|
uint32_t mDiscardedFrames;
|
|
bool mRateLimit;
|
|
bool mTrackCreated;
|
|
RefPtr<FakeMediaStreamGraph> mFakeMediaStreamGraph;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // DOM_CAMERA_CAMERAPREVIEWMEDIASTREAM_H
|